aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/color/key_text_color_holo.xml48
-rw-r--r--java/res/drawable-hdpi/btn_keyboard_key_normal.9.pngbin1134 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.pngbin1243 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.pngbin1307 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/btn_keyboard_key_pressed.9.pngbin1088 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.pngbin1233 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.pngbin1271 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/ic_launcher_keyboard.pngbin0 -> 8523 bytes
-rw-r--r--java/res/drawable-hdpi/ic_subtype_mic_dark.pngbin1005 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/keyboard_background_gb.9.pngbin210 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/keyboard_key_feedback_background_klp.9.pngbin2138 -> 2147 bytes
-rw-r--r--java/res/drawable-hdpi/keyboard_popup_panel_background_gb.9.pngbin1204 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/keyboard_suggest_strip_gb.9.pngbin248 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/sym_keyboard_feedback_tab.pngbin4111 -> 2341 bytes
-rw-r--r--java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.pngbin787 -> 1542 bytes
-rw-r--r--java/res/drawable-hdpi/sym_keyboard_space.pngbin3331 -> 1049 bytes
-rw-r--r--java/res/drawable-hdpi/sym_keyboard_space_led_gb.9.pngbin557 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/btn_keyboard_key_normal.9.pngbin991 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.pngbin1083 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.pngbin1151 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/btn_keyboard_key_pressed.9.pngbin956 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.pngbin1078 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.pngbin1119 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/ic_launcher_keyboard.pngbin0 -> 4772 bytes
-rw-r--r--java/res/drawable-mdpi/keyboard_background_gb.9.pngbin196 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/keyboard_key_feedback_background_klp.9.pngbin1383 -> 1353 bytes
-rw-r--r--java/res/drawable-mdpi/keyboard_popup_panel_background_gb.9.pngbin1726 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/keyboard_suggest_strip_gb.9.pngbin205 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/more_keys_divider.pngbin2940 -> 276 bytes
-rw-r--r--java/res/drawable-mdpi/more_suggestions_divider.pngbin2940 -> 276 bytes
-rw-r--r--java/res/drawable-mdpi/sym_keyboard_feedback_tab.pngbin3529 -> 846 bytes
-rw-r--r--java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.pngbin498 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/sym_keyboard_mic_holo_light.pngbin525 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.pngbin585 -> 1051 bytes
-rw-r--r--java/res/drawable-mdpi/sym_keyboard_space.pngbin3063 -> 467 bytes
-rw-r--r--java/res/drawable-mdpi/sym_keyboard_space_led_gb.9.pngbin365 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/btn_keyboard_key_normal.9.pngbin1172 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.pngbin1278 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.pngbin1345 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.pngbin1131 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.pngbin1273 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.pngbin1312 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/ic_launcher_keyboard.pngbin0 -> 13098 bytes
-rw-r--r--java/res/drawable-xhdpi/ic_subtype_mic_dark.pngbin1259 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/keyboard_background_gb.9.pngbin241 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/keyboard_key_feedback_background_klp.9.pngbin3326 -> 3316 bytes
-rw-r--r--java/res/drawable-xhdpi/keyboard_popup_panel_background_gb.9.pngbin1365 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/keyboard_suggest_strip_gb.9.pngbin289 -> 0 bytes
-rw-r--r--java/res/drawable-xhdpi/sym_keyboard_feedback_tab.pngbin4732 -> 3427 bytes
-rw-r--r--java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.pngbin1062 -> 2136 bytes
-rw-r--r--java/res/drawable-xhdpi/sym_keyboard_space.pngbin3526 -> 1397 bytes
-rw-r--r--java/res/drawable-xhdpi/sym_keyboard_space_led_gb.9.pngbin617 -> 0 bytes
-rw-r--r--java/res/drawable-xxhdpi/ic_launcher_keyboard.pngbin0 -> 25067 bytes
-rw-r--r--java/res/drawable-xxhdpi/ic_subtype_mic_dark.pngbin1846 -> 0 bytes
-rw-r--r--java/res/drawable-xxhdpi/keyboard_key_feedback_background_klp.9.pngbin7452 -> 5251 bytes
-rw-r--r--java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_klp.9.pngbin7089 -> 5862 bytes
-rw-r--r--java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_klp.9.pngbin7197 -> 5920 bytes
-rw-r--r--java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_klp.9.pngbin7023 -> 5981 bytes
-rw-r--r--java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_klp.9.pngbin7153 -> 6060 bytes
-rw-r--r--java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.pngbin1455 -> 2825 bytes
-rw-r--r--java/res/drawable/btn_keyboard_key_gb.xml48
-rw-r--r--java/res/drawable/btn_keyboard_spacebar_ics.xml (renamed from java/res/drawable/btn_keyboard_key_functional_gb.xml)5
-rw-r--r--java/res/drawable/btn_keyboard_spacebar_klp.xml (renamed from java/res/drawable/btn_keyboard_key_popup_gb.xml)6
-rw-r--r--java/res/drawable/keyboard_key_feedback_gb.xml24
-rw-r--r--java/res/layout/emoji_keyboard_page.xml17
-rw-r--r--java/res/layout/emoji_keyboard_tab_icon.xml2
-rw-r--r--java/res/layout/emoji_palettes_view.xml24
-rw-r--r--java/res/layout/hint_add_to_dictionary.xml36
-rw-r--r--java/res/layout/input_view.xml6
-rw-r--r--java/res/layout/key_preview.xml (renamed from java/res/layout/key_preview_klp.xml)2
-rw-r--r--java/res/layout/more_keys_keyboard.xml4
-rw-r--r--java/res/layout/more_suggestions.xml9
-rw-r--r--java/res/layout/research_feedback_fragment_layout.xml56
-rw-r--r--java/res/layout/seek_bar_dialog.xml2
-rw-r--r--java/res/layout/setup_steps_title.xml4
-rw-r--r--java/res/layout/setup_welcome_title.xml4
-rw-r--r--java/res/layout/suggestion_divider.xml1
-rw-r--r--java/res/layout/suggestion_info.xml27
-rw-r--r--java/res/layout/suggestion_word.xml39
-rw-r--r--java/res/layout/suggestions_strip.xml37
-rw-r--r--java/res/layout/user_dictionary_add_word.xml55
-rw-r--r--java/res/layout/user_dictionary_add_word_fullscreen.xml4
-rw-r--r--java/res/layout/user_dictionary_item.xml5
-rw-r--r--java/res/mipmap-hdpi/ic_launcher_keyboard.pngbin7646 -> 0 bytes
-rw-r--r--java/res/mipmap-mdpi/ic_launcher_keyboard.pngbin4349 -> 0 bytes
-rw-r--r--java/res/mipmap-xhdpi/ic_launcher_keyboard.pngbin12231 -> 0 bytes
-rw-r--r--java/res/mipmap-xxhdpi/ic_launcher_keyboard.pngbin21221 -> 0 bytes
-rw-r--r--java/res/raw/main_de.dictbin1605727 -> 1605763 bytes
-rw-r--r--java/res/raw/main_en.dictbin1069849 -> 1070464 bytes
-rw-r--r--java/res/raw/main_es.dictbin1138908 -> 1138908 bytes
-rw-r--r--java/res/raw/main_fr.dictbin1329192 -> 1329188 bytes
-rw-r--r--java/res/raw/main_it.dictbin1143338 -> 1143338 bytes
-rw-r--r--java/res/raw/main_pt_br.dictbin1092054 -> 1092054 bytes
-rw-r--r--java/res/raw/main_ru.dictbin2229294 -> 2229479 bytes
-rw-r--r--java/res/values-af/strings-config-important-notice.xml24
-rw-r--r--java/res/values-af/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-af/strings.xml78
-rw-r--r--java/res/values-am/strings-config-important-notice.xml24
-rw-r--r--java/res/values-am/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-am/strings.xml82
-rw-r--r--java/res/values-ar-sw600dp/donottranslate-config-spacing-and-punctuations.xml27
-rw-r--r--java/res/values-ar/donottranslate-config-spacing-and-punctuations.xml (renamed from java/res/values-iw/donottranslate.xml)5
-rw-r--r--java/res/values-ar/strings-config-important-notice.xml24
-rw-r--r--java/res/values-ar/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-ar/strings.xml78
-rw-r--r--java/res/values-az-rAZ/strings-action-keys.xml30
-rw-r--r--java/res/values-az-rAZ/strings-appname.xml (renamed from java/res/values-be/strings-appname.xml)8
-rw-r--r--java/res/values-az-rAZ/strings-config-important-notice.xml24
-rw-r--r--java/res/values-az-rAZ/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-az-rAZ/strings.xml204
-rw-r--r--java/res/values-be-rBY/bools.xml (renamed from java/res/values-be/bools.xml)0
-rw-r--r--java/res/values-be-rBY/strings-action-keys.xml (renamed from java/res/values-be/strings-action-keys.xml)0
-rw-r--r--java/res/values-be/strings.xml253
-rw-r--r--java/res/values-bg/strings-config-important-notice.xml24
-rw-r--r--java/res/values-bg/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-bg/strings.xml78
-rw-r--r--java/res/values-ca/strings-config-important-notice.xml24
-rw-r--r--java/res/values-ca/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-ca/strings.xml78
-rw-r--r--java/res/values-cs/strings-config-important-notice.xml24
-rw-r--r--java/res/values-cs/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-cs/strings.xml78
-rw-r--r--java/res/values-da/strings-config-important-notice.xml (renamed from java/res/layout/key_preview_gb.xml)19
-rw-r--r--java/res/values-da/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-da/strings.xml94
-rw-r--r--java/res/values-de/strings-config-important-notice.xml24
-rw-r--r--java/res/values-de/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-de/strings.xml80
-rw-r--r--java/res/values-el/strings-config-important-notice.xml24
-rw-r--r--java/res/values-el/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-el/strings.xml78
-rw-r--r--java/res/values-en-rGB/strings-config-important-notice.xml24
-rw-r--r--java/res/values-en-rGB/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-en-rGB/strings.xml78
-rw-r--r--java/res/values-en-rIN/strings-config-important-notice.xml24
-rw-r--r--java/res/values-en-rIN/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-en-rIN/strings.xml78
-rw-r--r--java/res/values-es-rUS/strings-config-important-notice.xml24
-rw-r--r--java/res/values-es-rUS/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-es-rUS/strings.xml78
-rw-r--r--java/res/values-es/strings-config-important-notice.xml24
-rw-r--r--java/res/values-es/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-es/strings.xml78
-rw-r--r--java/res/values-et-rEE/strings-config-important-notice.xml24
-rw-r--r--java/res/values-et-rEE/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-et-rEE/strings.xml78
-rw-r--r--java/res/values-fa-sw600dp/donottranslate-config-spacing-and-punctuations.xml27
-rw-r--r--java/res/values-fa/donottranslate-config-spacing-and-punctuations.xml28
-rw-r--r--java/res/values-fa/strings-config-important-notice.xml24
-rw-r--r--java/res/values-fa/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-fa/strings.xml82
-rw-r--r--java/res/values-fi/strings-config-important-notice.xml24
-rw-r--r--java/res/values-fi/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-fi/strings.xml78
-rw-r--r--java/res/values-fr-rCA/donottranslate-config-spacing-and-punctuations.xml (renamed from java/res/values-fr-rCA/donottranslate.xml)2
-rw-r--r--java/res/values-fr-rCA/strings-config-important-notice.xml24
-rw-r--r--java/res/values-fr-rCA/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-fr-rCA/strings.xml78
-rw-r--r--java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml (renamed from java/res/values-fr/donottranslate.xml)2
-rw-r--r--java/res/values-fr/strings-config-important-notice.xml24
-rw-r--r--java/res/values-fr/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-fr/strings.xml78
-rw-r--r--java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml1
-rw-r--r--java/res/values-h330dp-land/setup-dimens-large-phone-land.xml1
-rw-r--r--java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml1
-rw-r--r--java/res/values-h540dp-port/setup-dimens-large-phone-port.xml1
-rw-r--r--java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml1
-rw-r--r--java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml1
-rw-r--r--java/res/values-hi/strings-config-important-notice.xml24
-rw-r--r--java/res/values-hi/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-hi/strings.xml78
-rw-r--r--java/res/values-hr/strings-config-important-notice.xml24
-rw-r--r--java/res/values-hr/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-hr/strings.xml78
-rw-r--r--java/res/values-hu/strings-config-important-notice.xml24
-rw-r--r--java/res/values-hu/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-hu/strings.xml78
-rw-r--r--java/res/values-hy-rAM/donottranslate-config-spacing-and-punctuations.xml (renamed from java/res/values-hy-rAM/donottranslate.xml)2
-rw-r--r--java/res/values-hy-rAM/strings-config-important-notice.xml24
-rw-r--r--java/res/values-hy-rAM/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-hy-rAM/strings.xml78
-rw-r--r--java/res/values-in/strings-config-important-notice.xml24
-rw-r--r--java/res/values-in/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-in/strings.xml80
-rw-r--r--java/res/values-is/strings-talkback-descriptions.xml107
-rw-r--r--java/res/values-is/strings.xml98
-rw-r--r--java/res/values-it/strings-config-important-notice.xml24
-rw-r--r--java/res/values-it/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-it/strings.xml78
-rw-r--r--java/res/values-iw-sw600dp/donottranslate-config-spacing-and-punctuations.xml (renamed from java/res/values-fa/donottranslate.xml)4
-rw-r--r--java/res/values-iw/donottranslate-config-spacing-and-punctuations.xml (renamed from java/res/values-ar/donottranslate.xml)2
-rw-r--r--java/res/values-iw/strings-config-important-notice.xml24
-rw-r--r--java/res/values-iw/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-iw/strings.xml78
-rw-r--r--java/res/values-ja/strings-config-important-notice.xml24
-rw-r--r--java/res/values-ja/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-ja/strings.xml78
-rw-r--r--java/res/values-ka-rGE/strings-config-important-notice.xml24
-rw-r--r--java/res/values-ka-rGE/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-ka-rGE/strings.xml78
-rw-r--r--java/res/values-kk/strings-talkback-descriptions.xml67
-rw-r--r--java/res/values-kk/strings.xml53
-rw-r--r--java/res/values-km-rKH/donottranslate-config-spacing-and-punctuations.xml (renamed from java/res/values-km-rKH/donottranslate.xml)0
-rw-r--r--java/res/values-km-rKH/strings-config-important-notice.xml24
-rw-r--r--java/res/values-km-rKH/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-km-rKH/strings.xml78
-rw-r--r--java/res/values-ko/strings-config-important-notice.xml24
-rw-r--r--java/res/values-ko/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-ko/strings.xml78
-rw-r--r--java/res/values-ky/strings-talkback-descriptions.xml73
-rw-r--r--java/res/values-ky/strings.xml64
-rw-r--r--java/res/values-land/config.xml53
-rw-r--r--java/res/values-land/dimens.xml83
-rw-r--r--java/res/values-land/keyboard-heights.xml2
-rw-r--r--java/res/values-land/setup-dimens-small-phone-land.xml1
-rw-r--r--java/res/values-lo-rLA/donottranslate-config-spacing-and-punctuations.xml (renamed from java/res/values-lo-rLA/donottranslate.xml)0
-rw-r--r--java/res/values-lo-rLA/strings-config-important-notice.xml24
-rw-r--r--java/res/values-lo-rLA/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-lo-rLA/strings.xml78
-rw-r--r--java/res/values-lt/strings-config-important-notice.xml24
-rw-r--r--java/res/values-lt/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-lt/strings.xml78
-rw-r--r--java/res/values-lv/strings-config-important-notice.xml24
-rw-r--r--java/res/values-lv/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-lv/strings.xml78
-rw-r--r--java/res/values-mk/strings-talkback-descriptions.xml107
-rw-r--r--java/res/values-mk/strings.xml98
-rw-r--r--java/res/values-mn-rMN/strings-config-important-notice.xml24
-rw-r--r--java/res/values-mn-rMN/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-mn-rMN/strings.xml78
-rw-r--r--java/res/values-ms-rMY/strings-config-important-notice.xml24
-rw-r--r--java/res/values-ms-rMY/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-ms-rMY/strings.xml78
-rw-r--r--java/res/values-nb/strings-config-important-notice.xml24
-rw-r--r--java/res/values-nb/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-nb/strings.xml78
-rw-r--r--java/res/values-ne-rNP/strings-action-keys.xml30
-rw-r--r--java/res/values-ne-rNP/strings-appname.xml27
-rw-r--r--java/res/values-ne-rNP/strings-config-important-notice.xml24
-rw-r--r--java/res/values-ne-rNP/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-ne-rNP/strings.xml204
-rw-r--r--java/res/values-nl/strings-config-important-notice.xml24
-rw-r--r--java/res/values-nl/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-nl/strings.xml78
-rw-r--r--java/res/values-pl/strings-config-important-notice.xml24
-rw-r--r--java/res/values-pl/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-pl/strings.xml86
-rw-r--r--java/res/values-port/setup-dimens-small-phone-port.xml1
-rw-r--r--java/res/values-pt-rPT/strings-config-important-notice.xml24
-rw-r--r--java/res/values-pt-rPT/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-pt-rPT/strings.xml78
-rw-r--r--java/res/values-pt/strings-config-important-notice.xml24
-rw-r--r--java/res/values-pt/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-pt/strings.xml94
-rw-r--r--java/res/values-rm/strings-talkback-descriptions.xml107
-rw-r--r--java/res/values-rm/strings.xml97
-rw-r--r--java/res/values-ro/strings-config-important-notice.xml24
-rw-r--r--java/res/values-ro/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-ro/strings.xml78
-rw-r--r--java/res/values-ru/strings-config-important-notice.xml24
-rw-r--r--java/res/values-ru/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-ru/strings.xml78
-rw-r--r--java/res/values-sk/strings-config-important-notice.xml24
-rw-r--r--java/res/values-sk/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-sk/strings.xml86
-rw-r--r--java/res/values-sl/strings-config-important-notice.xml24
-rw-r--r--java/res/values-sl/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-sl/strings.xml78
-rw-r--r--java/res/values-sr/strings-config-important-notice.xml24
-rw-r--r--java/res/values-sr/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-sr/strings.xml78
-rw-r--r--java/res/values-sv/strings-config-important-notice.xml24
-rw-r--r--java/res/values-sv/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-sv/strings.xml78
-rw-r--r--java/res/values-sw/strings-config-important-notice.xml24
-rw-r--r--java/res/values-sw/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-sw/strings.xml78
-rw-r--r--java/res/values-sw430dp/config-per-form-factor.xml33
-rw-r--r--java/res/values-sw430dp/config-screen-metrics.xml (renamed from java/res/values-sw540dp-land/config.xml)5
-rw-r--r--java/res/values-sw540dp-land/dimens.xml72
-rw-r--r--java/res/values-sw540dp/dimens.xml98
-rw-r--r--java/res/values-sw600dp-land/config.xml66
-rw-r--r--java/res/values-sw600dp/config-per-form-factor.xml33
-rw-r--r--java/res/values-sw600dp/config-screen-metrics.xml (renamed from java/res/drawable/btn_suggestion_gb.xml)13
-rw-r--r--java/res/values-sw600dp/config.xml68
-rw-r--r--java/res/values-sw600dp/donottranslate-config-spacing-and-punctuations.xml23
-rw-r--r--java/res/values-sw600dp/touch-position-correction.xml (renamed from java/res/values-sw540dp/touch-position-correction.xml)11
-rw-r--r--java/res/values-sw768dp-land/config.xml45
-rw-r--r--java/res/values-sw768dp-land/dimens.xml73
-rw-r--r--java/res/values-sw768dp/config-per-form-factor.xml (renamed from java/res/values-sw540dp/config.xml)18
-rw-r--r--java/res/values-sw768dp/config-screen-metrics.xml (renamed from java/res/layout/key_preview_ics.xml)11
-rw-r--r--java/res/values-sw768dp/config.xml86
-rw-r--r--java/res/values-sw768dp/dimens.xml98
-rw-r--r--java/res/values-th/donottranslate-config-spacing-and-punctuations.xml (renamed from java/res/values-th/donottranslate.xml)0
-rw-r--r--java/res/values-th/strings-config-important-notice.xml24
-rw-r--r--java/res/values-th/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-th/strings.xml78
-rw-r--r--java/res/values-tl/strings-config-important-notice.xml24
-rw-r--r--java/res/values-tl/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-tl/strings.xml78
-rw-r--r--java/res/values-tr/strings-config-important-notice.xml24
-rw-r--r--java/res/values-tr/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-tr/strings.xml78
-rw-r--r--java/res/values-uk/strings-config-important-notice.xml24
-rw-r--r--java/res/values-uk/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-uk/strings.xml78
-rw-r--r--java/res/values-v20/platform-theme.xml26
-rw-r--r--java/res/values-vi/strings-config-important-notice.xml24
-rw-r--r--java/res/values-vi/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-vi/strings.xml80
-rw-r--r--java/res/values-zh-rCN/strings-config-important-notice.xml24
-rw-r--r--java/res/values-zh-rCN/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-zh-rCN/strings.xml78
-rw-r--r--java/res/values-zh-rHK/strings-config-important-notice.xml24
-rw-r--r--java/res/values-zh-rHK/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-zh-rHK/strings.xml78
-rw-r--r--java/res/values-zh-rTW/strings-config-important-notice.xml24
-rw-r--r--java/res/values-zh-rTW/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-zh-rTW/strings.xml78
-rw-r--r--java/res/values-zu/strings-config-important-notice.xml24
-rw-r--r--java/res/values-zu/strings-talkback-descriptions.xml72
-rw-r--r--java/res/values-zu/strings.xml78
-rw-r--r--java/res/values/attrs.xml52
-rw-r--r--java/res/values/colors.xml18
-rw-r--r--java/res/values/config-auto-correction-thresholds.xml57
-rw-r--r--java/res/values/config-common.xml149
-rw-r--r--java/res/values/config-dictionary-pack.xml (renamed from java/res/color/emoji_tab_label_color_gb.xml)23
-rw-r--r--java/res/values/config-per-form-factor.xml32
-rw-r--r--java/res/values/config-screen-metrics.xml24
-rw-r--r--java/res/values/config-spellchecker-thresholds.xml (renamed from java/res/values-hdpi/config.xml)13
-rw-r--r--java/res/values/config.xml171
-rw-r--r--java/res/values/dimens.xml132
-rw-r--r--java/res/values/donottranslate-config-important-notice.xml30
-rw-r--r--java/res/values/donottranslate-config-spacing-and-punctuations.xml39
-rw-r--r--java/res/values/donottranslate.xml81
-rw-r--r--java/res/values/keyboard-heights.xml2
-rw-r--r--java/res/values/keyboard-icons-holo.xml1
-rw-r--r--java/res/values/keypress-vibration-durations.xml2
-rw-r--r--java/res/values/keypress-volumes.xml2
-rw-r--r--java/res/values/phantom-sudden-move-event-device-list.xml2
-rw-r--r--java/res/values/platform-theme.xml24
-rw-r--r--java/res/values/strings-config-important-notice.xml25
-rw-r--r--java/res/values/strings-talkback-descriptions.xml125
-rw-r--r--java/res/values/strings.xml222
-rw-r--r--java/res/values/themes-common.xml92
-rw-r--r--java/res/values/themes-gb.xml146
-rw-r--r--java/res/values/themes-ics.xml41
-rw-r--r--java/res/values/themes-klp.xml41
-rw-r--r--java/res/values/touch-position-correction.xml20
-rw-r--r--java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml2
-rw-r--r--java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml2
-rw-r--r--java/res/xml-sw600dp/key_f1.xml27
-rw-r--r--java/res/xml-sw600dp/key_question_exclamation.xml4
-rw-r--r--java/res/xml-sw600dp/key_shortcut.xml10
-rw-r--r--java/res/xml-sw600dp/key_space_5kw.xml4
-rw-r--r--java/res/xml-sw600dp/key_space_symbols.xml5
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml68
-rw-r--r--java/res/xml-sw600dp/key_styles_enter.xml62
-rw-r--r--java/res/xml-sw600dp/keys_arabic3_left.xml4
-rw-r--r--java/res/xml-sw600dp/keys_comma_period.xml84
-rw-r--r--java/res/xml-sw600dp/keys_dvorak_123.xml12
-rw-r--r--java/res/xml-sw600dp/keys_exclamation_question.xml6
-rw-r--r--java/res/xml-sw600dp/keys_farsi3_right.xml4
-rw-r--r--java/res/xml-sw600dp/keys_pcqwerty2_right3.xml14
-rw-r--r--java/res/xml-sw600dp/keys_pcqwerty3_right2.xml10
-rw-r--r--java/res/xml-sw600dp/keys_pcqwerty4_right3.xml18
-rw-r--r--java/res/xml-sw600dp/row_dvorak4.xml2
-rw-r--r--java/res/xml-sw600dp/row_pcqwerty5.xml39
-rw-r--r--java/res/xml-sw600dp/rowkeys_dvorak3.xml28
-rw-r--r--java/res/xml-sw600dp/rowkeys_pcqwerty1.xml177
-rw-r--r--java/res/xml-sw600dp/rows_colemak.xml2
-rw-r--r--java/res/xml-sw600dp/rows_greek.xml2
-rw-r--r--java/res/xml-sw600dp/rows_hebrew.xml6
-rw-r--r--java/res/xml-sw600dp/rows_hindi_compact.xml54
-rw-r--r--java/res/xml-sw600dp/rows_myanmar.xml63
-rw-r--r--java/res/xml-sw600dp/rows_number_normal.xml44
-rw-r--r--java/res/xml-sw600dp/rows_pcqwerty.xml17
-rw-r--r--java/res/xml-sw600dp/rows_phone.xml16
-rw-r--r--java/res/xml-sw600dp/rows_swiss.xml63
-rw-r--r--java/res/xml-sw600dp/rows_symbols.xml5
-rw-r--r--java/res/xml-sw600dp/rows_symbols_shift.xml5
-rw-r--r--java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml50
-rw-r--r--java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml (renamed from java/res/xml-v16/key_devanagari_sign_candrabindu.xml)10
-rw-r--r--java/res/xml-v16/keystyle_devanagari_sign_nukta.xml (renamed from java/res/xml-v16/key_devanagari_sign_nukta.xml)15
-rw-r--r--java/res/xml-v16/keystyle_devanagari_sign_virama.xml17
-rw-r--r--java/res/xml-v16/keystyle_devanagari_sign_visarga.xml2
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml10
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml10
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml10
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml (renamed from java/res/xml-v16/key_devanagari_sign_anusvara.xml)20
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml (renamed from java/res/xml-v16/key_devanagari_vowel_sign_candra_o.xml)20
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml10
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml10
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml10
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml12
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml10
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml10
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml (renamed from java/res/xml-v16/key_devanagari_vowel_sign_vocalic_r.xml)16
-rw-r--r--java/res/xml/kbd_armenian_phonetic.xml6
-rw-r--r--java/res/xml/kbd_emoji_category1.xml4
-rw-r--r--java/res/xml/kbd_emoji_category2.xml4
-rw-r--r--java/res/xml/kbd_emoji_category3.xml4
-rw-r--r--java/res/xml/kbd_emoji_category4.xml4
-rw-r--r--java/res/xml/kbd_emoji_category5.xml4
-rw-r--r--java/res/xml/kbd_emoji_category6.xml4
-rw-r--r--java/res/xml/kbd_emoji_recents.xml6
-rw-r--r--java/res/xml/kbd_hindi_compact.xml (renamed from java/res/xml-sw600dp/key_colemak_colon.xml)13
-rw-r--r--java/res/xml/kbd_khmer.xml6
-rw-r--r--java/res/xml/kbd_lao.xml6
-rw-r--r--java/res/xml/kbd_more_keys_keyboard_template.xml2
-rw-r--r--java/res/xml/kbd_myanmar.xml31
-rw-r--r--java/res/xml/kbd_pcqwerty.xml6
-rw-r--r--java/res/xml/kbd_suggestions_pane_template.xml2
-rw-r--r--java/res/xml/kbd_swiss.xml (renamed from java/res/xml-sw600dp/key_azerty3_right.xml)13
-rw-r--r--java/res/xml/kbd_thai.xml6
-rw-r--r--java/res/xml/key_armenian_sha.xml2
-rw-r--r--java/res/xml/key_armenian_xeh.xml2
-rw-r--r--java/res/xml/key_colemak_colon.xml41
-rw-r--r--java/res/xml/key_f1.xml17
-rw-r--r--java/res/xml/key_greek_semicolon.xml42
-rw-r--r--java/res/xml/key_period.xml (renamed from java/res/xml/key_nepali_traditional_period.xml)28
-rw-r--r--java/res/xml/key_space_3kw.xml41
-rw-r--r--java/res/xml/key_space_symbols.xml6
-rw-r--r--java/res/xml/key_styles_common.xml109
-rw-r--r--java/res/xml/key_styles_currency.xml50
-rw-r--r--java/res/xml/key_styles_currency_dollar.xml12
-rw-r--r--java/res/xml/key_styles_currency_euro.xml10
-rw-r--r--java/res/xml/key_styles_enter.xml92
-rw-r--r--java/res/xml/key_styles_f1.xml2
-rw-r--r--java/res/xml/key_styles_number.xml46
-rw-r--r--java/res/xml/key_symbols_period.xml47
-rw-r--r--java/res/xml/key_thai_kho_khuat.xml4
-rw-r--r--java/res/xml/keyboard_layout_set_hindi_compact.xml42
-rw-r--r--java/res/xml/keyboard_layout_set_myanmar.xml58
-rw-r--r--java/res/xml/keyboard_layout_set_swiss.xml42
-rw-r--r--java/res/xml/keys_arabic3_left.xml2
-rw-r--r--java/res/xml/keys_comma_period.xml87
-rw-r--r--java/res/xml/keys_comma_period_symbols.xml (renamed from java/res/xml-sw600dp/key_greek_semicolon.xml)11
-rw-r--r--java/res/xml/keys_curly_brackets.xml6
-rw-r--r--java/res/xml/keys_dvorak_123.xml16
-rw-r--r--java/res/xml/keys_farsi3_right.xml2
-rw-r--r--java/res/xml/keys_less_greater.xml22
-rw-r--r--java/res/xml/keys_parentheses.xml10
-rw-r--r--java/res/xml/keys_pcqwerty2_right3.xml14
-rw-r--r--java/res/xml/keys_pcqwerty3_right2.xml10
-rw-r--r--java/res/xml/keys_pcqwerty4_right3.xml18
-rw-r--r--java/res/xml/keys_square_brackets.xml6
-rw-r--r--java/res/xml/keystyle_devanagari_sign_anusvara.xml52
-rw-r--r--java/res/xml/keystyle_devanagari_sign_candrabindu.xml (renamed from java/res/xml/key_devanagari_sign_candrabindu.xml)8
-rw-r--r--java/res/xml/keystyle_devanagari_sign_nukta.xml (renamed from java/res/xml/key_devanagari_sign_nukta.xml)17
-rw-r--r--java/res/xml/keystyle_devanagari_sign_virama.xml19
-rw-r--r--java/res/xml/keystyle_devanagari_sign_visarga.xml3
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_aa.xml12
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_ai.xml12
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_au.xml14
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml (renamed from java/res/xml/key_devanagari_sign_anusvara.xml)23
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml (renamed from java/res/xml/key_devanagari_vowel_sign_candra_o.xml)22
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_e.xml12
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_i.xml12
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_ii.xml14
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_o.xml14
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_u.xml12
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_uu.xml12
-rw-r--r--java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml (renamed from java/res/xml/key_devanagari_vowel_sign_vocalic_r.xml)18
-rw-r--r--java/res/xml/method.xml211
-rw-r--r--java/res/xml/prefs.xml26
-rw-r--r--java/res/xml/prefs_for_debug.xml99
-rw-r--r--java/res/xml/row_dvorak4.xml8
-rw-r--r--java/res/xml/row_pcqwerty5.xml34
-rw-r--r--java/res/xml/row_qwerty4.xml32
-rw-r--r--java/res/xml/row_symbols4.xml24
-rw-r--r--java/res/xml/row_symbols_shift4.xml2
-rw-r--r--java/res/xml/rowkeys_arabic1.xml34
-rw-r--r--java/res/xml/rowkeys_arabic2.xml22
-rw-r--r--java/res/xml/rowkeys_arabic3.xml18
-rw-r--r--java/res/xml/rowkeys_armenian_phonetic1.xml20
-rw-r--r--java/res/xml/rowkeys_armenian_phonetic2.xml21
-rw-r--r--java/res/xml/rowkeys_armenian_phonetic3.xml18
-rw-r--r--java/res/xml/rowkeys_armenian_phonetic4.xml14
-rw-r--r--java/res/xml/rowkeys_azerty1.xml38
-rw-r--r--java/res/xml/rowkeys_azerty2.xml34
-rw-r--r--java/res/xml/rowkeys_azerty3.xml35
-rw-r--r--java/res/xml/rowkeys_bulgarian1.xml22
-rw-r--r--java/res/xml/rowkeys_bulgarian2.xml22
-rw-r--r--java/res/xml/rowkeys_bulgarian3.xml16
-rw-r--r--java/res/xml/rowkeys_bulgarian_bds1.xml22
-rw-r--r--java/res/xml/rowkeys_bulgarian_bds2.xml22
-rw-r--r--java/res/xml/rowkeys_bulgarian_bds3.xml18
-rw-r--r--java/res/xml/rowkeys_colemak1.xml47
-rw-r--r--java/res/xml/rowkeys_colemak2.xml40
-rw-r--r--java/res/xml/rowkeys_colemak3.xml22
-rw-r--r--java/res/xml/rowkeys_dvorak1.xml24
-rw-r--r--java/res/xml/rowkeys_dvorak2.xml40
-rw-r--r--java/res/xml/rowkeys_dvorak3.xml22
-rw-r--r--java/res/xml/rowkeys_east_slavic1.xml32
-rw-r--r--java/res/xml/rowkeys_east_slavic2.xml30
-rw-r--r--java/res/xml/rowkeys_east_slavic3.xml20
-rw-r--r--java/res/xml/rowkeys_farsi1.xml22
-rw-r--r--java/res/xml/rowkeys_farsi2.xml22
-rw-r--r--java/res/xml/rowkeys_farsi3.xml18
-rw-r--r--java/res/xml/rowkeys_georgian1.xml40
-rw-r--r--java/res/xml/rowkeys_georgian2.xml36
-rw-r--r--java/res/xml/rowkeys_georgian3.xml28
-rw-r--r--java/res/xml/rowkeys_greek1.xml46
-rw-r--r--java/res/xml/rowkeys_greek2.xml18
-rw-r--r--java/res/xml/rowkeys_greek3.xml14
-rw-r--r--java/res/xml/rowkeys_hebrew1.xml24
-rw-r--r--java/res/xml/rowkeys_hebrew2.xml20
-rw-r--r--java/res/xml/rowkeys_hebrew3.xml18
-rw-r--r--java/res/xml/rowkeys_hindi1.xml46
-rw-r--r--java/res/xml/rowkeys_hindi2.xml34
-rw-r--r--java/res/xml/rowkeys_hindi3.xml51
-rw-r--r--java/res/xml/rowkeys_hindi_compact1.xml139
-rw-r--r--java/res/xml/rowkeys_hindi_compact2.xml115
-rw-r--r--java/res/xml/rowkeys_hindi_compact3.xml89
-rw-r--r--java/res/xml/rowkeys_khmer1.xml49
-rw-r--r--java/res/xml/rowkeys_khmer2.xml59
-rw-r--r--java/res/xml/rowkeys_khmer3.xml52
-rw-r--r--java/res/xml/rowkeys_khmer4.xml44
-rw-r--r--java/res/xml/rowkeys_lao1.xml48
-rw-r--r--java/res/xml/rowkeys_lao2.xml48
-rw-r--r--java/res/xml/rowkeys_lao3.xml48
-rw-r--r--java/res/xml/rowkeys_lao4.xml40
-rw-r--r--java/res/xml/rowkeys_mongolian1.xml30
-rw-r--r--java/res/xml/rowkeys_mongolian2.xml22
-rw-r--r--java/res/xml/rowkeys_mongolian3.xml18
-rw-r--r--java/res/xml/rowkeys_myanmar1.xml133
-rw-r--r--java/res/xml/rowkeys_myanmar2.xml112
-rw-r--r--java/res/xml/rowkeys_myanmar3.xml123
-rw-r--r--java/res/xml/rowkeys_myanmar4.xml100
-rw-r--r--java/res/xml/rowkeys_nepali_romanized1.xml50
-rw-r--r--java/res/xml/rowkeys_nepali_romanized2.xml40
-rw-r--r--java/res/xml/rowkeys_nepali_romanized3.xml36
-rw-r--r--java/res/xml/rowkeys_nepali_traditional1.xml46
-rw-r--r--java/res/xml/rowkeys_nepali_traditional2.xml34
-rw-r--r--java/res/xml/rowkeys_nepali_traditional3_left6.xml22
-rw-r--r--java/res/xml/rowkeys_nepali_traditional3_right3.xml14
-rw-r--r--java/res/xml/rowkeys_nepali_traditional3_right5.xml16
-rw-r--r--java/res/xml/rowkeys_nordic1.xml2
-rw-r--r--java/res/xml/rowkeys_nordic2.xml8
-rw-r--r--java/res/xml/rowkeys_pcqwerty1.xml125
-rw-r--r--java/res/xml/rowkeys_pcqwerty1_shift.xml41
-rw-r--r--java/res/xml/rowkeys_qwerty1.xml38
-rw-r--r--java/res/xml/rowkeys_qwerty2.xml34
-rw-r--r--java/res/xml/rowkeys_qwerty3.xml24
-rw-r--r--java/res/xml/rowkeys_qwertz1.xml36
-rw-r--r--java/res/xml/rowkeys_qwertz3.xml22
-rw-r--r--java/res/xml/rowkeys_south_slavic1.xml26
-rw-r--r--java/res/xml/rowkeys_south_slavic2.xml22
-rw-r--r--java/res/xml/rowkeys_south_slavic3.xml18
-rw-r--r--java/res/xml/rowkeys_spanish2.xml2
-rw-r--r--java/res/xml/rowkeys_swiss1.xml29
-rw-r--r--java/res/xml/rowkeys_swiss2.xml (renamed from java/res/xml/key_azerty3_right.xml)23
-rw-r--r--java/res/xml/rowkeys_symbols1.xml60
-rw-r--r--java/res/xml/rowkeys_symbols2.xml20
-rw-r--r--java/res/xml/rowkeys_symbols3.xml38
-rw-r--r--java/res/xml/rowkeys_symbols_shift1.xml28
-rw-r--r--java/res/xml/rowkeys_symbols_shift2.xml6
-rw-r--r--java/res/xml/rowkeys_symbols_shift3.xml10
-rw-r--r--java/res/xml/rowkeys_thai1.xml51
-rw-r--r--java/res/xml/rowkeys_thai2.xml52
-rw-r--r--java/res/xml/rowkeys_thai3.xml50
-rw-r--r--java/res/xml/rowkeys_thai4.xml44
-rw-r--r--java/res/xml/rows_colemak.xml2
-rw-r--r--java/res/xml/rows_greek.xml2
-rw-r--r--java/res/xml/rows_hindi_compact.xml49
-rw-r--r--java/res/xml/rows_myanmar.xml56
-rw-r--r--java/res/xml/rows_number_normal.xml40
-rw-r--r--java/res/xml/rows_pcqwerty.xml15
-rw-r--r--java/res/xml/rows_phone.xml7
-rw-r--r--java/res/xml/rows_phone_symbols.xml18
-rw-r--r--java/res/xml/rows_swiss.xml57
-rw-r--r--java/res/xml/rows_symbols.xml1
-rw-r--r--java/res/xml/rows_symbols_shift.xml1
574 files changed, 12962 insertions, 8044 deletions
diff --git a/java/res/color/key_text_color_holo.xml b/java/res/color/key_text_color_holo.xml
deleted file mode 100644
index d034a945f..000000000
--- a/java/res/color/key_text_color_holo.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Functional keys. -->
- <item android:state_single="true" android:state_pressed="true"
- android:color="@color/key_text_color_functional_holo" />
- <item android:state_single="true"
- android:color="@color/key_text_color_functional_holo" />
-
- <!-- Action keys. -->
- <item android:state_active="true" android:state_pressed="true"
- android:color="@color/key_text_color_normal_holo" />
- <item android:state_active="true"
- android:color="@color/key_text_color_normal_holo" />
-
- <!-- Toggle keys. Use checkable/checked state. -->
- <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
- android:color="@color/key_text_color_normal_holo" />
- <item android:state_checkable="true" android:state_pressed="true"
- android:color="@color/key_text_color_normal_holo" />
- <item android:state_checkable="true" android:state_checked="true"
- android:color="@color/key_text_color_normal_holo" />
- <item android:state_checkable="true"
- android:color="@color/key_text_color_normal_holo" />
-
- <!-- Empty background keys. -->
- <item android:state_empty="true"
- android:color="@color/key_text_color_normal_holo" />
-
- <!-- Normal keys. -->
- <item android:state_pressed="true"
- android:color="@color/key_text_color_normal_holo" />
- <item android:color="@color/key_text_color_normal_holo" />
-</selector>
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
deleted file mode 100644
index 3e25180f0..000000000
--- a/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
deleted file mode 100644
index bad360f77..000000000
--- a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
deleted file mode 100644
index 49f519860..000000000
--- a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
deleted file mode 100644
index e784eddf8..000000000
--- a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
deleted file mode 100644
index a4731cf1a..000000000
--- a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
deleted file mode 100644
index 03e163c9c..000000000
--- a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_launcher_keyboard.png b/java/res/drawable-hdpi/ic_launcher_keyboard.png
new file mode 100644
index 000000000..7ae00ed3f
--- /dev/null
+++ b/java/res/drawable-hdpi/ic_launcher_keyboard.png
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_subtype_mic_dark.png b/java/res/drawable-hdpi/ic_subtype_mic_dark.png
deleted file mode 100644
index eacbcd255..000000000
--- a/java/res/drawable-hdpi/ic_subtype_mic_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_background_gb.9.png b/java/res/drawable-hdpi/keyboard_background_gb.9.png
deleted file mode 100644
index fa3d449f7..000000000
--- a/java/res/drawable-hdpi/keyboard_background_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_klp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_klp.9.png
index 50ed568ff..be394151a 100644
--- a/java/res/drawable-hdpi/keyboard_key_feedback_background_klp.9.png
+++ b/java/res/drawable-hdpi/keyboard_key_feedback_background_klp.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_gb.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_gb.9.png
deleted file mode 100644
index baff80950..000000000
--- a/java/res/drawable-hdpi/keyboard_popup_panel_background_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip_gb.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip_gb.9.png
deleted file mode 100644
index 7cab5a899..000000000
--- a/java/res/drawable-hdpi/keyboard_suggest_strip_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
index d75fcacd5..d85663bf3 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png
index 5af09ad8c..2ea4a74a5 100644
--- a/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png
+++ b/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space.png b/java/res/drawable-hdpi/sym_keyboard_space.png
index 780733ec5..78cd6b7bf 100644
--- a/java/res/drawable-hdpi/sym_keyboard_space.png
+++ b/java/res/drawable-hdpi/sym_keyboard_space.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space_led_gb.9.png b/java/res/drawable-hdpi/sym_keyboard_space_led_gb.9.png
deleted file mode 100644
index c76f64b94..000000000
--- a/java/res/drawable-hdpi/sym_keyboard_space_led_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png
deleted file mode 100644
index 12bc97928..000000000
--- a/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
deleted file mode 100644
index 44bd414a1..000000000
--- a/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
deleted file mode 100644
index 43fdf5b88..000000000
--- a/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png
deleted file mode 100644
index 1c1f3d711..000000000
--- a/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
deleted file mode 100644
index dacb675a9..000000000
--- a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
deleted file mode 100644
index 3daa69f31..000000000
--- a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_launcher_keyboard.png b/java/res/drawable-mdpi/ic_launcher_keyboard.png
new file mode 100644
index 000000000..cc73f3be1
--- /dev/null
+++ b/java/res/drawable-mdpi/ic_launcher_keyboard.png
Binary files differ
diff --git a/java/res/drawable-mdpi/keyboard_background_gb.9.png b/java/res/drawable-mdpi/keyboard_background_gb.9.png
deleted file mode 100644
index 4f81704c4..000000000
--- a/java/res/drawable-mdpi/keyboard_background_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_klp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_klp.9.png
index 564f5460c..625490b1f 100644
--- a/java/res/drawable-mdpi/keyboard_key_feedback_background_klp.9.png
+++ b/java/res/drawable-mdpi/keyboard_key_feedback_background_klp.9.png
Binary files differ
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_gb.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_gb.9.png
deleted file mode 100644
index 0d9ab97f0..000000000
--- a/java/res/drawable-mdpi/keyboard_popup_panel_background_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/keyboard_suggest_strip_gb.9.png b/java/res/drawable-mdpi/keyboard_suggest_strip_gb.9.png
deleted file mode 100644
index fa6c0feff..000000000
--- a/java/res/drawable-mdpi/keyboard_suggest_strip_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/more_keys_divider.png b/java/res/drawable-mdpi/more_keys_divider.png
index a46284f21..0f71c6172 100644
--- a/java/res/drawable-mdpi/more_keys_divider.png
+++ b/java/res/drawable-mdpi/more_keys_divider.png
Binary files differ
diff --git a/java/res/drawable-mdpi/more_suggestions_divider.png b/java/res/drawable-mdpi/more_suggestions_divider.png
index a46284f21..0f71c6172 100644
--- a/java/res/drawable-mdpi/more_suggestions_divider.png
+++ b/java/res/drawable-mdpi/more_suggestions_divider.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png
index a10dc8fa2..fee15807c 100644
--- a/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.png
deleted file mode 100644
index 537f39b02..000000000
--- a/java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_mic_holo_light.png b/java/res/drawable-mdpi/sym_keyboard_mic_holo_light.png
deleted file mode 100644
index 84a63dc7f..000000000
--- a/java/res/drawable-mdpi/sym_keyboard_mic_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png
index 36c8c9623..613f4dc88 100644
--- a/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png
+++ b/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_space.png b/java/res/drawable-mdpi/sym_keyboard_space.png
index cbe4a88d6..6d03e6347 100644
--- a/java/res/drawable-mdpi/sym_keyboard_space.png
+++ b/java/res/drawable-mdpi/sym_keyboard_space.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_space_led_gb.9.png b/java/res/drawable-mdpi/sym_keyboard_space_led_gb.9.png
deleted file mode 100644
index 1c1ca2cc7..000000000
--- a/java/res/drawable-mdpi/sym_keyboard_space_led_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png
deleted file mode 100644
index 026005d6f..000000000
--- a/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png
deleted file mode 100644
index 38c5f244b..000000000
--- a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png
deleted file mode 100644
index f1223e50e..000000000
--- a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png
deleted file mode 100644
index ec35db54d..000000000
--- a/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png
deleted file mode 100644
index bd30464d6..000000000
--- a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png
deleted file mode 100644
index a3ff5d1bb..000000000
--- a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_launcher_keyboard.png b/java/res/drawable-xhdpi/ic_launcher_keyboard.png
new file mode 100644
index 000000000..f2ac50dfe
--- /dev/null
+++ b/java/res/drawable-xhdpi/ic_launcher_keyboard.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_subtype_mic_dark.png b/java/res/drawable-xhdpi/ic_subtype_mic_dark.png
deleted file mode 100644
index 17581ba89..000000000
--- a/java/res/drawable-xhdpi/ic_subtype_mic_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_background_gb.9.png b/java/res/drawable-xhdpi/keyboard_background_gb.9.png
deleted file mode 100644
index 27b7a108c..000000000
--- a/java/res/drawable-xhdpi/keyboard_background_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_klp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_klp.9.png
index e8c65f677..c211d89c8 100644
--- a/java/res/drawable-xhdpi/keyboard_key_feedback_background_klp.9.png
+++ b/java/res/drawable-xhdpi/keyboard_key_feedback_background_klp.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_gb.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_gb.9.png
deleted file mode 100644
index 79f7ab00a..000000000
--- a/java/res/drawable-xhdpi/keyboard_popup_panel_background_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_suggest_strip_gb.9.png b/java/res/drawable-xhdpi/keyboard_suggest_strip_gb.9.png
deleted file mode 100644
index 1b568df03..000000000
--- a/java/res/drawable-xhdpi/keyboard_suggest_strip_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_tab.png
index 0650e01cb..b0ee35d59 100644
--- a/java/res/drawable-xhdpi/sym_keyboard_feedback_tab.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_tab.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png
index 99ee97dbf..15a97394e 100644
--- a/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_space.png b/java/res/drawable-xhdpi/sym_keyboard_space.png
index 66fc3e9d3..3691280e3 100644
--- a/java/res/drawable-xhdpi/sym_keyboard_space.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_space.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_space_led_gb.9.png b/java/res/drawable-xhdpi/sym_keyboard_space_led_gb.9.png
deleted file mode 100644
index 6525fefab..000000000
--- a/java/res/drawable-xhdpi/sym_keyboard_space_led_gb.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_launcher_keyboard.png b/java/res/drawable-xxhdpi/ic_launcher_keyboard.png
new file mode 100644
index 000000000..df386e827
--- /dev/null
+++ b/java/res/drawable-xxhdpi/ic_launcher_keyboard.png
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_subtype_mic_dark.png b/java/res/drawable-xxhdpi/ic_subtype_mic_dark.png
deleted file mode 100644
index 811103a56..000000000
--- a/java/res/drawable-xxhdpi/ic_subtype_mic_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_klp.9.png
index 11eee94f3..fd2f9e514 100644
--- a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_klp.9.png
+++ b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_klp.9.png
Binary files differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_klp.9.png
index 2079e0462..3ab79007e 100644
--- a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_klp.9.png
+++ b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_klp.9.png
Binary files differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_klp.9.png
index c4178d9a8..99543a1e0 100644
--- a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_klp.9.png
+++ b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_klp.9.png
Binary files differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_klp.9.png
index d3d8733fd..e9e379287 100644
--- a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_klp.9.png
+++ b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_klp.9.png
Binary files differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_klp.9.png
index d7ec8bcb2..6c1143aeb 100644
--- a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_klp.9.png
+++ b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_klp.9.png
Binary files differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png
index 7041bb6ce..bf643e1d8 100644
--- a/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png
+++ b/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png
Binary files differ
diff --git a/java/res/drawable/btn_keyboard_key_gb.xml b/java/res/drawable/btn_keyboard_key_gb.xml
deleted file mode 100644
index 3fc253e85..000000000
--- a/java/res/drawable/btn_keyboard_key_gb.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Functional keys. -->
- <item android:state_single="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed" />
- <item android:state_single="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal" />
-
- <!-- Action keys. -->
- <item android:state_active="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed" />
- <item android:state_active="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal" />
-
- <!-- Toggle keys. Use checkable/checked state. -->
- <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_on" />
- <item android:state_checkable="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_off" />
- <item android:state_checkable="true" android:state_checked="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal_on" />
- <item android:state_checkable="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal_off" />
-
- <!-- Empty background keys. -->
- <item android:state_empty="true"
- android:drawable="@drawable/transparent" />
-
- <!-- Normal keys. -->
- <item android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_light_pressed" />
- <item android:drawable="@drawable/btn_keyboard_key_light_normal" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_key_functional_gb.xml b/java/res/drawable/btn_keyboard_spacebar_ics.xml
index 431359c20..4530ea079 100644
--- a/java/res/drawable/btn_keyboard_key_functional_gb.xml
+++ b/java/res/drawable/btn_keyboard_spacebar_ics.xml
@@ -15,8 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Functional keys. -->
<item android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed" />
- <item android:drawable="@drawable/btn_keyboard_key_dark_normal" />
+ android:drawable="@drawable/btn_keyboard_key_light_pressed_ics" />
+ <item android:drawable="@drawable/btn_keyboard_key_light_normal_holo" />
</selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_gb.xml b/java/res/drawable/btn_keyboard_spacebar_klp.xml
index 9e3670d22..6b07a392f 100644
--- a/java/res/drawable/btn_keyboard_key_popup_gb.xml
+++ b/java/res/drawable/btn_keyboard_spacebar_klp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,6 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_light_popup_selected" />
- <item android:drawable="@drawable/transparent" />
+ android:drawable="@drawable/btn_keyboard_key_light_pressed_klp" />
+ <item android:drawable="@drawable/btn_keyboard_key_light_normal_holo" />
</selector>
diff --git a/java/res/drawable/keyboard_key_feedback_gb.xml b/java/res/drawable/keyboard_key_feedback_gb.xml
deleted file mode 100644
index 397e948d8..000000000
--- a/java/res/drawable/keyboard_key_feedback_gb.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <item latin:state_has_morekeys="true"
- android:drawable="@drawable/keyboard_key_feedback_more_background" />
- <item android:drawable="@drawable/keyboard_key_feedback_background" />
-</selector>
diff --git a/java/res/layout/emoji_keyboard_page.xml b/java/res/layout/emoji_keyboard_page.xml
index e0b752b32..9afad366a 100644
--- a/java/res/layout/emoji_keyboard_page.xml
+++ b/java/res/layout/emoji_keyboard_page.xml
@@ -18,16 +18,9 @@
*/
-->
-<com.android.inputmethod.keyboard.internal.ScrollViewWithNotifier
+<com.android.inputmethod.keyboard.internal.EmojiPageKeyboardView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/emoji_keyboard_scroller"
- android:clipToPadding="false"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
->
- <com.android.inputmethod.keyboard.internal.ScrollKeyboardView
- android:id="@+id/emoji_keyboard_page"
- android:layoutDirection="ltr"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
-</com.android.inputmethod.keyboard.internal.ScrollViewWithNotifier>
+ android:id="@+id/emoji_keyboard_page"
+ android:layoutDirection="ltr"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
diff --git a/java/res/layout/emoji_keyboard_tab_icon.xml b/java/res/layout/emoji_keyboard_tab_icon.xml
index 1609f6a26..13bb41ca2 100644
--- a/java/res/layout/emoji_keyboard_tab_icon.xml
+++ b/java/res/layout/emoji_keyboard_tab_icon.xml
@@ -18,10 +18,12 @@
*/
-->
+<!-- Note: contentDescription will be added programatically in {@link EmojiPalettesView}. -->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="0dip"
android:layout_weight="1.0"
android:layout_height="wrap_content"
android:gravity="center"
android:scaleType="center"
+ android:contentDescription="@null"
/>
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml
index 1c6da90ba..552a474b4 100644
--- a/java/res/layout/emoji_palettes_view.xml
+++ b/java/res/layout/emoji_palettes_view.xml
@@ -29,7 +29,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="@dimen/suggestions_strip_height"
+ android:layout_height="@dimen/config_suggestions_strip_height"
>
<TabHost
android:id="@+id/emoji_category_tabhost"
@@ -71,7 +71,8 @@
android:layout_weight="12.5"
android:layout_height="match_parent"
android:background="@color/emoji_key_background_color"
- android:src="@drawable/sym_keyboard_delete_holo_dark" />
+ android:src="@drawable/sym_keyboard_delete_holo_dark"
+ android:contentDescription="@string/spoken_description_delete" />
</LinearLayout>
<android.support.v4.view.ViewPager
android:id="@+id/emoji_keyboard_pager"
@@ -89,22 +90,23 @@
android:layout_height="0dip"
android:layout_weight="1"
>
- <ImageButton
- android:id="@+id/emoji_keyboard_alphabet"
+ <TextView
+ android:id="@+id/emoji_keyboard_alphabet_left"
android:layout_width="0dip"
android:layout_weight="0.15"
- android:layout_height="match_parent"
- android:src="@drawable/ic_ime_switcher_dark" />
+ android:gravity="center"
+ android:layout_height="match_parent" />
<ImageButton
android:id="@+id/emoji_keyboard_space"
android:layout_width="0dip"
android:layout_weight="0.70"
- android:layout_height="match_parent" />
- <ImageButton
- android:id="@+id/emoji_keyboard_alphabet2"
+ android:layout_height="match_parent"
+ android:contentDescription="@string/spoken_description_space"/>
+ <TextView
+ android:id="@+id/emoji_keyboard_alphabet_right"
android:layout_width="0dip"
android:layout_weight="0.15"
- android:layout_height="match_parent"
- android:src="@drawable/ic_ime_switcher_dark" />
+ android:gravity="center"
+ android:layout_height="match_parent" />
</LinearLayout>
</com.android.inputmethod.keyboard.EmojiPalettesView>
diff --git a/java/res/layout/hint_add_to_dictionary.xml b/java/res/layout/hint_add_to_dictionary.xml
deleted file mode 100644
index 68a9faf19..000000000
--- a/java/res/layout/hint_add_to_dictionary.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- This is derived from suggestion_word.xml without minWidth attribute and padding -->
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:textSize="@dimen/suggestion_text_size"
- android:gravity="center"
- android:paddingLeft="0dp"
- android:paddingTop="0dp"
- android:paddingRight="0dp"
- android:paddingBottom="0dp"
- android:focusable="false"
- android:clickable="false"
- android:singleLine="true"
- android:ellipsize="none"
- style="?attr/suggestionWordStyle" />
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index 1e7a3844e..ed387e5b2 100644
--- a/java/res/layout/input_view.xml
+++ b/java/res/layout/input_view.xml
@@ -41,10 +41,10 @@
android:id="@+id/suggestion_strip_view"
android:layoutDirection="ltr"
android:layout_width="match_parent"
- android:layout_height="@dimen/suggestions_strip_height"
+ android:layout_height="@dimen/config_suggestions_strip_height"
android:gravity="center_vertical"
- android:paddingRight="@dimen/suggestions_strip_padding"
- android:paddingLeft="@dimen/suggestions_strip_padding"
+ android:paddingRight="@dimen/config_suggestions_strip_horizontal_padding"
+ android:paddingLeft="@dimen/config_suggestions_strip_horizontal_padding"
style="?attr/suggestionStripViewStyle" />
<!-- To ensure that key preview popup is correctly placed when the current system locale is
diff --git a/java/res/layout/key_preview_klp.xml b/java/res/layout/key_preview.xml
index 160aeb9a9..16d4c72c3 100644
--- a/java/res/layout/key_preview_klp.xml
+++ b/java/res/layout/key_preview.xml
@@ -21,7 +21,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/keyboard_key_feedback_klp"
android:minWidth="32dp"
android:gravity="center"
+ style="?attr/keyPreviewTextViewStyle"
/>
diff --git a/java/res/layout/more_keys_keyboard.xml b/java/res/layout/more_keys_keyboard.xml
index 6637117e0..f3795afdc 100644
--- a/java/res/layout/more_keys_keyboard.xml
+++ b/java/res/layout/more_keys_keyboard.xml
@@ -22,11 +22,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- style="?attr/moreKeysKeyboardContainerStyle"
+ android:orientation="vertical"
>
<com.android.inputmethod.keyboard.MoreKeysKeyboardView
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
android:id="@+id/more_keys_keyboard_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
diff --git a/java/res/layout/more_suggestions.xml b/java/res/layout/more_suggestions.xml
index 8659f0761..0869992c9 100644
--- a/java/res/layout/more_suggestions.xml
+++ b/java/res/layout/more_suggestions.xml
@@ -22,16 +22,15 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- style="?attr/moreKeysKeyboardContainerStyle"
+ android:orientation="vertical"
>
<com.android.inputmethod.latin.suggestions.MoreSuggestionsView
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
android:id="@+id/more_suggestions_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- latin:keyLetterSize="@dimen/suggestion_text_size"
- latin:keyLabelSize="@dimen/suggestion_text_size"
- latin:keyHintLetterRatio="@fraction/more_suggestions_info_ratio"
+ latin:keyLetterSize="@dimen/config_suggestion_text_size"
+ latin:keyLabelSize="@dimen/config_suggestion_text_size"
+ latin:keyHintLetterRatio="@fraction/config_more_suggestions_info_ratio"
latin:keyHintLetterColor="@android:color/white" />
</LinearLayout>
diff --git a/java/res/layout/research_feedback_fragment_layout.xml b/java/res/layout/research_feedback_fragment_layout.xml
index 505a1e8d9..fb5c27815 100644
--- a/java/res/layout/research_feedback_fragment_layout.xml
+++ b/java/res/layout/research_feedback_fragment_layout.xml
@@ -84,40 +84,32 @@
android:checked="false"
android:text="@string/research_feedback_include_recording_label" />
<LinearLayout
+ style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:divider="?android:attr/dividerHorizontal"
- android:showDividers="beginning"
- android:dividerPadding="0dip">
- <LinearLayout
- style="?android:attr/buttonBarStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layoutDirection="locale"
- android:measureWithLargestChild="true">
- <Button
- android:id="@+id/research_feedback_cancel_button"
- android:layout_width="wrap_content"
- android:layout_gravity="left"
- android:layout_weight="1"
- android:maxLines="2"
- style="?android:attr/buttonBarButtonStyle"
- android:textSize="14sp"
- android:text="@string/research_feedback_cancel"
- android:layout_height="wrap_content" />
- <Button
- android:id="@+id/research_feedback_send_button"
- android:layout_width="wrap_content"
- android:layout_gravity="right"
- android:layout_weight="1"
- android:maxLines="2"
- style="?android:attr/buttonBarButtonStyle"
- android:textSize="14sp"
- android:text="@string/research_feedback_send"
- android:layout_height="wrap_content" />
- </LinearLayout>
+ android:orientation="horizontal"
+ android:layoutDirection="locale"
+ android:measureWithLargestChild="true">
+ <Button
+ android:id="@+id/research_feedback_cancel_button"
+ android:layout_width="wrap_content"
+ android:layout_gravity="left"
+ android:layout_weight="1"
+ android:maxLines="2"
+ style="?android:attr/buttonBarButtonStyle"
+ android:textSize="14sp"
+ android:text="@string/research_feedback_cancel"
+ android:layout_height="wrap_content" />
+ <Button
+ android:id="@+id/research_feedback_send_button"
+ android:layout_width="wrap_content"
+ android:layout_gravity="right"
+ android:layout_weight="1"
+ android:maxLines="2"
+ style="?android:attr/buttonBarButtonStyle"
+ android:textSize="14sp"
+ android:text="@string/research_feedback_send"
+ android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</ScrollView>
diff --git a/java/res/layout/seek_bar_dialog.xml b/java/res/layout/seek_bar_dialog.xml
index a47e9a038..e723ad9bb 100644
--- a/java/res/layout/seek_bar_dialog.xml
+++ b/java/res/layout/seek_bar_dialog.xml
@@ -33,7 +33,7 @@
<TextView android:id="@+id/seek_bar_dialog_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="20dp"/>
+ android:textSize="20sp"/>
</LinearLayout>
<SeekBar
android:id="@+id/seek_bar_dialog_bar"
diff --git a/java/res/layout/setup_steps_title.xml b/java/res/layout/setup_steps_title.xml
index e3694bfe0..9ee8693f8 100644
--- a/java/res/layout/setup_steps_title.xml
+++ b/java/res/layout/setup_steps_title.xml
@@ -21,7 +21,5 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
android:id="@+id/setup_title"
- style="@style/setupTitleStyle"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true" />
+ style="@style/setupTitleStyle" />
</merge>
diff --git a/java/res/layout/setup_welcome_title.xml b/java/res/layout/setup_welcome_title.xml
index af7053a37..2c3b48919 100644
--- a/java/res/layout/setup_welcome_title.xml
+++ b/java/res/layout/setup_welcome_title.xml
@@ -21,9 +21,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
android:id="@+id/setup_welcome_title"
- style="@style/setupTitleStyle"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true" />
+ style="@style/setupTitleStyle" />
<TextView
android:id="@+id/setup_welcome_description"
android:text="@string/setup_welcome_additional_description"
diff --git a/java/res/layout/suggestion_divider.xml b/java/res/layout/suggestion_divider.xml
index a8b78c082..149095147 100644
--- a/java/res/layout/suggestion_divider.xml
+++ b/java/res/layout/suggestion_divider.xml
@@ -23,5 +23,6 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/suggestions_strip_divider"
+ android:contentDescription="@null"
android:padding="0dp"
android:gravity="center" />
diff --git a/java/res/layout/suggestion_info.xml b/java/res/layout/suggestion_info.xml
deleted file mode 100644
index 0aa26000d..000000000
--- a/java/res/layout/suggestion_info.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="6dp"
- android:textColor="@android:color/white"
- style="?attr/suggestionWordStyle" />
diff --git a/java/res/layout/suggestion_word.xml b/java/res/layout/suggestion_word.xml
deleted file mode 100644
index c82a13c99..000000000
--- a/java/res/layout/suggestion_word.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Provide a haptic feedback by ourselves based on the keyboard settings.
- We just need to ignore the system's haptic feedback settings. -->
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:minWidth="@dimen/suggestion_min_width"
- android:textSize="@dimen/suggestion_text_size"
- android:gravity="center"
- android:paddingLeft="@dimen/suggestion_padding"
- android:paddingTop="0dp"
- android:paddingRight="@dimen/suggestion_padding"
- android:paddingBottom="0dp"
- android:hapticFeedbackEnabled="false"
- android:focusable="false"
- android:clickable="false"
- android:singleLine="true"
- android:ellipsize="none"
- style="?attr/suggestionWordStyle" />
diff --git a/java/res/layout/suggestions_strip.xml b/java/res/layout/suggestions_strip.xml
index cbf31e6dc..0b614993b 100644
--- a/java/res/layout/suggestions_strip.xml
+++ b/java/res/layout/suggestions_strip.xml
@@ -19,12 +19,43 @@
-->
<merge
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+ xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:id="@+id/suggestions_strip"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent" />
+ <LinearLayout
+ android:id="@+id/add_to_dictionary_strip"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="invisible">
+ <TextView
+ android:id="@+id/word_to_save"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ style="?attr/suggestionWordStyle" />
+ <include
+ layout="@layout/suggestion_divider" />
+ <TextView
+ android:id="@+id/hint_add_to_dictionary"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:textAlignment="viewStart"
+ style="?attr/suggestionWordStyle" />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/important_notice_strip"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <TextView
+ android:id="@+id/important_notice_title"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="6sp"
+ android:textSize="16sp"
+ style="?attr/suggestionWordStyle" />
+ </LinearLayout>
</merge>
diff --git a/java/res/layout/user_dictionary_add_word.xml b/java/res/layout/user_dictionary_add_word.xml
index bbf9b1b5b..615fde589 100644
--- a/java/res/layout/user_dictionary_add_word.xml
+++ b/java/res/layout/user_dictionary_add_word.xml
@@ -52,48 +52,39 @@
android:hint="@string/user_dict_settings_add_word_hint"
android:imeOptions="flagNoFullscreen"
android:inputType="textNoSuggestions"
- android:maxLength="@integer/user_dictionary_max_word_length" >
+ android:maxLength="@integer/config_user_dictionary_max_word_length" >
<requestFocus />
</EditText>
<LinearLayout
+ style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:divider="?android:attr/dividerHorizontal"
- android:dividerPadding="0dip"
- android:orientation="vertical"
- android:showDividers="beginning" >
+ android:measureWithLargestChild="true"
+ android:orientation="horizontal" >
- <LinearLayout
- style="?android:attr/buttonBarStyle"
- android:layout_width="match_parent"
+ <Button
+ style="?android:attr/buttonBarButtonStyle"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
- android:measureWithLargestChild="true"
- android:orientation="horizontal" >
-
- <Button
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_gravity="start"
- android:layout_weight="1"
- android:maxLines="2"
- android:onClick="onClickCancel"
- android:text="@string/cancel"
- android:textSize="14sp" />
+ android:layout_gravity="start"
+ android:layout_weight="1"
+ android:maxLines="2"
+ android:onClick="onClickCancel"
+ android:text="@string/cancel"
+ android:textSize="14sp" />
- <Button
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_gravity="end"
- android:layout_weight="1"
- android:maxLines="2"
- android:onClick="onClickConfirm"
- android:text="@string/user_dict_settings_add_dialog_confirm"
- android:textSize="14sp" />
- </LinearLayout>
+ <Button
+ style="?android:attr/buttonBarButtonStyle"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:layout_weight="1"
+ android:maxLines="2"
+ android:onClick="onClickConfirm"
+ android:text="@string/user_dict_settings_add_dialog_confirm"
+ android:textSize="14sp" />
</LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/java/res/layout/user_dictionary_add_word_fullscreen.xml b/java/res/layout/user_dictionary_add_word_fullscreen.xml
index 219485b66..9bcb189b4 100644
--- a/java/res/layout/user_dictionary_add_word_fullscreen.xml
+++ b/java/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -30,7 +30,7 @@
android:hint="@string/user_dict_settings_add_word_hint"
android:imeOptions="flagNoFullscreen"
android:inputType="textNoSuggestions"
- android:maxLength="@integer/user_dictionary_max_word_length" >
+ android:maxLength="@integer/config_user_dictionary_max_word_length" >
<requestFocus />
</EditText>
@@ -61,7 +61,7 @@
android:hint="@string/user_dict_settings_add_shortcut_hint"
android:imeOptions="flagNoFullscreen"
android:inputType="textNoSuggestions"
- android:maxLength="@integer/user_dictionary_max_word_length" />
+ android:maxLength="@integer/config_user_dictionary_max_word_length" />
<TextView
android:id="@+id/user_dictionary_add_locale_label"
diff --git a/java/res/layout/user_dictionary_item.xml b/java/res/layout/user_dictionary_item.xml
index 56bad7743..b8d48b56d 100644
--- a/java/res/layout/user_dictionary_item.xml
+++ b/java/res/layout/user_dictionary_item.xml
@@ -19,10 +19,11 @@
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingEnd="?android:attr/scrollbarSize" >
+ android:paddingEnd="?android:attr/scrollbarSize"
+ android:baselineAligned="false" >
<RelativeLayout
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="6dip"
android:layout_weight="1" >
diff --git a/java/res/mipmap-hdpi/ic_launcher_keyboard.png b/java/res/mipmap-hdpi/ic_launcher_keyboard.png
deleted file mode 100644
index 36b1ccae2..000000000
--- a/java/res/mipmap-hdpi/ic_launcher_keyboard.png
+++ /dev/null
Binary files differ
diff --git a/java/res/mipmap-mdpi/ic_launcher_keyboard.png b/java/res/mipmap-mdpi/ic_launcher_keyboard.png
deleted file mode 100644
index 67ef189ff..000000000
--- a/java/res/mipmap-mdpi/ic_launcher_keyboard.png
+++ /dev/null
Binary files differ
diff --git a/java/res/mipmap-xhdpi/ic_launcher_keyboard.png b/java/res/mipmap-xhdpi/ic_launcher_keyboard.png
deleted file mode 100644
index b33208332..000000000
--- a/java/res/mipmap-xhdpi/ic_launcher_keyboard.png
+++ /dev/null
Binary files differ
diff --git a/java/res/mipmap-xxhdpi/ic_launcher_keyboard.png b/java/res/mipmap-xxhdpi/ic_launcher_keyboard.png
deleted file mode 100644
index acc424fe2..000000000
--- a/java/res/mipmap-xxhdpi/ic_launcher_keyboard.png
+++ /dev/null
Binary files differ
diff --git a/java/res/raw/main_de.dict b/java/res/raw/main_de.dict
index 69796bbaa..3cbf7105d 100644
--- a/java/res/raw/main_de.dict
+++ b/java/res/raw/main_de.dict
Binary files differ
diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict
index 09b69927f..49adc9a19 100644
--- a/java/res/raw/main_en.dict
+++ b/java/res/raw/main_en.dict
Binary files differ
diff --git a/java/res/raw/main_es.dict b/java/res/raw/main_es.dict
index 261ab8c87..fe24cd624 100644
--- a/java/res/raw/main_es.dict
+++ b/java/res/raw/main_es.dict
Binary files differ
diff --git a/java/res/raw/main_fr.dict b/java/res/raw/main_fr.dict
index 0e5a71360..94d1b9670 100644
--- a/java/res/raw/main_fr.dict
+++ b/java/res/raw/main_fr.dict
Binary files differ
diff --git a/java/res/raw/main_it.dict b/java/res/raw/main_it.dict
index e161c2475..ff11b9798 100644
--- a/java/res/raw/main_it.dict
+++ b/java/res/raw/main_it.dict
Binary files differ
diff --git a/java/res/raw/main_pt_br.dict b/java/res/raw/main_pt_br.dict
index 21bbe7c67..9fa50442a 100644
--- a/java/res/raw/main_pt_br.dict
+++ b/java/res/raw/main_pt_br.dict
Binary files differ
diff --git a/java/res/raw/main_ru.dict b/java/res/raw/main_ru.dict
index 7dec62425..0f08f1735 100644
--- a/java/res/raw/main_ru.dict
+++ b/java/res/raw/main_ru.dict
Binary files differ
diff --git a/java/res/values-af/strings-config-important-notice.xml b/java/res/values-af/strings-config-important-notice.xml
new file mode 100644
index 000000000..edd54d6f0
--- /dev/null
+++ b/java/res/values-af/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Leer uit jou kommunikasie en getikte data om voorstelle te verbeter"</string>
+</resources>
diff --git a/java/res/values-af/strings-talkback-descriptions.xml b/java/res/values-af/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..3529e5a5d
--- /dev/null
+++ b/java/res/values-af/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Koppel \'n kopstuk om te hoor hoe wagwoordsleutels hardop gesê word."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Huidige teks is %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Geen teks is ingevoer nie"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> korrigeer <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> na <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> voer outokorrigering uit"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Sleutelkode %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift aan (tik om te deaktiveer)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Kasslot aan (tik om te deaktiveer)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Vee uit"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simbole"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Letters"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Nommers"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Instellings"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Spasie"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Steminvoer"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emosiekone"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Keer terug"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Soek"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Punt"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Verander taal"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Volgende"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Vorige"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift geaktiveer"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Bokas-slot geaktiveer"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift gedeaktiveer"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Simboolmodus"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Lettermodus"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Foonmodus"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Foonsimbool-modus"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Sleutelbord is versteek"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Wys tans <xliff:g id="KEYBOARD_MODE">%s</xliff:g>-sleutelbord"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"datum"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"datum en tyd"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-pos"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"boodskappe"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"nommer"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"foon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"teks"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"tyd"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Onlangse emosiekone"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Mense"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Voorwerpe"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natuur"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Plekke"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simbole"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emosiekone"</string>
+</resources>
diff --git a/java/res/values-af/strings.xml b/java/res/values-af/strings.xml
index 045e97d94..ce7cb18fc 100644
--- a/java/res/values-af/strings.xml
+++ b/java/res/values-af/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Stelsel se verstek"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Stel kontakname voor"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Gebruik name van kontakte vir voorstelle en korreksies"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Gepersonaliseerde voorstelle"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Dubbelspasie-punt"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Dubbeltik op spasiebalk voeg \'n punt in, gevolg deur \'n spasie"</string>
<string name="auto_cap" msgid="1719746674854628252">"Outohoofletters"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Wys gebaarspoor"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dinamiese sweefvoorskou"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Sien die voorgestelde woord tydens gebare"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Gestoor"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Koppel \'n kopstuk om te hoor hoe wagwoordsleutels hardop gesê word."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Huidige teks is %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Geen teks ingevoer nie"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> korrigeer <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> na <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> voer outokorreksie uit"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Sleutelkode %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift aan (tik om te deaktiveer)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Kasslot aan (tik om te deaktiveer)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Vee uit"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Simbole"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Letters"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Nommers"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Instellings"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Oortjie"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Spasie"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Steminvoering"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Glimlag-gesiggie"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Soek"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Punt"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Verander taal"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Volgende"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Vorige"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift geaktiveer"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Kasslot geaktiveer"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift gedeaktiveer"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Simboolmodus"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Lettermodus"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Foonmodus"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Foonsimbool-modus"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Sleutelbord versteek"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Wys <xliff:g id="MODE">%s</xliff:g>-sleutelbord"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"datum"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"datum en tyd"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-pos"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"boodskappe"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"nommer"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"foon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"teks"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"tyd"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Frasegebaar"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Voer spasies tydens gebare in deur na die spasiesleutel te gly"</string>
<string name="voice_input" msgid="3583258583521397548">"Steminvoerinstellings"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Op hoofsleutelbord"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Op simbolesleutelbord"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Af"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikrofoon op hoofsleutelbord"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikrofoon op simbolesleutelbord"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Steminvoer is gedeaktiveer"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Geen steminvoermetodes geaktiveer nie. Gaan taal- en invoerinstellings na."</string>
<string name="configure_input_method" msgid="373356270290742459">"Stel invoermetodes op"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Invoertale"</string>
<string name="send_feedback" msgid="1780431884109392046">"Stuur terugvoer"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Engels (VK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engels (VS)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spaans (VS)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Engels (VK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Engels (VS) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spaans (VS) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Tradisioneel)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Engels (VK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Engels (VS) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spaans (VS) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Tradisioneel)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Cyrillies)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latyns)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Geen taal nie (alfabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabet (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Lees eksterne woordeboeklêer"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Geen woordeboeklêers in die aflaaiselsvouer nie"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Kies \'n woordeboeklêer om te installeer"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Moet hierdie lêer regtig vir <xliff:g id="LOCALE_NAME">%s</xliff:g> geïnstalleer word?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Moet hierdie lêer regtig vir <xliff:g id="LANGUAGE_NAME">%s</xliff:g> geïnstalleer word?"</string>
<string name="error" msgid="8940763624668513648">"Daar was \'n fout"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Lys kontaktewoordeboek"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Lys persoonlike woordeboek"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Lys gebruikergeskiedeniswoordeboek"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Lys personaliseringwoordeboek"</string>
<string name="button_default" msgid="3988017840431881491">"Verstek"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Welkom by <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"met Gebaar-tik"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Verfris"</string>
<string name="last_update" msgid="730467549913588780">"Laas opgedateer"</string>
<string name="message_updating" msgid="4457761393932375219">"Kontroleer vir opdaterings"</string>
- <string name="message_loading" msgid="8689096636874758814">"Laai tans…"</string>
+ <string name="message_loading" msgid="5638680861387748936">"Laai tans…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Hoofwoordeboek"</string>
<string name="cancel" msgid="6830980399865683324">"Kanselleer"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Instellings"</string>
<string name="install_dict" msgid="180852772562189365">"Installeer"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Kanselleer"</string>
<string name="delete_dict" msgid="756853268088330054">"Vee uit"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Die gekose taal op jou mobiele toestel het \'n beskikbare woordeboek.&lt;br/&gt; Ons beveel aan dat die <xliff:g id="LANGUAGE">%1$s</xliff:g>-woordeboek &lt;b&gt;afgelaai&lt;/b&gt; word om jou tikervaring te verbeter.&lt;br/&gt; &lt;br/&gt; Dit kan \'n minuut of twee neem om oor 3G af te laai. Heffings kan dalk geld as jy nie \'n &lt;b&gt;onbeperkte dataplan&lt;/b&gt; het nie.&lt;br/&gt; As jy onseker oor jou dataplan is, beveel ons aan dat jy \'n Wi-Fi-verbinding soek om outomaties te begin aflaai.&lt;br/&gt; &lt;br/&gt; Wenk: Jy kan woordeboeke aflaai en verwyder deur te gaan na &lt;b&gt;Taal en invoer&lt;/b&gt; in die &lt;b&gt;Instellings&lt;/b&gt;-kieslys van jou mobiele toestel."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Die gekose taal op jou mobiele toestel het \'n beskikbare woordeboek.&lt;br/&gt; Ons beveel aan dat die <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>-woordeboek &lt;b&gt;afgelaai&lt;/b&gt; word om jou tikervaring te verbeter.&lt;br/&gt; &lt;br/&gt; Dit kan \'n minuut of twee duur om oor 3G af te laai. Heffings kan dalk geld as jy nie \'n &lt;b&gt;onbeperkte dataplan&lt;/b&gt; het nie.&lt;br/&gt; As jy onseker is oor watter dataplan jy het, beveel ons aan dat jy \'n Wi-Fi-verbinding soek om outomaties te begin aflaai.&lt;br/&gt; &lt;br/&gt; Wenk: Jy kan woordeboeke aflaai en verwyder deur te gaan na &lt;b&gt;Taal en invoer&lt;/b&gt; in die &lt;b&gt;Instellings&lt;/b&gt;-kieslys van jou mobiele toestel."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Laai nou af (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Laai oor Wi-Fi af"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"\'n Woordeboek is vir <xliff:g id="LANGUAGE">%1$s</xliff:g> beskikbaar"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"\'n Woordeboek is beskikbaar vir <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Druk om te hersien en af te laai"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Laai tans af: voorstelle vir <xliff:g id="LANGUAGE">%1$s</xliff:g> sal binnekort gereed wees."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Laai tans af: voorstelle vir <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> sal binnekort gereed wees."</string>
<string name="version_text" msgid="2715354215568469385">"Weergawe <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Voeg by"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Voeg by woordeboek"</string>
diff --git a/java/res/values-am/strings-config-important-notice.xml b/java/res/values-am/strings-config-important-notice.xml
new file mode 100644
index 000000000..db537dc25
--- /dev/null
+++ b/java/res/values-am/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-am/strings-talkback-descriptions.xml b/java/res/values-am/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..2d6f0e56d
--- /dev/null
+++ b/java/res/values-am/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"የይለፍ ቃል ቁልፎች ጮክ ተብለው ሲነገሩ ለመስማት የጆሮ ማዳመጫ ይሰኩ።"</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"የአሁኑ ፅሁፍ %s ነው"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"ምንም ፅሁፍ አልገባም"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>ን ወደ <xliff:g id="CORRECTED_WORD">%3$s</xliff:g> ያርመዋል"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> የራስ ሰር እርማት ያከናውናል"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"የቁልፍ ኮድ %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"ቀይር"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"መቀያየሪያ ቁልፍ በርቷል (ለማሰናከል መታ ያድርጉ)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"አብይ ፊደል ማድረጊያ ቁልፍ በርቷል (ለማሰናክል ነካ ያድርጉ)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"ሰርዝ"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"ምልክቶች"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"ደብዳቤዎች"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"ቁጥሮች"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"ቅንብሮች"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"ትር"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"ባዶ ቦታ"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"የድምፅ ግቤት"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"ኢሞጂ"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"ተመለስ"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"ፈልግ"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"ነጥብ"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"ቋንቋ ቀይር"</string>
+ <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_off" msgid="5039126122829961331">"መቀያየሪያ ቁልፍ ተሰናክሏል"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"የምልክቶች ሁኔታ"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"የደብዳቤዎች ሁኔታ"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"የስልክ ሁኔታ"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"የስልክ ምልክቶች ሁኔታ"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"የቁልፍ ሰሌዳ ተደብቋል"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"የ<xliff:g id="KEYBOARD_MODE">%s</xliff:g> የቁልፍ ሰሌዳ በማሳየት ላይ"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"ቀን"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"ቀን እና ሰዓት"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"ኢሜይል"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"መልዕክት መላላክ"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"ቁጥር"</string>
+ <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="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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"ተፈጥሮ"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"ቦታዎች"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"ምልክቶች"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"ስሜት ገላጭ አዶዎች"</string>
+</resources>
diff --git a/java/res/values-am/strings.xml b/java/res/values-am/strings.xml
index 0b81034f4..32eed413b 100644
--- a/java/res/values-am/strings.xml
+++ b/java/res/values-am/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"የስርዓት ነባሪ"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"የዕውቂያ ስም ጠቁም"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"ከዕውቂያዎች ለጥቆማዎች እና ማስተካከያዎች ስሞች ተጠቀም"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"ግላዊ የጥቆማ አስተያየቶች"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"የድርብ-ክፍተት ነጥብ"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"የክፍተት አሞሌው ላይ ሁለቴ መታ ማድረግ አንድ ነጥብ እና ክፍተት አስከትሎ ያስገባል"</string>
<string name="auto_cap" msgid="1719746674854628252">"ራስ-ሰር አቢይ ማድረግ"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"ምልክት የሚሄድበት መንገድ አሳይ"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"ተለዋዋጭ ተንሳፋፊ ቅድመ-እይታ"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"ምልክት እየሰጡ ሳሉ በአስተያየት የተጠቆመው ቃል ይመልከቱ"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : ተቀምጧል"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"የይለፍቃል ቁልፎች ጮክ በለው ሲነገሩ ለመስማት የጆሮ ማዳመጫ ሰካ::"</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"የአሁኑ ፅሁፍ %s ነው"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"ምንም ፅሁፍ አልገባም"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>ን ወደ <xliff:g id="CORRECTED">%3$s</xliff:g> ያርመዋል"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> ራስ-ሰር እርማትን ያከናውናል"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"የቁልፍ ኮድ%d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"ቀይር"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"ቅያር በርቷል (ለማሰናክል ንካ)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"አቢያት ማድረጊያ ቁልጥ በርቷል (ለማሰናክል ንካ)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"ሰርዝ"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"ምልክቶች"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"ደብዳቤዎች"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"ቁጥሮች"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"ቅንብሮች"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"ትር"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"ባዶ ቦታ"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"የድምፅ ግቤ ት"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"የፈገግታ ፊት"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"ተመለስ"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"ፍለጋ"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"ነጥብ"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"ቋንቋ ቀይር"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"ቀጣይ"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"ቀዳሚ"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"ቅያር ቁልፍ ነቅቷል"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"አቢያት ማድረጊያ ነቅቷል"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"ቅያር ተሰናክሏል"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"የምልክቶች ሁኔታ ላይ"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"የደብዳቤዎች ሁኔታ ላይ"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"የስልክ ሁኔታ ላይ"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"የስልክ ምልክቶች ሁኔታ ላይ"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"የቁልፍ ሰሌዳ ተደብቋል"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"የ<xliff:g id="MODE">%s</xliff:g> ቁልፍ ሰሌዳን በማሳየት ላይ"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"ቀን"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"ቀን እና ሰዓት"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"ኢሜይል"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"አላላክ"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"ቁጥር"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"ስልክ"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"ፅሁፍ"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"ጊዜ"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"ዩ አር ኤል"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"የሐረግ ምልክት"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"ምልክት በሚሰጡበት ጊዜ ወደ ክፍተት ቁልፉ በማንሸራተት ክፍተቶችን ያስገቡ"</string>
<string name="voice_input" msgid="3583258583521397548">"የድምፅ ግቤት ቁልፍ"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"በዋናቁልፍ ሰሌዳ ላይ"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"በምልክቶች ቁልፍ ሰሌዳ ላይ"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"ውጪ"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"ድምፅ ማጉያ በዋናው ቁልፍሰሌዳው ላይ"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"የድምፅ ማጉያ ምልክትበቁልፍ ሰሌዳላይ"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"የድምፅ ግቤት ቦዝኗል"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"ምንም የግቤት ስልቶች አልነቁም። የቋንቋ እና የግቤት ቅንብሮችን ይፈትሹ።"</string>
<string name="configure_input_method" msgid="373356270290742459">"ግቤት ሜተዶችን አዋቀር"</string>
<string name="language_selection_title" msgid="1651299598555326750">"ቋንቋዎች አግቤት"</string>
<string name="send_feedback" msgid="1780431884109392046">"ግብረ-መልስ ላክ"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"እንግሊዘኛ (የታላቋ ብሪታንያ)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"እንግሊዘኛ (ዩ.ኤስ)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"ስፓኒሽኛ (ዩኤስ)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"እንግሊዘኛ (ዩናይትድ ኪንግደም) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"እንግሊዘኛ (አሜሪካ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"ስፓኒሽኛ (ዩኤስ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (ተለምዷዊ)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"እንግሊዝኛ (ዩኬ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"እንግሊዝኛ (አሜሪካ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"ስፓኒሽ (አሜሪካ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ተለምዷዊ)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ሳይሪሊክ)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ላቲን)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"ምንም ቋንቋ (ፊደላት)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"ፊደላት (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"ፊደላት (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"ውጫዊ የመዝገበቃላት ፋይል አንብብ"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"በውርዶች አቃፊው ውስጥ ምንም የመዝገበ-ፋይሎች የሉም"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"የሚጭኑት የመዝገበ-ቃላት ፋይል ይምረጡ"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"እውን ይሄ ፋይል ለ<xliff:g id="LOCALE_NAME">%s</xliff:g> ይጫን?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"እውን ይሄ ፋይል ለ<xliff:g id="LANGUAGE_NAME">%s</xliff:g> ይጫን?"</string>
<string name="error" msgid="8940763624668513648">"ስህተት ተከስቶ ነበር"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"የእውቂያዎች መዝገበ-ቃላትን ዝርዝር ይፍጠሩ"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"የግል መዝገበ-ቃላትን ዝርዝር ይፍጠሩ"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"የተጠቃሚ ታሪክ መዝገበ-ቃላትን ዝርዝር ይፍጠሩ"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"የግላዊነት ማላበሻ መዝገበ-ቃላትን ዝርዝር ይፍጠሩ"</string>
<string name="button_default" msgid="3988017840431881491">"ነባሪ"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"እንኳን ወደ <xliff:g id="APPLICATION_NAME">%s</xliff:g> በደህና መጡ"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"በጣት ምልክት መተየብ"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"አድስ"</string>
<string name="last_update" msgid="730467549913588780">"ለመጨረሻ ጊዜ የተዘመነው"</string>
<string name="message_updating" msgid="4457761393932375219">"ዝማኔዎችን በመፈለግ ላይ"</string>
- <string name="message_loading" msgid="8689096636874758814">"በመጫን ላይ..."</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="2878629598667658845">"ተንቀሳቃሽ መሣሪያዎ ላይ ለተመረጠው ቋንቋ የሚሆን መዝገበ-ቃላት ይገኛል።&lt;br/&gt; የትየባ ተሞክሮዎን ለማሻሻል የ<xliff:g id="LANGUAGE">%1$s</xliff:g> መዝገበ-ቃላቱን &lt;b&gt;እንዲያወርዱ&lt;/b&gt; እንመክራለን።&lt;br/&gt; &lt;br/&gt; ውርዱ በ3ጂ ላይ አንድ ወይም ሁለት ደቂቃ ሊወስድ ይችላል። &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; ማውረድ በ3ጂ ላይ አንድ ወይም ሁለት ደቂቃ ሊወስድ ይችላል። &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="6514288591959117288">"መዝገበ-ቃላት ለ<xliff:g id="LANGUAGE">%1$s</xliff:g> ይገኛል"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"የ<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> መዝገበ-ቃላት ማግኘት ይችላል"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"ለመገምገምና ለማውረድ ይጫኑ"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"በማውረድ ላይ፦ የ<xliff:g id="LANGUAGE">%1$s</xliff:g> ጥቆማ አስተያየቶች በቅርቡ ዝግጁ ይሆናሉ።"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"በማውረድ ላይ፦ ለ<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> የሚሰጡ ጥቆማዎች በቅርቡ ዝግጁ ይሆናሉ።"</string>
<string name="version_text" msgid="2715354215568469385">"ሥሪት <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"አክል"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"ወደ መዝገበ-ቃላት አክል"</string>
diff --git a/java/res/values-ar-sw600dp/donottranslate-config-spacing-and-punctuations.xml b/java/res/values-ar-sw600dp/donottranslate-config-spacing-and-punctuations.xml
new file mode 100644
index 000000000..d7aca6fb4
--- /dev/null
+++ b/java/res/values-ar-sw600dp/donottranslate-config-spacing-and-punctuations.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- The all letters need to be mirrored are found at
+ http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
+ <!-- Symbols that are suggested between words -->
+ <!-- U+061F: "؟" ARABIC QUESTION MARK
+ U+061B: "؛" ARABIC SEMICOLON -->
+ <string name="suggested_punctuations">!,&#x061F;,:,&#x061B;,\",\',(|),)|(,-,/,@,_</string>
+</resources>
diff --git a/java/res/values-iw/donottranslate.xml b/java/res/values-ar/donottranslate-config-spacing-and-punctuations.xml
index 57de2538b..21bb3318f 100644
--- a/java/res/values-iw/donottranslate.xml
+++ b/java/res/values-ar/donottranslate-config-spacing-and-punctuations.xml
@@ -21,5 +21,8 @@
<!-- The all letters need to be mirrored are found at
http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
<!-- Symbols that are suggested between words -->
- <string name="suggested_punctuations">!,?,\\,,:,;,\",(|),)|(,\',-,/,@,_</string>
+ <!-- U+061F: "؟" ARABIC QUESTION MARK
+ U+060C: "،" ARABIC COMMA
+ U+061B: "؛" ARABIC SEMICOLON -->
+ <string name="suggested_punctuations">!,&#x061F;,&#x060C;,:,&#x061B;,\",(|),)|(,\',-,/,@,_</string>
</resources>
diff --git a/java/res/values-ar/strings-config-important-notice.xml b/java/res/values-ar/strings-config-important-notice.xml
new file mode 100644
index 000000000..7af5f6d5c
--- /dev/null
+++ b/java/res/values-ar/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-ar/strings-talkback-descriptions.xml b/java/res/values-ar/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..9d2eab5ae
--- /dev/null
+++ b/java/res/values-ar/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"يمكنك توصيل سماعة رأس لسماع مفاتيح كلمة المرور منطوقة بصوت عالٍ."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"‏النص الحالي هو %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"لم يتم إدخال نص"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> لتصحيح <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> إلى <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> لإجراء التصحيح التلقائي"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"‏رمز المفتاح %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"‏Shift يعمل (انقر للتعطيل)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"‏Caps lock يعمل (انقر للتعطيل)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"حذف"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"رموز"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"أحرف"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"أرقام"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"الإعدادات"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"مسافة"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"إدخال صوتي"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"رمز تعبيري"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"رجوع"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"بحث"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"نقطة"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"تبديل اللغة"</string>
+ <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">"‏تم تمكين Shift"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"‏تم تمكين Caps lock"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"‏تم تعطيل Shift"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"وضع الرموز"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"وضع الأحرف"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"وضع الهاتف"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"وضع رموز الهاتف"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"لوحة المفاتيح مخفية"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"إظهار لوحة مفاتيح <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"التاريخ"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"التاريخ والوقت"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"بريد إلكتروني"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"مراسلة"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"رقم"</string>
+ <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">"‏عنوان URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"الطبيعة"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"أماكن"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"رموز"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"رموز تعبيرية"</string>
+</resources>
diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml
index da331196c..13aef2a67 100644
--- a/java/res/values-ar/strings.xml
+++ b/java/res/values-ar/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"الإعداد الافتراضي للنظام"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"اقتراح أسماء جهات الاتصال"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"استخدام الأسماء من جهات الاتصال للاقتراحات والتصحيحات"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"اقتراحات مخصصة"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"نقطة المسافة المزدوجة"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"يؤدي النقر نقرًا مزدوجًا على مفتاح المسافة إلى إدخال نقطة متبوعة بمسافة"</string>
<string name="auto_cap" msgid="1719746674854628252">"أحرف كبيرة تلقائيًا"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"عرض مسار الإيماءة"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"معاينة نصوص متحركة ديناميكية"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"مشاهدة الكلمة المقترحة أثناء الإيماءة"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : تم الحفظ"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"يمكنك توصيل سماعة رأس لسماع مفاتيح كلمة المرور منطوقة بصوت عالٍ."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"‏النص الحالي هو %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"لم يتم إدخال نص"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> لتصحيح <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> إلى <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> للتصحيح التلقائي"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"‏رمز المفتاح %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"العالي"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"‏Shift يعمل (انقر للتعطيل)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"‏Caps lock يعمل (انقر للتعطيل)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"حذف"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"الرموز"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"أحرف"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"أرقام"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"الإعدادات"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"علامة تبويب"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"مسافة"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"إدخال صوتي"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"وجه مبتسم"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"رجوع"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"بحث"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"نقطة"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"تبديل اللغة"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"التالي"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"السابق"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"‏تم تمكين Shift"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"‏تم تمكين Caps lock"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"‏تم تعطيل Shift"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"وضع الرموز"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"وضع الأحرف"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"وضع الهاتف"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"وضع رموز الهاتف"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"لوحة المفاتيح مخفية"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"إظهار لوحة مفاتيح <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"التاريخ"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"التاريخ والوقت"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"البريد الإلكتروني"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"المراسلة"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"الرقم"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"الهاتف"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"النص"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"الوقت"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"‏عنوان URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"عبارة الإيماء"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"إدخال مسافات خلال الإيماءات من خلال تمرير مفتاح المسافة"</string>
<string name="voice_input" msgid="3583258583521397548">"مفتاح الإدخال الصوتي"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"لوحة مفاتيح رئيسية"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"لوحة مفاتيح الرموز"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"إيقاف"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"ميكروفون على لوحة مفاتيح رئيسية"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"ميكروفون على لوحة مفاتيح الرموز"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"الإدخال الصوتي مُعطل"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"لم يتم تمكين أي أساليب إدخال صوتي. تحقق من إعدادات اللغة والإدخال."</string>
<string name="configure_input_method" msgid="373356270290742459">"تهيئة طرق الإدخال"</string>
<string name="language_selection_title" msgid="1651299598555326750">"لغات الإدخال"</string>
<string name="send_feedback" msgid="1780431884109392046">"إرسال تعليقات"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"الإنجليزية (المملكة المتحدة)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"الإنجليزية (الولايات المتحدة)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"الإسبانية (الأميركية)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"الإنجليزية (المملكة المتحدة) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"الإنجليزية (الولايات المتحدة) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"الإسبانية (الأمريكية) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (التقليدية)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"الإنجليزية (المملكة المتحدة) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"الإنجليزية (الولايات المتحدة) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"الإسبانية (الولايات المتحدة) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (التقليدية)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (السريلية)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (اللاتينية)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"بدون لغة (أبجدية)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"‏الأبجدية (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"‏الأبجدية (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"قراءة ملف قاموس خارجي"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"ليست هناك ملفات قواميس في مجلد التنزيلات"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"تحديد ملف قاموس للتثبيت"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"هل تريد حقًا تثبيت هذا الملف للغة <xliff:g id="LOCALE_NAME">%s</xliff:g>؟"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"هل تريد حقًا تثبيت هذا الملف للغة <xliff:g id="LANGUAGE_NAME">%s</xliff:g>؟"</string>
<string name="error" msgid="8940763624668513648">"حدث خطأ"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"عرض جهات الاتصال"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"تفريغ المعجم الشخصي"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"تفريغ معجم سجل المستخدم"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"تفريغ معجم التخصيص"</string>
<string name="button_default" msgid="3988017840431881491">"الافتراضية"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"مرحبا بكم في <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"مع الكتابة بالإشارة"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"تحديث"</string>
<string name="last_update" msgid="730467549913588780">"تاريخ آخر تحديث"</string>
<string name="message_updating" msgid="4457761393932375219">"جارٍ البحث عن تحديثات"</string>
- <string name="message_loading" msgid="8689096636874758814">"جارٍ التحميل..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"جارٍ التحميل…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"القاموس الرئيسي"</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="delete_dict" msgid="756853268088330054">"حذف"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"‏اللغة المحددة على جهازك الجوال تشتمل على قاموس متوفر.&lt;br/&gt; نوصي &lt;b&gt;بتنزيل&lt;/b&gt; قاموس <xliff:g id="LANGUAGE">%1$s</xliff:g> لتحسين تجربة الكتابة.&lt;br/&gt; &lt;br/&gt; قد يستغرق التنزيل دقيقة أو دقيقتين أكثر من المدة التي يستغرقها التنزيل عبر شبكة الجيل الثالث. قد تنطبق الرسوم إذا لم تكن مشتركًا في &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; نوصي &lt;b&gt;بتنزيل&lt;/b&gt; قاموس <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> لتحسين تجربة الكتابة.&lt;br/&gt; &lt;br/&gt; قد يستغرق التنزيل دقيقة أو دقيقتين عبر شبكة الجيل الثالث. قد تنطبق الرسوم إذا لم تكن مشتركًا في &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="6514288591959117288">"هناك قاموس متوفر للغة <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"هناك قاموس متوفر للغة <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"اضغط للمراجعة والتنزيل"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"جارٍ التنزيل: ستتوفر اقتراحات للغة <xliff:g id="LANGUAGE">%1$s</xliff:g> بعد قليل."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"جارٍ التنزيل: ستتوفر اقتراحات للغة <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> قريبًا."</string>
<string name="version_text" msgid="2715354215568469385">"الإصدار <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"إضافة"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"إضافة إلى القاموس"</string>
diff --git a/java/res/values-az-rAZ/strings-action-keys.xml b/java/res/values-az-rAZ/strings-action-keys.xml
new file mode 100644
index 000000000..513712c40
--- /dev/null
+++ b/java/res/values-az-rAZ/strings-action-keys.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Keç"</string>
+ <string name="label_next_key" msgid="5586407279258592635">"Növbəti"</string>
+ <string name="label_previous_key" msgid="1421141755779895275">"Öncəki"</string>
+ <string name="label_done_key" msgid="7564866296502630852">"Hazırdır"</string>
+ <string name="label_send_key" msgid="482252074224462163">"Göndər"</string>
+ <string name="label_pause_key" msgid="2225922926459730642">"Pauza"</string>
+ <string name="label_wait_key" msgid="5891247853595466039">"Gözlə"</string>
+</resources>
diff --git a/java/res/values-be/strings-appname.xml b/java/res/values-az-rAZ/strings-appname.xml
index 2f9593bdc..2fcb76c69 100644
--- a/java/res/values-be/strings-appname.xml
+++ b/java/res/values-az-rAZ/strings-appname.xml
@@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="english_ime_name" msgid="5940510615957428904">"Клавіятура Android (AOSP)"</string>
- <string name="spell_checker_service_name" msgid="1254221805440242662">"Iнструмент праверкi правапiсу для Android (AOSP)"</string>
- <string name="english_ime_settings" msgid="5760361067176802794">"Налады клавіятуры Android (AOSP)"</string>
- <string name="android_spell_checker_settings" msgid="6123949487832861885">"Налады інструмента праверкі правапісу для Android (AOSP)"</string>
+ <string name="english_ime_name" msgid="5940510615957428904">"Android Klaviatura (AOYP)"</string>
+ <string name="spell_checker_service_name" msgid="1254221805440242662">"Android Orfoqrafik Yoxlanış (AOYP)"</string>
+ <string name="english_ime_settings" msgid="5760361067176802794">"Android Klaviatura Parametrləri (AOYP)"</string>
+ <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android Orfoqrafik Yoxlanış Parametrləri (AOYP)"</string>
</resources>
diff --git a/java/res/values-az-rAZ/strings-config-important-notice.xml b/java/res/values-az-rAZ/strings-config-important-notice.xml
new file mode 100644
index 000000000..a5f1c6128
--- /dev/null
+++ b/java/res/values-az-rAZ/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Əlaqələrdən və təkliflərin inkişafı üçün yazdığınız datadan öyrənin "</string>
+</resources>
diff --git a/java/res/values-az-rAZ/strings-talkback-descriptions.xml b/java/res/values-az-rAZ/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..c5abc5cf5
--- /dev/null
+++ b/java/res/values-az-rAZ/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Parolu səsli eşitmək üçün qulaqlığı taxın."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Cari mətn %s\'dir"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Mətn daxil edilməyib"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> sözünü <xliff:g id="CORRECTED_WORD">%3$s</xliff:g> sözü ilə əvəzləyərək düzəldir"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> avto-korreksiyanı həyata keçirir"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"%d açar kodu"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Sürüşdürmə"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Sürüşdürmə aktivdir (deaktiv etmək üçün klikləyin)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Böyük hərf kilidi aktivdir (deaktiv etmək üçün klikləyin)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Sil"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simvollar"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Hərflər"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Nömrələr"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Ayarlar"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Boşluq"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Səs daxiletməsi"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Geri qayıt"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Axtarış"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Nöqtə"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Dil keçidi"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Növbəti"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Əvvəlki"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Sürüşdürmə aktivdir"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Böyük hərf kilidi aktivdir"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Sürüşdürmə deaktivdir"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Simvol rejimi"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Hərf rejimi"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefon rejimi"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefon simvol rejimi"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Gizlədilmiş klaviatura"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"<xliff:g id="KEYBOARD_MODE">%s</xliff:g> klaviaturası göstərilir"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"tarix"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"gün və tarix"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"E-poçt"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"mesajlaşma"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"nömrə"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"mesaj"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"vaxt"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Sonuncular"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Adamlar"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Obyektlər"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Təbiə"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Yerlər"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simvollar"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emotikonlar"</string>
+</resources>
diff --git a/java/res/values-az-rAZ/strings.xml b/java/res/values-az-rAZ/strings.xml
new file mode 100644
index 000000000..5a40e9f14
--- /dev/null
+++ b/java/res/values-az-rAZ/strings.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="english_ime_input_options" msgid="3909945612939668554">"Daxiletmə seçimləri"</string>
+ <string name="english_ime_research_log" msgid="8492602295696577851">"Araşdırma Jurnalı Əmrləri"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Kontakt adlarına baxın"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Orfoqrafik yoxlanış kontakt siyahınızdakı qeydlərdən istifadə edir"</string>
+ <string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrasiyalı klikləmə"</string>
+ <string name="sound_on_keypress" msgid="6093592297198243644">"Klikləmə səsi"</string>
+ <string name="popup_on_keypress" msgid="123894815723512944">"Klikləmədə popup"</string>
+ <string name="general_category" msgid="1859088467017573195">"Ümumi"</string>
+ <string name="correction_category" msgid="2236750915056607613">"Mətn korreksiyası"</string>
+ <string name="gesture_typing_category" msgid="497263612130532630">"Jestlərlə yazma"</string>
+ <string name="misc_category" msgid="6894192814868233453">"Digər seçənəklər"</string>
+ <string name="advanced_settings" msgid="362895144495591463">"Qabaqcıl ayarlar"</string>
+ <string name="advanced_settings_summary" msgid="4487980456152830271">"Ekspertlər üçün seçimlər"</string>
+ <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Digər daxiletmə metodlarına keçin"</string>
+ <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Dil keçid düyməsi başqa daxiletmə metodlarını da əhatə edir"</string>
+ <string name="show_language_switch_key" msgid="5915478828318774384">"Dil keçidi düyməsi"</string>
+ <string name="show_language_switch_key_summary" msgid="7343403647474265713">"Çoxsaylı daxiletmə dilləri aktivləşdikdə göstər"</string>
+ <string name="sliding_key_input_preview" msgid="6604262359510068370">"Slayd indikatorunu göstər"</string>
+ <string name="sliding_key_input_preview_summary" msgid="6340524345729093886">"Sürüşdürmə və ya Simvol düymələrinə keçərkən vizual işarəni göstər"</string>
+ <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Klaviş popup kənarlaşdırılmasında gecikmə"</string>
+ <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Gecikmə yoxdur"</string>
+ <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Varsayılan"</string>
+ <string name="abbreviation_unit_milliseconds" msgid="8700286094028323363">"<xliff:g id="MILLISECONDS">%s</xliff:g> millisaniyə"</string>
+ <string name="settings_system_default" msgid="6268225104743331821">"Sistem defoltu"</string>
+ <string name="use_contacts_dict" msgid="4435317977804180815">"Kontakt adları təklif edin"</string>
+ <string name="use_contacts_dict_summary" msgid="6599983334507879959">"Təklif və korreksiya üçün Kontaktlardakı adlardan istifadə edin"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Fərdiləşmiş təkliflər"</string>
+ <string name="use_double_space_period" msgid="8781529969425082860">"İkili boşluq periodu"</string>
+ <string name="use_double_space_period_summary" msgid="6532892187247952799">"Boşluqdakı iki klik boşluqdan sonra pauza daxil edir"</string>
+ <string name="auto_cap" msgid="1719746674854628252">"Avtomatik böyük hərfləşmə"</string>
+ <string name="auto_cap_summary" msgid="7934452761022946874">"Hər cümlənin ilk sözünü böyük hərflə yaz"</string>
+ <string name="edit_personal_dictionary" msgid="3996910038952940420">"Şəxsi lüğət"</string>
+ <string name="configure_dictionaries_title" msgid="4238652338556902049">"Əlavə lüğətlər"</string>
+ <string name="main_dictionary" msgid="4798763781818361168">"Əsas lüğət"</string>
+ <string name="prefs_show_suggestions" msgid="8026799663445531637">"Korreksiya təkliflərini göstər"</string>
+ <string name="prefs_show_suggestions_summary" msgid="1583132279498502825">"Yazarkən təklif edilən sözləri ekranda göstər"</string>
+ <string name="prefs_suggestion_visibility_show_name" msgid="3219916594067551303">"Həmişə göstər"</string>
+ <string name="prefs_suggestion_visibility_show_only_portrait_name" msgid="3859783767435239118">"Portret rejimində göstər"</string>
+ <string name="prefs_suggestion_visibility_hide_name" msgid="6309143926422234673">"Həmişə gizlət"</string>
+ <string name="prefs_block_potentially_offensive_title" msgid="5078480071057408934">"Təhqiredici sözləri əngəlləyin"</string>
+ <string name="prefs_block_potentially_offensive_summary" msgid="2371835479734991364">"Potensial təhqiredici sözlər təklif etməyin"</string>
+ <string name="auto_correction" msgid="7630720885194996950">"Avtomatik-korreksiya"</string>
+ <string name="auto_correction_summary" msgid="5625751551134658006">"Boşluq və punktuasiya avtomatik yanlış sözləri düzəldir"</string>
+ <string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"Deaktiv"</string>
+ <string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Orta"</string>
+ <string name="auto_correction_threshold_mode_aggressive" msgid="7319007299148899623">"Aqressiv"</string>
+ <string name="auto_correction_threshold_mode_very_aggressive" msgid="1853309024129480416">"Çox aqressiv"</string>
+ <string name="bigram_prediction" msgid="1084449187723948550">"Növbəti-söz təklifləri"</string>
+ <string name="bigram_prediction_summary" msgid="3896362682751109677">"Təkliflər edilməsində əvvəlki sözdən istifadə et"</string>
+ <string name="gesture_input" msgid="826951152254563827">"Jestlərlə yazmağı aktiv et"</string>
+ <string name="gesture_input_summary" msgid="9180350639305731231">"Hərflər üzərində sürüşdürərək söz daxil edin"</string>
+ <string name="gesture_preview_trail" msgid="3802333369335722221">"Jest izini göstər"</string>
+ <string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dinamik üzmə önizləməsi"</string>
+ <string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Jest zamanı təklif edilmiş sözə baxın"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Jest bildirin"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Jest zamanı boşluq düyməsinə toxunmaqla boşluq daxil edin"</string>
+ <string name="voice_input" msgid="3583258583521397548">"Səs daxiletmə klavişi"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Heç bir səs daxiletmə metodu aktiv deyil. Dil və daxiletmə ayarlarını yoxlayın."</string>
+ <string name="configure_input_method" msgid="373356270290742459">"Daxiletmə üsullarını sazla"</string>
+ <string name="language_selection_title" msgid="1651299598555326750">"Daxiletmə dilləri"</string>
+ <string name="send_feedback" msgid="1780431884109392046">"Cavab rəyi göndərin"</string>
+ <string name="select_language" msgid="3693815588777926848">"Daxiletmə dilləri"</string>
+ <string name="hint_add_to_dictionary" msgid="573678656946085380">"Yadda saxlamaq üçün yenidən toxunun"</string>
+ <string name="has_dictionary" msgid="6071847973466625007">"Lüğət mövcuddur"</string>
+ <string name="prefs_enable_log" msgid="6620424505072963557">"İstifadəçi əks əlaqəsini aktiv et"</string>
+ <string name="prefs_description_log" msgid="7525225584555429211">"İstifadə statistikası və xəta haqqında hesabatları avtomatik göndərməklə daxiletmə metodu redaktəsini təkmilləşdirməyə kömək edin."</string>
+ <string name="keyboard_layout" msgid="8451164783510487501">"Klaviatura teması"</string>
+ <string name="subtype_en_GB" msgid="88170601942311355">"İngilis (BK)"</string>
+ <string name="subtype_en_US" msgid="6160452336634534239">"İngilis (ABŞ)"</string>
+ <string name="subtype_es_US" msgid="5583145191430180200">"İspan (ABŞ)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"İngilis (Britaniya) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"İngilis (Amerika) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"İspan (Amerika) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Ənənəvi)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Kiril)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latın)"</string>
+ <string name="subtype_no_language" msgid="7137390094240139495">"Dil yoxdur (Əlifba)"</string>
+ <string name="subtype_no_language_qwerty" msgid="244337630616742604">"Əlifba (QWERTY)"</string>
+ <string name="subtype_no_language_qwertz" msgid="443066912507547976">"Əlifba (QWERTZ)"</string>
+ <string name="subtype_no_language_azerty" msgid="8144348527575640087">"Əlifba (AZERTY)"</string>
+ <string name="subtype_no_language_dvorak" msgid="1564494667584718094">"Əlifba (Dvorak)"</string>
+ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Əlifba (Colemak)"</string>
+ <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Əlifba (PC)"</string>
+ <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string>
+ <string name="keyboard_color_scheme" msgid="9192934113872818070">"Rəng sxemi"</string>
+ <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"Ağ"</string>
+ <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"Mavi"</string>
+ <string name="custom_input_styles_title" msgid="8429952441821251512">"Xüsusi daxiletmə üslubları"</string>
+ <string name="add_style" msgid="6163126614514489951">"Stil əlavə et"</string>
+ <string name="add" msgid="8299699805688017798">"Əlavə et"</string>
+ <string name="remove" msgid="4486081658752944606">"Ləğv et"</string>
+ <string name="save" msgid="7646738597196767214">"Yadda saxla"</string>
+ <string name="subtype_locale" msgid="8576443440738143764">"Dil"</string>
+ <string name="keyboard_layout_set" msgid="4309233698194565609">"Tərtibat"</string>
+ <string name="custom_input_style_note_message" msgid="8826731320846363423">"Xüsusi daxiletmə üslubunuz istifadəyə başlamazdan əvvəl aktivləşdirilməlidir. Aktiv etmək istəyirsiniz?"</string>
+ <string name="enable" msgid="5031294444630523247">"Aktiv et"</string>
+ <string name="not_now" msgid="6172462888202790482">"İndi yox"</string>
+ <string name="custom_input_style_already_exists" msgid="8008728952215449707">"Eyni daxiletmə üslubu artıq mövcuddur: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
+ <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Rahat işləmə rejimi"</string>
+ <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"Klavişi uzun müddət basmada gecikmə"</string>
+ <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"Vibrasiyalı klikləmə müddəti"</string>
+ <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"Səsli klikləmə səsi"</string>
+ <string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Xarici lüğət faylını oxuyun"</string>
+ <string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Endirmə Qovluğunda heç bir lüğət faylı yoxdur"</string>
+ <string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Yükləmək üçün lüğət faylı seçin"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> üçün faylı quraşdırmaq istədiyinizə əminsiniz?"</string>
+ <string name="error" msgid="8940763624668513648">"Xəta var idi"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Kontaktlar lüğətini toplayın"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Şəxsi lüğəti toplayın"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"İstifadəçi tarixi lüğətini toplayın"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Fərdiləşmə lüğətini toplayın"</string>
+ <string name="button_default" msgid="3988017840431881491">"Defolt"</string>
+ <string name="setup_welcome_title" msgid="6112821709832031715">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> təbiqinə xoş gəlmisiniz"</string>
+ <string name="setup_welcome_additional_description" msgid="8150252008545768953">"Jest Yazısı ilə"</string>
+ <string name="setup_start_action" msgid="8936036460897347708">"Başlayın"</string>
+ <string name="setup_next_action" msgid="371821437915144603">"Növbəti addım"</string>
+ <string name="setup_steps_title" msgid="6400373034871816182">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> quraşdırılır"</string>
+ <string name="setup_step1_title" msgid="3147967630253462315">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> tətbiqini aktivləşdir"</string>
+ <string name="setup_step1_instruction" msgid="2578631936624637241">"Lütfən, \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" tətbiqini Dil və daxiletmə parametrlərinizdə yoxlayın. Bununla tətbiqin cihazınızda işləməsinə icazə veriləcək."</string>
+ <string name="setup_step1_finished_instruction" msgid="10761482004957994">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> artıq sizin Dil və daxiletmə parametrlərinizdə aktivləşdirildi, beləliklə da bu mərhələ tamamlandı. İndi isə növbəti mərhələyə eçin!"</string>
+ <string name="setup_step1_action" msgid="4366513534999901728">"Parametrlərdə aktivləşdir"</string>
+ <string name="setup_step2_title" msgid="6860725447906690594">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> tətbiqinə keçin"</string>
+ <string name="setup_step2_instruction" msgid="9141481964870023336">"Sonra, \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" tətbiqini aktiv mətn-daxiletmə metodu olaraq seçin."</string>
+ <string name="setup_step2_action" msgid="1660330307159824337">"Daxil metodlarına keç"</string>
+ <string name="setup_step3_title" msgid="3154757183631490281">"Təbrik edirik, tam hazırsınız!"</string>
+ <string name="setup_step3_instruction" msgid="8025981829605426000">"İndi siz <xliff:g id="APPLICATION_NAME">%s</xliff:g> ilə bütün sevimli tətbiqlərinizdə yaza bilərsiniz."</string>
+ <string name="setup_step3_action" msgid="600879797256942259">"Əlavə dillər quraşdır"</string>
+ <string name="setup_finish_action" msgid="276559243409465389">"Sona çatdı"</string>
+ <string name="show_setup_wizard_icon" msgid="5008028590593710830">"Tətbiq ikonasını göstər"</string>
+ <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"Başlatma panelində tətbiq ikonasını göstər"</string>
+ <string name="app_name" msgid="6320102637491234792">"Lüğət Provayderi"</string>
+ <string name="dictionary_provider_name" msgid="3027315045397363079">"Lüğət Provayderi"</string>
+ <string name="dictionary_service_name" msgid="6237472350693511448">"Lüğət Xidməti"</string>
+ <string name="download_description" msgid="6014835283119198591">"Lüğət yeniləmə məlumatı"</string>
+ <string name="dictionary_settings_title" msgid="8091417676045693313">"Əlavə lüğətlər"</string>
+ <string name="dictionary_install_over_metered_network_prompt" msgid="3587517870006332980">"Lüğət mövcuddur"</string>
+ <string name="dictionary_settings_summary" msgid="5305694987799824349">"Lüğət üçün ayarlar"</string>
+ <string name="user_dictionaries" msgid="3582332055892252845">"İstifadəçi lüğətləri"</string>
+ <string name="default_user_dict_pref_name" msgid="1625055720489280530">"İstifadəçi lüğəti"</string>
+ <string name="dictionary_available" msgid="4728975345815214218">"Lüğət mövcuddur"</string>
+ <string name="dictionary_downloading" msgid="2982650524622620983">"Hazırda endirilir"</string>
+ <string name="dictionary_installed" msgid="8081558343559342962">"Quraşdırılıb"</string>
+ <string name="dictionary_disabled" msgid="8950383219564621762">"Quraşdırılıb, deaktiv edilib"</string>
+ <string name="cannot_connect_to_dict_service" msgid="9216933695765732398">"Lüğət xidmətinə bağlantı problemi"</string>
+ <string name="no_dictionaries_available" msgid="8039920716566132611">"Lüğət mövcud deyil"</string>
+ <string name="check_for_updates_now" msgid="8087688440916388581">"Təzələ"</string>
+ <string name="last_update" msgid="730467549913588780">"Son yeniləmə"</string>
+ <string name="message_updating" msgid="4457761393932375219">"Güncəlləmələr yoxlanılır"</string>
+ <string name="message_loading" msgid="5638680861387748936">"Yüklənir..."</string>
+ <string name="main_dict_description" msgid="3072821352793492143">"Əsas lüğət"</string>
+ <string name="cancel" msgid="6830980399865683324">"Ləğv et"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Ayarlar"</string>
+ <string name="install_dict" msgid="180852772562189365">"Quraşdırın"</string>
+ <string name="cancel_download_dict" msgid="7843340278507019303">"Ləğv et"</string>
+ <string name="delete_dict" msgid="756853268088330054">"Sil"</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Mobil telefonunuzda seçilmiş dilin əlçatımlı lüğəti var. Daha rahat yazmaq üçün <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> lüğətini endirməyinizi məsləhət görürük. Lüğətin endirilməsi 3G üzərindən bir-iki dəqiqə vaxt ala bilər. Limitsiz data planınızın olmadığı halda, data ödənişləri də tətbiq edilə bilər. Əgər hansı data planına malik olmağınıza əmin deyilsinizsə, Sizə Wi-Fi bağlantısı üzərindən avtomatik endirməyi məsləhət görürük.  İpucu: Lüğətləri endirmək və ya sistemdən silmək üçün mobil cihazınızın menyusunda Ayarlar&gt;Dil&gt;Daxiletmə bölməsinə keçə bilərsiniz."</string>
+ <string name="download_over_metered" msgid="1643065851159409546">"İndi endirin (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
+ <string name="do_not_download_over_metered" msgid="2176209579313941583">"Wi-Fi ilə endir"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> üçün lüğət əlçatımlıdır"</string>
+ <string name="dict_available_notification_description" msgid="1075194169443163487">"Nəzərdən keçirmək və endirmək üçün klikləyin"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Endirmə: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> üçün təkliflər tezliklə hazır olacaq."</string>
+ <string name="version_text" msgid="2715354215568469385">"<xliff:g id="VERSION_NUMBER">%1$s</xliff:g> nömrəli versiya"</string>
+ <string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Əlavə edin"</string>
+ <string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Lüğətə əlavə edin"</string>
+ <string name="user_dict_settings_add_screen_title" msgid="5818914331629278758">"İfadə"</string>
+ <string name="user_dict_settings_add_dialog_more_options" msgid="5671682004887093112">"Daha çox seçim"</string>
+ <string name="user_dict_settings_add_dialog_less_options" msgid="2716586567241724126">"Daha az seçim"</string>
+ <string name="user_dict_settings_add_dialog_confirm" msgid="4703129507388332950">"OK"</string>
+ <string name="user_dict_settings_add_word_option_name" msgid="6665558053408962865">"Söz:"</string>
+ <string name="user_dict_settings_add_shortcut_option_name" msgid="3094731590655523777">"Qısayol:"</string>
+ <string name="user_dict_settings_add_locale_option_name" msgid="4738643440987277705">"Dil:"</string>
+ <string name="user_dict_settings_add_word_hint" msgid="4902434148985906707">"Bir söz yazın"</string>
+ <string name="user_dict_settings_add_shortcut_hint" msgid="2265453012555060178">"Könüllü qısayol"</string>
+ <string name="user_dict_settings_edit_dialog_title" msgid="3765774633869590352">"Sözü redaktə edin"</string>
+ <string name="user_dict_settings_context_menu_edit_title" msgid="6812255903472456302">"Düzəliş edin"</string>
+ <string name="user_dict_settings_context_menu_delete_title" msgid="8142932447689461181">"Silin"</string>
+ <string name="user_dict_settings_empty_text" msgid="558499587532668203">"İstifadəçi lüğətinizdə heç bir söz yoxdur. Əlavə et (+) düyməsinə toxunmqla bir söz əlavə edin."</string>
+ <string name="user_dict_settings_all_languages" msgid="8276126583216298886">"Bütün dillər üçün"</string>
+ <string name="user_dict_settings_more_languages" msgid="7131268499685180461">"Digər dillər​​..."</string>
+ <string name="user_dict_settings_delete" msgid="110413335187193859">"Silin"</string>
+ <string name="user_dict_fast_scroll_alphabet" msgid="5431919401558285473">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
+</resources>
diff --git a/java/res/values-be/bools.xml b/java/res/values-be-rBY/bools.xml
index 840d20c21..840d20c21 100644
--- a/java/res/values-be/bools.xml
+++ b/java/res/values-be-rBY/bools.xml
diff --git a/java/res/values-be/strings-action-keys.xml b/java/res/values-be-rBY/strings-action-keys.xml
index 91416c8b7..91416c8b7 100644
--- a/java/res/values-be/strings-action-keys.xml
+++ b/java/res/values-be-rBY/strings-action-keys.xml
diff --git a/java/res/values-be/strings.xml b/java/res/values-be/strings.xml
deleted file mode 100644
index 02972f07e..000000000
--- a/java/res/values-be/strings.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="english_ime_input_options" msgid="3909945612939668554">"Параметры ўводу"</string>
- <string name="english_ime_research_log" msgid="8492602295696577851">"Каманды гiсторыя даследаванняў"</string>
- <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Шукаць імёны кантактаў"</string>
- <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Модуль праверкі правапісу выкарыстоўвае запісы са спісу кантактаў"</string>
- <string name="vibrate_on_keypress" msgid="5258079494276955460">"Вібрацыя пры націску клавіш"</string>
- <string name="sound_on_keypress" msgid="6093592297198243644">"Гук пры націску"</string>
- <string name="popup_on_keypress" msgid="123894815723512944">"Па націску на клавішы ўсплывае акно"</string>
- <string name="general_category" msgid="1859088467017573195">"Агульныя"</string>
- <string name="correction_category" msgid="2236750915056607613">"Выпраўленне тэксту"</string>
- <string name="gesture_typing_category" msgid="497263612130532630">"Набор жэстамі"</string>
- <string name="misc_category" msgid="6894192814868233453">"Іншыя параметры"</string>
- <string name="advanced_settings" msgid="362895144495591463">"Адмысловыя налады"</string>
- <string name="advanced_settings_summary" msgid="4487980456152830271">"Функцыi для спецыялістаў"</string>
- <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Перакл. да інш. спос. ув."</string>
- <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Кнопка пераключэння мовы звязана i з iншымi спосабамi ўводу"</string>
- <string name="show_language_switch_key" msgid="5915478828318774384">"Кнопка пераключэння мовы"</string>
- <string name="show_language_switch_key_summary" msgid="7343403647474265713">"Паказваць, калі ўключана некалькі моў ўводу"</string>
- <string name="sliding_key_input_preview" msgid="6604262359510068370">"Iндыкатар слайд-шоу"</string>
- <string name="sliding_key_input_preview_summary" msgid="6340524345729093886">"Паказаць візуальны сігнал падчас слiзгання клавiш Shift або Symbol"</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> мс"</string>
- <!-- no translation found for settings_system_default (6268225104743331821) -->
- <skip />
- <string name="use_contacts_dict" msgid="4435317977804180815">"Прапан. імёны кантактаў"</string>
- <string name="use_contacts_dict_summary" msgid="6599983334507879959">"Выкарыстоўваць імёны са спісу кантактаў для прапаноў і выпраўл."</string>
- <string name="use_double_space_period" msgid="8781529969425082860">"Падвойны iнтэрвал"</string>
- <string name="use_double_space_period_summary" msgid="6532892187247952799">"Падвойнае нацiсканне на прабел ўстаўляе iнтэрвал з наступным прабелам"</string>
- <string name="auto_cap" msgid="1719746674854628252">"Аўтаматычна рабіць вялікія літары"</string>
- <string name="auto_cap_summary" msgid="7934452761022946874">"Пісаць з загалоўнай літары першае слова ў кожным сказе"</string>
- <string name="edit_personal_dictionary" msgid="3996910038952940420">"Персанальны слоўнік"</string>
- <string name="configure_dictionaries_title" msgid="4238652338556902049">"Дадатковыя слоўнікі"</string>
- <string name="main_dictionary" msgid="4798763781818361168">"Асноўны слоўнік"</string>
- <string name="prefs_show_suggestions" msgid="8026799663445531637">"Паказаць прапановы на выпраўленне"</string>
- <string name="prefs_show_suggestions_summary" msgid="1583132279498502825">"Паказваць прапанаваныя словы падчас набору тэксту"</string>
- <string name="prefs_suggestion_visibility_show_name" msgid="3219916594067551303">"Заўсёды паказваць"</string>
- <string name="prefs_suggestion_visibility_show_only_portrait_name" msgid="3859783767435239118">"Паказаць у партрэтным рэжыме"</string>
- <string name="prefs_suggestion_visibility_hide_name" msgid="6309143926422234673">"Заўседы хаваць"</string>
- <string name="prefs_block_potentially_offensive_title" msgid="5078480071057408934">"Блакіраваць абразлівыя словы"</string>
- <string name="prefs_block_potentially_offensive_summary" msgid="2371835479734991364">"Не прапануйце патэнцыяльна абразлівых слоў"</string>
- <string name="auto_correction" msgid="7630720885194996950">"Аўтавыпраўленне"</string>
- <string name="auto_correction_summary" msgid="5625751551134658006">"Прабелы і пунктуацыйныя знакі дазваляюць аўтаматычна выпраўляць памылкова ўведзеныя словы"</string>
- <string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"Адключаны"</string>
- <string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Сціплы"</string>
- <!-- no translation found for auto_correction_threshold_mode_aggressive (7319007299148899623) -->
- <skip />
- <!-- no translation found for auto_correction_threshold_mode_very_aggressive (1853309024129480416) -->
- <skip />
- <string name="bigram_prediction" msgid="1084449187723948550">"Падказкi для наступнага слова"</string>
- <string name="bigram_prediction_summary" msgid="3896362682751109677">"Выкарыстоўваць папярэдняе слова, каб атрымлiваць падказкi"</string>
- <string name="gesture_input" msgid="826951152254563827">"Уключыць набор жэстамі"</string>
- <string name="gesture_input_summary" msgid="9180350639305731231">"Уводзьце слова, перасоўваючы палец па літарах"</string>
- <string name="gesture_preview_trail" msgid="3802333369335722221">"Паказаць след жэста"</string>
- <string name="gesture_floating_preview_text" msgid="4443240334739381053">"Дынамічны плаваючы прагляд"</string>
- <string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Праглядаць прапанаванае слова падчас жэсту"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Захаваныя"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Каб праслухаць паролi, падключыце гарнiтуру."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Бягучы тэкст %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Тэкст не ўведзены"</string>
- <!-- no translation found for spoken_auto_correct (8005997889020109763) -->
- <skip />
- <!-- no translation found for spoken_auto_correct_obscured (6276420476908833791) -->
- <skip />
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Клавішны код %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Зрух"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift уключаны (націснiце, каб адключыць)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock уключаны (націснiце, каб адключыць)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Выдаліць"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Сімвалы"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Літары"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Лічбы"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Налады"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Укладка"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Прабел"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Галасавы ўвод"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Смайлік"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Увод"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Пошук"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Кропка"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Пераключыць мову"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Далей"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Назад"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift уключаны"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps Lock уключаны"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift адключаны"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Рэжым знакаў"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Рэжым лiтар"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Рэжым тэлефона"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Рэжым тэлефонных знакаў"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Клавіятура схавана"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Паказана клавiятура ў рэжыме \" <xliff:g id="MODE">%s</xliff:g>\""</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"дата"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"дата i час"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"электронная пошта"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"абмен паведамленнямі"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"нумар"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"тэлефон"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"тэкст"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"час"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
- <string name="voice_input" msgid="3583258583521397548">"Ключ галасавога ўводу"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"На асн. клавіятуры"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"На сімв. клавіятуры"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Адключана"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Мік. на асн. клав."</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Мік. на сімв. клав."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Галасавы набор адкл."</string>
- <string name="configure_input_method" msgid="373356270290742459">"Налада метадаў уводу"</string>
- <string name="language_selection_title" msgid="1651299598555326750">"Мовы ўводу"</string>
- <string name="send_feedback" msgid="1780431884109392046">"Адправіць водгук"</string>
- <string name="select_language" msgid="3693815588777926848">"Мовы ўводу"</string>
- <string name="hint_add_to_dictionary" msgid="573678656946085380">"Дакраніцеся зноў, каб захаваць"</string>
- <string name="has_dictionary" msgid="6071847973466625007">"Слоўнік даступны"</string>
- <string name="prefs_enable_log" msgid="6620424505072963557">"Уключыць зваротную сувязь з карыстальнікамі"</string>
- <string name="prefs_description_log" msgid="7525225584555429211">"Дапамажыце палепшыць гэты рэдактар ​​метаду ўводу, аўтаматычна адпраўляючы статыстыку выкарыстання і справаздачы аб збоях Google."</string>
- <string name="keyboard_layout" msgid="8451164783510487501">"Тэма клавіятуры"</string>
- <string name="subtype_en_GB" msgid="88170601942311355">"Англійская (ЗК)"</string>
- <string name="subtype_en_US" msgid="6160452336634534239">"Англійская (ЗША)"</string>
- <string name="subtype_es_US" msgid="5583145191430180200">"iспанская (ЗША)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Англійская (Вялікабрытанія) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Англійская (ЗША) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"iспанская (ЗША) ( <xliff:g id="LAYOUT">%s</xliff:g> )"</string>
- <!-- no translation found for subtype_nepali_traditional (9032247506728040447) -->
- <skip />
- <!-- no translation found for subtype_no_language (7137390094240139495) -->
- <skip />
- <!-- no translation found for subtype_no_language_qwerty (244337630616742604) -->
- <skip />
- <!-- no translation found for subtype_no_language_qwertz (443066912507547976) -->
- <skip />
- <!-- no translation found for subtype_no_language_azerty (8144348527575640087) -->
- <skip />
- <!-- no translation found for subtype_no_language_dvorak (1564494667584718094) -->
- <skip />
- <!-- no translation found for subtype_no_language_colemak (5837418400010302623) -->
- <skip />
- <!-- no translation found for subtype_no_language_pcqwerty (5354918232046200018) -->
- <skip />
- <!-- no translation found for subtype_emoji (7483586578074549196) -->
- <skip />
- <string name="custom_input_styles_title" msgid="8429952441821251512">"Карыстальніцкія стылі ўводу"</string>
- <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="subtype_locale" msgid="8576443440738143764">"Мова"</string>
- <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="custom_input_style_already_exists" msgid="8008728952215449707">"Такі метад уводу ўжо існуе: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
- <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Рэжым даследвання выкарыстальнасці"</string>
- <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"Затрымка доўгага націску клавішы"</string>
- <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"Працягласць вібрацыі пры націску клавіш"</string>
- <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"Гучнасць гуку пры націску клавіш"</string>
- <string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Чытанне знешняга файла слоўніка"</string>
- <string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"У папцы загрузак няма файлаў слоўніка"</string>
- <string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Вылучыце файл слоўніка для ўсталёўкі"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Сапраўды ўсталяваць гэты файл на мове: <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
- <string name="error" msgid="8940763624668513648">"Была памылка"</string>
- <string name="button_default" msgid="3988017840431881491">"Па змаўчанні"</string>
- <string name="setup_welcome_title" msgid="6112821709832031715">"Вітаем у прыкладанні <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_welcome_additional_description" msgid="8150252008545768953">"з уводам жэстамі"</string>
- <string name="setup_start_action" msgid="8936036460897347708">"Пачаць"</string>
- <string name="setup_next_action" msgid="371821437915144603">"Далей"</string>
- <string name="setup_steps_title" msgid="6400373034871816182">"Наладка прыкладання <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_title" msgid="3147967630253462315">"Уключыць прыкладанне <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="setup_step1_instruction" msgid="2578631936624637241">"Праверце прыкладанне \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" на сваёй мове і параметры ўводу. Гэта дасць магчымасць дазволіць яму працаваць на вашай прыладзе."</string>
- <string name="setup_step1_finished_instruction" msgid="10761482004957994">"Прыкладанне <xliff:g id="APPLICATION_NAME">%s</xliff:g> ужо ўключана для вашай мовы і параметраў уводу, так што гэты крок зроблены. Пераходзім да наступнага!"</string>
- <string name="setup_step1_action" msgid="4366513534999901728">"Уключыць у наладах"</string>
- <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_instruction" msgid="8025981829605426000">"Цяпер вы можаце ўводзіць ўсе свае любімыя прыкладанні з iмем <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>
- <string name="show_setup_wizard_icon" msgid="5008028590593710830">"Паказаць значок прыкладання"</string>
- <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"Паказаць значок прыкладання ў панэлi запуску"</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="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>
- <string name="user_dictionaries" msgid="3582332055892252845">"Карыстальніцкія слоўнікі"</string>
- <string name="default_user_dict_pref_name" msgid="1625055720489280530">"Карыстацкі слоўнік"</string>
- <string name="dictionary_available" msgid="4728975345815214218">"Даступны слоўнік"</string>
- <string name="dictionary_downloading" msgid="2982650524622620983">"Спампоўваецца зараз"</string>
- <string name="dictionary_installed" msgid="8081558343559342962">"Усталявана"</string>
- <string name="dictionary_disabled" msgid="8950383219564621762">"Усталявана, адключана"</string>
- <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="message_updating" msgid="4457761393932375219">"Праверка наяўнасці абнаўленняў"</string>
- <string name="message_loading" msgid="8689096636874758814">"Загрузка..."</string>
- <string name="main_dict_description" msgid="3072821352793492143">"Асноўны слоўнік"</string>
- <string name="cancel" msgid="6830980399865683324">"Адмяніць"</string>
- <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="2878629598667658845">"Для выбранай мовы на мабільнай прыладзе ёсць слоўнік.&lt;br/&gt; Мы рэкамендуем &lt;b&gt;спампаваць&lt;/b&gt; слоўнік для мовы \"<xliff:g id="LANGUAGE">%1$s</xliff:g>\" для паляпшэння зручнасці набору.&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="6514288591959117288">"Слоўнік для мовы \"<xliff:g id="LANGUAGE">%1$s</xliff:g>\""</string>
- <string name="dict_available_notification_description" msgid="1075194169443163487">"Нацiснiце, каб прагледзець i спампаваць"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Загрузка: прапановы для мовы \"<xliff:g id="LANGUAGE">%1$s</xliff:g>\" хутка з\'явяцца."</string>
- <string name="version_text" msgid="2715354215568469385">"Версія <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
- <string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Дадаць"</string>
- <string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Дадаць у слоўнік"</string>
- <string name="user_dict_settings_add_screen_title" msgid="5818914331629278758">"Выраз"</string>
- <string name="user_dict_settings_add_dialog_more_options" msgid="5671682004887093112">"Дадатковыя параметры"</string>
- <string name="user_dict_settings_add_dialog_less_options" msgid="2716586567241724126">"Асн. параметры"</string>
- <string name="user_dict_settings_add_dialog_confirm" msgid="4703129507388332950">"OК"</string>
- <string name="user_dict_settings_add_word_option_name" msgid="6665558053408962865">"Слова:"</string>
- <string name="user_dict_settings_add_shortcut_option_name" msgid="3094731590655523777">"Шлях хуткага доступу:"</string>
- <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">"Дадатковы цэтлiк"</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="558499587532668203">"У вашым карыстальніцкім слоўніку няма ніводнага слова. Вы можаце дадаваць словы, дакранаючыся да кнопкі \"+\" у пункце меню \"Дадаць\"."</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_fast_scroll_alphabet" msgid="5431919401558285473">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
-</resources>
diff --git a/java/res/values-bg/strings-config-important-notice.xml b/java/res/values-bg/strings-config-important-notice.xml
new file mode 100644
index 000000000..465ed85dd
--- /dev/null
+++ b/java/res/values-bg/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-bg/strings-talkback-descriptions.xml b/java/res/values-bg/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..c944c579f
--- /dev/null
+++ b/java/res/values-bg/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Включете слушалки, за да чуете клавишите за паролата на висок глас."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Текущият текст е „%s“"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Няма въведен текст"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"„<xliff:g id="KEY_NAME">%1$s</xliff:g>“ коригира „<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>“ на „<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>“"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"„<xliff:g id="KEY_NAME">%1$s</xliff:g>“ изпълнява автоматично коригиране"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Код на клавишa %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"„Shift“ е включен (докоснете за деактивиране)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"„Caps lock“ е включен (докоснете за деактивиране)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Delete"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Символи"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Букви"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Цифри"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Настройки"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Интервал"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Гласово въвеждане"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Емоджи"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Търсене"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Точка"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Превключване на езика"</string>
+ <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">"„Shift“ е активиран"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"„Caps Lock“ е активиран"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"„Shift“ е деактивиран"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Режим за символи"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Режим за букви"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Режим за телефонни номера"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Режим за символи на телефона"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Клавиатурата е скрита"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Показва се клавиатурата за <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"дати"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"дати и часове"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"имейл aдреси"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"съобщения"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"числа"</string>
+ <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">"URL адреси"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Природа"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Места"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Символи"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Емотикони"</string>
+</resources>
diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml
index c3fbd7982..562e71b4f 100644
--- a/java/res/values-bg/strings.xml
+++ b/java/res/values-bg/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Станд. за системата"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Предложения за контакти"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Използване на имена от „Контакти“ за предложения и поправки"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Персонализ. предложения"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Точка чрез двоен интервал"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Двукр. докосване на клав. за интервал вмъква точка, следвана от интервал"</string>
<string name="auto_cap" msgid="1719746674854628252">"Автоматично поставяне на главни букви"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Следа на жестовете: Показване"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Динамична плаваща визуализация"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Преглед на предложената дума при използване на жестове"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Запазено"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Включете слушалки, за да чуете клавишите за паролата на висок глас."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Текущият текст е %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Няма въведен текст"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"„<xliff:g id="KEY">%1$s</xliff:g>“ коригира „<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>“ на „<xliff:g id="CORRECTED">%3$s</xliff:g>“"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"„<xliff:g id="KEY">%1$s</xliff:g>“ изпълнява автоматично коригиране"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Код на клавишa %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"„Shift“ е включен (докоснете за деактивиране)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"„Caps lock“ е включен (докоснете за деактивиране)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Символи"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Букви"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Цифри"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Настройки"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Интервал"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Гласово въвеждане"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Усмивка"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Търсене"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Точка"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Смяна на езика"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Следващ"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Предишен"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"„Shift“ е активиран"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"„Caps Lock“ е активиран"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"„Shift“ е деактивиран"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Режим за символи"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Режим за букви"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Режим за телефон"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Режим за символи на телефона"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Клавиатурата е скрита"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Показва се клавиатурата за <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"дата"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"дата и час"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"имейл aдреси"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"съобщения"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"числа"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"телефонни номера"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"текст"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"часа"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL адреси"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Жест за фрази"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"При жестове въвеждaйте интервали чрез плъзгане през съотв. клавиш"</string>
<string name="voice_input" msgid="3583258583521397548">"Клавиш за гласово въвеждане"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"На осн. клавиатура"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"На клав. на симв."</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Изкл."</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Микр. на осн. клав."</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Микр. на клав. на симв."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Глас. въвежд. е деакт."</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Няма активирани методи на гласово въвеждане. Проверете настройките за език и въвеждане."</string>
<string name="configure_input_method" msgid="373356270290742459">"Конфигуриране на въвеждането"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Входни езици"</string>
<string name="send_feedback" msgid="1780431884109392046">"Изпращане на отзиви"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"английски (Великобритания)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"английски (САЩ)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"испански (САЩ)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"английски (Великобр.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"английски (САЩ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"испански (САЩ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (традиционен)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"английски (Великобр.) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"английски (САЩ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"испански (САЩ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (традиционна клавиатура)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (кирилица)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (латиница)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Без език (латиница)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Латиница (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Латиница (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Четене на файл за външен речник"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"В папката „Изтегляния“ няма файлове за речник"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Изберете файл за речника, който да инсталирате"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Наистина ли да се инсталира този файл за <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Наистина ли да се инсталира този файл за <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Възникна грешка"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Разтоварване на речника с контакти"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Разтоварване на частния речник"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Речник с потреб. ист.: Разтоварване"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Речник за персонализ.: Разтоварване"</string>
<string name="button_default" msgid="3988017840431881491">"Стандартни"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Добре дошли в/ъв <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"с въвеждане чрез жест"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Опресняване"</string>
<string name="last_update" msgid="730467549913588780">"Последна актуализация:"</string>
<string name="message_updating" msgid="4457761393932375219">"Проверява се за актуализации"</string>
- <string name="message_loading" msgid="8689096636874758814">"Зарежда се..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Зарежда се…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Основен речник"</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="delete_dict" msgid="756853268088330054">"Изтриване"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Налице е речник за избрания език на мобилното ви устройство.&lt;br/&gt; Препоръчваме ви &lt;b&gt;dда изтеглите&lt;/b&gt; речника за <xliff:g id="LANGUAGE">%1$s</xliff:g>, за да подобрите практическата си работа при писане.&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; Препоръчваме ви &lt;b&gt;да изтеглите&lt;/b&gt; речника за <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>, за да подобрите практическата си работа при писане.&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="6514288591959117288">"За <xliff:g id="LANGUAGE">%1$s</xliff:g> е налице речник"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"За <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> е налице речник"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Натиснете, за да прегледате и изтеглите"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Изтегля се: Предложенията за <xliff:g id="LANGUAGE">%1$s</xliff:g> ще бъдат готови скоро."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Изтегля се: Предложенията за <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> ще бъдат готови скоро."</string>
<string name="version_text" msgid="2715354215568469385">"Версия <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Добавяне"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Добавяне в речника"</string>
diff --git a/java/res/values-ca/strings-config-important-notice.xml b/java/res/values-ca/strings-config-important-notice.xml
new file mode 100644
index 000000000..279314571
--- /dev/null
+++ b/java/res/values-ca/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Considera comunicacions i dades introd. per millorar suggeriments"</string>
+</resources>
diff --git a/java/res/values-ca/strings-talkback-descriptions.xml b/java/res/values-ca/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..389200b43
--- /dev/null
+++ b/java/res/values-ca/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Connecta uns auriculars per sentir les tecles que s\'utilitzen per introduir la contrasenya en veu alta."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"El text actual és %s."</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"No s\'ha introduït cap text."</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corregeix <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> per <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>."</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> executa la correcció automàtica."</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Clau de codi %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Maj"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Maj activat (toca per desactivar)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Bloq Maj activat (toca per desactivar)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Suprimeix"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Símbols"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Lletres"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Números"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Configuració"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tabulador"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Espai"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Entrada de veu"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Retorn"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Cerca"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Punt"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Canvia l\'idioma"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Següent"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Anterior"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Maj activat"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Bloq Maj activat"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Maj desactivat"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Mode de símbols"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Mode de lletres"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Mode de telèfon"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Mode de símbols de telèfon"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"S\'ha amagat el teclat."</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Es mostra el teclat per a <xliff:g id="KEYBOARD_MODE">%s</xliff:g>."</string>
+ <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">"correu electrònic"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"missatgeria"</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>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"hora"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Recents"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Persones"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objectes"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natura"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Llocs"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Símbols"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticones"</string>
+</resources>
diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml
index 0b9ee037e..e946ba78b 100644
--- a/java/res/values-ca/strings.xml
+++ b/java/res/values-ca/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Predeterm. del sist."</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Suggereix noms de contactes"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Utilitza els noms de contactes per fer suggeriments i correccions"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Suggeriments personalitz."</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Punt amb doble espai"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Picar dues vegades la barra d\'espai insereix punt i espai blanc"</string>
<string name="auto_cap" msgid="1719746674854628252">"Majúscules automàtiques"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Mostra el recorregut del gest"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Visualitz. prèvia dinàmica flotant"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Consulta la paraula suggerida mentre fas el gest"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: desada"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Connecta un auricular per escoltar les claus de la contrasenya en veu alta."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"El text actual és %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"No s\'ha introduït cap text"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> corregeix <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> per <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> aplica correccions automàtiques"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Clau de codi %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Maj"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Maj activat (pica per desactivar)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Bloq Maj activat (pica per desactivar)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Supr"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Símbols"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Lletres"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Números"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Configuració"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Pestanya"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Espai"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Entrada de veu"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Cara somrient"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Retorn"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Cerca"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Punt"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Canvia l\'idioma"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Següent"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Anterior"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Maj activat"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Bloq Maj activat"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Maj desactivat"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Mode de símbols"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Mode de lletres"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Mode de telèfon"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Mode de símbols de telèfon"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Teclat amagat"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Es mostra el teclat <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"data"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"data i hora"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"correu electrònic"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"missatgeria"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"número"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telèfon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"text"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"hora"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Formula el gest"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Per afegir espais als gestos, apropa el dit a la tecla d\'espai."</string>
<string name="voice_input" msgid="3583258583521397548">"Tecla d\'entrada de veu"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Al teclat principal"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Al teclat de símbols"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Desactivada"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Micròfon al teclat principal"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Micro en tecl. símb."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Entrada de veu desactivada"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"No hi ha cap mètode d\'introducció activat. Comprova la configuració d\'Idioma i introducció de text."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configura mètodes d\'entrada"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Idiomes"</string>
<string name="send_feedback" msgid="1780431884109392046">"Envia comentaris"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Anglès (Regne Unit)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Anglès (EUA)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Espanyol (EUA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Anglès (Regne Unit) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Anglès (Estats Units) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Espanyol (EUA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradicional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Anglès (Regne Unit) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Anglès (EUA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Espanyol (EUA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradicional)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ciríl·lic)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (llatí)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Cap idioma (alfabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabet (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Lectura d\'un fitxer de diccionari extern"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"No hi ha cap fitxer de diccionari a la carpeta Baixades"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Selecció d\'un fitxer de diccionari per instal·lar"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Realment vols instal·lar aquest fitxer per a <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Realment vols instal·lar aquest fitxer per a <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"S\'ha produït un error"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Genera el diccionari de contactes"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Esborrar el diccionari personal"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Esborrar dicc. d\'histor. d\'usuaris"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Esborrar diccionari de personalitz."</string>
<string name="button_default" msgid="3988017840431881491">"Predeterminat"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Et donem la benvinguda a <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"amb Escriptura gestual"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Actualitza"</string>
<string name="last_update" msgid="730467549913588780">"Última actualització"</string>
<string name="message_updating" msgid="4457761393932375219">"S\'està comprovant si hi ha actualitzacions"</string>
- <string name="message_loading" msgid="8689096636874758814">"S\'està carregant..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"S\'està carregant..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"Diccionari principal"</string>
<string name="cancel" msgid="6830980399865683324">"Cancel·la"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Configuració"</string>
<string name="install_dict" msgid="180852772562189365">"Instal·la"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Cancel·la"</string>
<string name="delete_dict" msgid="756853268088330054">"Suprimeix"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Hi ha un diccionari disponible per a l\'idioma seleccionat al teu dispositiu mòbil.&lt;br/&gt; Et recomanem que &lt;b&gt;baixis&lt;/b&gt; el diccionari de <xliff:g id="LANGUAGE">%1$s</xliff:g> per millorar la teva experiència d\'escriptura.&lt;br/&gt; &lt;br/&gt; La baixada pot trigar un parell de minuts en xarxes 3G. Si no tens un &lt;b&gt;pla de dades il·limitat&lt;/b&gt;.&lt;br/&amp;gt, és possible que s\'apliquin càrrecs. Si no estàs segur de les característiques del teu pla de dades, et recomanem que cerquis una connexió Wi-Fi per iniciar la baixada automàticament.&lt;br/&gt; &lt;br/&gt; Consell: Pots baixar i suprimir diccionaris a la secció &lt;b&gt;Idioma i introducció de text&lt;/b&gt; del menú &lt;b&gt;Configuració&lt;/b&gt; del dispositiu mòbil."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Hi ha un diccionari disponible per a l\'idioma seleccionat al teu dispositiu mòbil.&lt;br/&gt; Et recomanem que &lt;b&gt;baixis&lt;/b&gt; el diccionari per a <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> per millorar la teva experiència d\'escriptura.&lt;br/&gt; &lt;br/&gt; La baixada pot trigar un parell de minuts en xarxes 3G. Si no tens un &lt;b&gt;pla de dades il·limitat&lt;/b&gt;,&lt;br/&gt; és possible que s\'apliquin càrrecs. Si no estàs segur de les característiques del teu pla de dades, et recomanem que cerquis una connexió Wi-Fi per iniciar la baixada automàticament.&lt;br/&gt; &lt;br/&gt;Consell: Pots baixar i suprimir diccionaris a la secció &lt;b&gt;Idioma i introducció de text&lt;/b&gt; del menú &lt;b&gt;Configuració&lt;/b&gt; del dispositiu mòbil."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Baixa ara (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Baixa mitjançant Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Hi ha un diccionari disponible per a l\'idioma: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Hi ha disponible un diccionari per a <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>."</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Prem per revisar-lo i per baixar-lo"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Baixada: els suggeriments per a <xliff:g id="LANGUAGE">%1$s</xliff:g> estaran disponibles ben aviat."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Baixada: els suggeriments per a <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> estaran disponibles ben aviat."</string>
<string name="version_text" msgid="2715354215568469385">"Versió <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Afegeix"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Afegeix al diccionari"</string>
diff --git a/java/res/values-cs/strings-config-important-notice.xml b/java/res/values-cs/strings-config-important-notice.xml
new file mode 100644
index 000000000..8de51cc58
--- /dev/null
+++ b/java/res/values-cs/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Zlepšovat návrhy na základě vaší komunikace a zadaných dat"</string>
+</resources>
diff --git a/java/res/values-cs/strings-talkback-descriptions.xml b/java/res/values-cs/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..7ba691c99
--- /dev/null
+++ b/java/res/values-cs/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Chcete-li slyšet, které klávesy jste při zadávání hesla stiskli, připojte sluchátka."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Aktuální text je %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Není zadán žádný text"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"Klávesou <xliff:g id="KEY_NAME">%1$s</xliff:g> opravíte <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> na <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Klávesou <xliff:g id="KEY_NAME">%1$s</xliff:g> provedete automatickou opravu"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Kód klávesy %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Klávesa Shift je zapnutá (vypnete ji klepnutím)."</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Klávesa Caps Lock je zapnutá (vypnete ji klepnutím)."</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Smazat"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symboly"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Písmena"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Čísla"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Nastavení"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Karta"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Mezerník"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Hlasový vstup"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emodži"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Vyhledávání"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Tečka"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Přepnout jazyk"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Další"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Předchozí"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Klávesa Shift je aktivní"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Klávesa Caps Lock je aktivní"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Klávesa Shift je neaktivní"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Režim symbolů"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Režim písmen"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Režim telefonu"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Režim telefonních symbolů"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Klávesnice je skrytá"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Je zobrazena klávesnice <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"datum"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"datum a čas"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-mail"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"zprávy"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"čísla"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"text"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"čas"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"adresy URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Poslední"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Lidé"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Předměty"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Příroda"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Místa"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symboly"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emotikony"</string>
+</resources>
diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index c73e8ab1c..c093d8c50 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Výchozí nastavení"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Navrhovat jména kontaktů"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Použít jména ze seznamu kontaktů k návrhům a opravám"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Personalizované návrhy"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Tečka dvojitým mezerníkem"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Dvojím klepnutím na mezerník vložíte tečku následovanou mezerou."</string>
<string name="auto_cap" msgid="1719746674854628252">"Velká písmena automaticky"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Zobrazovat stopu gesta"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamický plovoucí náhled"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Zobrazení navrhovaného slova při psaní gesty"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Uloženo"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Chcete-li slyšet, které klávesy jste při zadávání hesla stiskli, připojte sluchátka."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Aktuální text je %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Není zadán žádný text"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"Klávesou <xliff:g id="KEY">%1$s</xliff:g> opravíte <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> na <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"Klávesa <xliff:g id="KEY">%1$s</xliff:g> provádí automatickou opravu"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Kód klávesy %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Klávesa Shift je zapnutá (vypnete ji klepnutím)."</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Klávesa Caps Lock je zapnutá (vypnete ji klepnutím)."</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symboly"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Písmena"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Čísla"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Nastavení"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabulátor"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Mezerník"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Hlasový vstup"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smajlík"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"vyhledávací tlačítko"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Tečka"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Přepnout jazyk"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Další"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Předchozí"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Klávesa Shift je aktivní"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Klávesa Caps Lock je aktivní"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Klávesa Shift je neaktivní"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Režim symbolů"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Režim písmen"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Režim telefonu"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Režim telefonních symbolů"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Klávesnice je skrytá"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Zobrazení klávesnice: <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"datum"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"datum a čas"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-mail"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"zprávy"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"čísla"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"text"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"čas"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"adresy URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Frázové gesto"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Mezery mezi gesty zadáte přejetím po klávese mezerníku."</string>
<string name="voice_input" msgid="3583258583521397548">"Klávesa hlasového vstupu"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Na hlavní klávesnici"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Na klávesnici se symboly"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Vypnuto"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikrofon na hlavní klávesnici"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikrofon na klávesnici se symboly"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Hlasový vstup vypnut"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nejsou povoleny žádné metody hlasového vstupu. Zkontrolujte nastavení Jazyk a vstup."</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfigurace metod zadávání"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Vstupní jazyky"</string>
<string name="send_feedback" msgid="1780431884109392046">"Odeslat zpětnou vazbu"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"angličtina (Velká Británie)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"angličtina (USA)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"španělština (USA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"angličtina (VB) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"angličtina (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"španělština (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradiční)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"angličtina (VB) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"angličtina (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"španělština (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradiční)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cyrilice)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latinka)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Žádný jazyk (latinka)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Latinka (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Latinka (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Číst soubor externího slovníku"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Ve složce Stažené nejsou žádné soubory slovníků."</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Vyberte soubor slovníku k instalaci"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Chcete nainstalovat tento soubor pro jazyk <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Chcete nainstalovat tento soubor pro jazyk <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Došlo k chybě"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Vypsat slovník kontaktů"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Vypsat osobní slovník"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Vypsat slovník historie uživatele"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Vypsat slovník přizpůsobení"</string>
<string name="button_default" msgid="3988017840431881491">"Výchozí"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Vítá vás <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"s psaním gesty"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Aktualizovat"</string>
<string name="last_update" msgid="730467549913588780">"Poslední aktualizace"</string>
<string name="message_updating" msgid="4457761393932375219">"Kontrola aktualizací"</string>
- <string name="message_loading" msgid="8689096636874758814">"Načítání..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Načítání…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Hlavní slovník"</string>
<string name="cancel" msgid="6830980399865683324">"Zrušit"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Nastavení"</string>
<string name="install_dict" msgid="180852772562189365">"Instalovat"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Zrušit"</string>
<string name="delete_dict" msgid="756853268088330054">"Smazat"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Pro vybraný jazyk mobilního zařízení je k dispozici slovník.&lt;br/&gt; Doporučujeme slovník pro jazyk <xliff:g id="LANGUAGE">%1$s</xliff:g> &lt;b&gt;stáhnout&lt;/b&gt;. Usnadníte si tím zadávání textu.&lt;br/&gt; &lt;br/&gt; V síti 3G bude stahování chvíli trvat. Pokud nemáte &lt;b&gt;neomezený datový tarif&lt;/b&gt;, mohou vám být účtovány poplatky.&lt;br/&gt; Jestliže si nejste jisti, jaký datový tarif máte, doporučujeme vám najít připojení Wi-Fi. Stahování se pak zahájí automaticky.&lt;br/&gt; &lt;br/&gt; Tip: Slovníky můžete stahovat a odstraňovat v nabídce mobilního zařízení &lt;b&gt;Jazyk a vstup&lt;/b&gt; v &lt;b&gt;Nastavení&lt;/b&gt;."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Pro jazyk vybraný na vašem mobilním zařízení je k dispozici slovník.&lt;br/&gt; Doporučujeme slovník pro jazyk <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> &lt;b&gt;stáhnout&lt;/b&gt;. Usnadníte si tím zadávání textu. &lt;br/&gt; &lt;br/&gt; V síti 3G bude stahování trvat minutu až dvě. Pokud nemáte &lt;b&gt;neomezený datový tarif&lt;/b&gt;, mohou vám být účtovány poplatky.&lt;br/&gt; Jestliže si nejste jisti, jaký datový tarif máte, doporučujeme vám najít připojení Wi-Fi. Stahování se pak zahájí automaticky.&lt;br/&gt; &lt;br/&gt; Tip: Slovníky můžete stahovat a odstraňovat v nabídce mobilního zařízení &lt;b&gt;Jazyk a zadávání&lt;/b&gt; v &lt;b&gt;Nastavení&lt;/b&gt;."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Stáhnout ihned (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Stáhnout pouze přes Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Je k dispozici slovník pro jazyk <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Je k dispozici slovník pro jazyk <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Stisknutím zkontrolujete a stáhnete"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Stahování: návrhy pro jazyk <xliff:g id="LANGUAGE">%1$s</xliff:g> budou brzy k dispozici."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Stahování: návrhy pro jazyk <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> budou brzy k dispozici."</string>
<string name="version_text" msgid="2715354215568469385">"Verze <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Přidat"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Přidat do slovníku"</string>
diff --git a/java/res/layout/key_preview_gb.xml b/java/res/values-da/strings-config-important-notice.xml
index 2f2a321a3..1c0c63e2c 100644
--- a/java/res/layout/key_preview_gb.xml
+++ b/java/res/values-da/strings-config-important-notice.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
/*
**
-** Copyright 2010, The Android Open Source Project
+** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -16,12 +16,9 @@
** See the License for the specific language governing permissions and
** limitations under the License.
*/
--->
+ -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/keyboard_key_feedback_gb"
- android:minWidth="32dp"
- android:gravity="center"
-/>
+<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">"Giv bedre forslag ud fra tidligere kommunikation og data"</string>
+</resources>
diff --git a/java/res/values-da/strings-talkback-descriptions.xml b/java/res/values-da/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..2d613d6c7
--- /dev/null
+++ b/java/res/values-da/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Tilslut et headset for at få læst taster højt, når du indtaster en adgangskode."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Nuværende tekst er %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Der er ingen indtastet tekst"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> retter <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> til <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> udfører automatisk stavekontrol"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Tastekode %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift er aktiveret (tryk for at deaktivere)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock er slået til (tryk for at deaktivere)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Slet"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symboler"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Bogstaver"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Tal"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Indstillinger"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Fane"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Mellemrum"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Stemmeinput"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Return"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Søgning"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Prik"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Skift sprog"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Næste"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Forrige"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift er aktiveret"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock er aktiveret"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift er deaktiveret"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symboltilstand"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Bogstavtilstand"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefontilstand"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefonsymboltilstand"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Tastaturet er skjult"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Viser tastatur til <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"dato"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"dato og klokkeslæt"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-mail"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"beskeder"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"tal"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefonnummer"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"tekst"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"klokkeslæt"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"webadresse"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Seneste"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Personer"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objekter"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natur"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Steder"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symboler"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Humørikoner"</string>
+</resources>
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index 86bdad469..65025b7a8 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -22,8 +22,8 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_input_options" msgid="3909945612939668554">"Indstillinger for input"</string>
<string name="english_ime_research_log" msgid="8492602295696577851">"Forskningslogkommandoer"</string>
- <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Slå kontaktnavne op"</string>
- <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Stavekontrollen bruger poster fra listen over kontaktpersoner"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Anvend kontaktnavne"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Stavekontrollen bruger ord fra dine kontaktpersondata"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibration ved tastetryk"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Lyd ved tastetryk"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Pop op ved tastetryk"</string>
@@ -35,7 +35,7 @@
<string name="advanced_settings_summary" msgid="4487980456152830271">"Indstillinger for øvede"</string>
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Skift inputmetode"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tasten til sprogskift gælder også for andre inputmetoder"</string>
- <string name="show_language_switch_key" msgid="5915478828318774384">"Tast til sprogskift"</string>
+ <string name="show_language_switch_key" msgid="5915478828318774384">"Knap til sprogskift"</string>
<string name="show_language_switch_key_summary" msgid="7343403647474265713">"Vis, når der er aktiveret flere inputsprog"</string>
<string name="sliding_key_input_preview" msgid="6604262359510068370">"Vis indikator ved glidning"</string>
<string name="sliding_key_input_preview_summary" msgid="6340524345729093886">"Vis et visuelt tip, når du glider fra Shift eller symboltaster"</string>
@@ -46,17 +46,18 @@
<string name="settings_system_default" msgid="6268225104743331821">"Systemstandard"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Foreslå navne på kontakter"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Brug navne fra Kontaktpersoner til forslag og rettelser"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Tilpassede forslag"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"To mellemrum for punktum"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"To tryk på mellemrumstasten indsætter et punktum og et mellemrum"</string>
- <string name="auto_cap" msgid="1719746674854628252">"Skriv aut. med stort"</string>
+ <string name="auto_cap" msgid="1719746674854628252">"Skriv automatisk med stort"</string>
<string name="auto_cap_summary" msgid="7934452761022946874">"Skriv det første ord i hver sætning med stort"</string>
<string name="edit_personal_dictionary" msgid="3996910038952940420">"Personlig ordbog"</string>
- <string name="configure_dictionaries_title" msgid="4238652338556902049">"Tillægsordbøger"</string>
+ <string name="configure_dictionaries_title" msgid="4238652338556902049">"Ekstra ordbøger"</string>
<string name="main_dictionary" msgid="4798763781818361168">"Hovedordbog"</string>
<string name="prefs_show_suggestions" msgid="8026799663445531637">"Vis rettelsesforslag"</string>
<string name="prefs_show_suggestions_summary" msgid="1583132279498502825">"Vis ordforslag under indtastning"</string>
<string name="prefs_suggestion_visibility_show_name" msgid="3219916594067551303">"Vis altid"</string>
- <string name="prefs_suggestion_visibility_show_only_portrait_name" msgid="3859783767435239118">"Vis i portræt"</string>
+ <string name="prefs_suggestion_visibility_show_only_portrait_name" msgid="3859783767435239118">"Vis i oprejst format"</string>
<string name="prefs_suggestion_visibility_hide_name" msgid="6309143926422234673">"Skjul altid"</string>
<string name="prefs_block_potentially_offensive_title" msgid="5078480071057408934">"Bloker stødende ord"</string>
<string name="prefs_block_potentially_offensive_summary" msgid="2371835479734991364">"Foreslå ikke potentielt stødende ord"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Vis glidende trykspor"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamiske ordeksempler"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Se ordforslag ved glidende indtastning"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Gemt"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Tilslut et headset for at høre indtastningen blive læst højt ved angivelse af adgangskode."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Nuværende tekst er %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Der er ingen indtastet tekst"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> retter <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> til <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> udfører automatisk rettelse"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Tastekode %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift-tast"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Skift er slået til (tryk for at deaktivere)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock er slået til (tryk for at deaktivere)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Slet"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symboler"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Bogstaver"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Tal"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Indstillinger"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabulatortast"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Mellemrum"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Stemmeinput"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smiley"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Tilbage"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Søg"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Punktum"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Skift sprog"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Næste"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Forrige"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Skift er aktiveret"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock er aktiveret"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Skift er deaktiveret"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Symboltilstand"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Bogstavtilstand"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Telefontilstand"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Telefonsymboltilstand"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Tastaturet er skjult"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Viser tastatur til <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"dato"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"Dato og klokkeslæt"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-mail"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"beskeder"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"tal"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefonnummer"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"tekst"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"klokkeslæt"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"Webadresse"</string>
- <string name="voice_input" msgid="3583258583521397548">"Nøgle til stemmeinput"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"På hovedtastatur"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"På symboltastatur"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Fra"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mik. på hovedtastatur"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mik. på symboltastatur"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Stemmeinput deaktiveret"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Bevægelse for udtryk"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Tilføj mellemrum ved at glide til mellemrumstasten"</string>
+ <string name="voice_input" msgid="3583258583521397548">"Knap til taleinput"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Der er ingen aktiverede stemmeinputmetoder. Kontrollér Indstillinger for sprog og input."</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfigurer inputmetoder"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Inputsprog"</string>
<string name="send_feedback" msgid="1780431884109392046">"Send feedback"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Engelsk (Storbritannien)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engelsk (USA)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spansk (USA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Engelsk (Storbritannien) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Engelsk (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spansk (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (traditionelt)"</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_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_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (traditionelt)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (kyrillisk)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Intet sprog (Alfabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabet (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Læs ekstern ordbogsfil"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Der er ingen ordbogsfiler i mappen Downloads"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Vælg den ordbog, som du vil installere"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Er du klar til at installere denne fil til <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Vil du virkelig installere denne fil for <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Der opstod en fejl"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Gem ordbog for kontakter"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Gem personlig ordbog"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Gem ordbog for brugerhistorik"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Gem ordbog for tilpasning"</string>
<string name="button_default" msgid="3988017840431881491">"Standard"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Velkommen til <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"med glidende indtastning"</string>
@@ -193,7 +154,7 @@
<string name="dictionary_provider_name" msgid="3027315045397363079">"Dictionary Provider"</string>
<string name="dictionary_service_name" msgid="6237472350693511448">"Ordbogstjeneste"</string>
<string name="download_description" msgid="6014835283119198591">"Opdateringsoplysninger for ordbøger"</string>
- <string name="dictionary_settings_title" msgid="8091417676045693313">"Tillægsordbøger"</string>
+ <string name="dictionary_settings_title" msgid="8091417676045693313">"Ekstra ordbøger"</string>
<string name="dictionary_install_over_metered_network_prompt" msgid="3587517870006332980">"Ordbog er tilgængelig"</string>
<string name="dictionary_settings_summary" msgid="5305694987799824349">"Indstillinger for ordbøger"</string>
<string name="user_dictionaries" msgid="3582332055892252845">"Brugerordbøger"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Opdater"</string>
<string name="last_update" msgid="730467549913588780">"Sidst opdateret"</string>
<string name="message_updating" msgid="4457761393932375219">"Søger efter opdateringer"</string>
- <string name="message_loading" msgid="8689096636874758814">"Indlæser..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Indlæser…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Hovedordbog"</string>
<string name="cancel" msgid="6830980399865683324">"Annuller"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Indstillinger"</string>
<string name="install_dict" msgid="180852772562189365">"Installer"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Annuller"</string>
<string name="delete_dict" msgid="756853268088330054">"Slet"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Det valgte sprog på din mobilenhed har en tilgængelig ordbog.&lt;br/&gt; Vi anbefaler, at du &lt;b&gt;downloader&lt;/b&gt; <xliff:g id="LANGUAGE">%1$s</xliff:g>-ordbogen for at forbedre din skriveoplevelse.&lt;br/&gt; &lt;br/&gt; Downloaden kan tage 1-2 minutter via 3G. Der bliver muligvis opkrævet et gebyr, hvis du ikke har et &lt;b&gt;ubegrænset dataabonnement&lt;/b&gt;.&lt;br/&gt;. Hvis du ikke er sikker på, hvilket dataabonnement du har, anbefaler vi, at du finder en Wi-Fi-forbindelse for at starte automatisk download.&lt;br/&gt; &lt;br/&gt;Tip! Du kan downloade og fjerne ordbøger ved at gå til &lt;b&gt;Sprog og input &lt;/b&gt; i menuen &lt;b&gt;Indstillinger&lt;/b&gt; på din mobilenhed."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Det valgte sprog på din mobilenhed har en tilgængelig ordbog.&lt;br/&gt; Vi anbefaler, at du &lt;b&gt;downloader&lt;/b&gt; <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>-ordbogen for at forbedre din skriveoplevelse.&lt;br/&gt; &lt;br/&gt; Downloaden kan tage 1-2 minutter via 3G. Der bliver muligvis opkrævet et gebyr, hvis du ikke har et &lt;b&gt;ubegrænset dataabonnement&lt;/b&gt;.&lt;br/&gt;. Hvis du ikke er sikker på, hvilket dataabonnement du har, anbefaler vi, at du finder en Wi-Fi-forbindelse for at starte automatisk download.&lt;br/&gt; &lt;br/&gt;Tip! Du kan downloade og fjerne ordbøger ved at gå til &lt;b&gt;Sprog og input &lt;/b&gt; i menuen &lt;b&gt;Indstillinger&lt;/b&gt; på din mobilenhed."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Download nu (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Download via Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Der er en tilgængelig ordbog for <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Der er en ordbog tilgængelig for <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Tryk for at gennemgå og downloade"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Downloader: Der vil snart være forslag klar på <xliff:g id="LANGUAGE">%1$s</xliff:g>."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Downloader: Der vil snart være forslag klar på <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>."</string>
<string name="version_text" msgid="2715354215568469385">"Version <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Tilføj"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Føj til ordbog"</string>
diff --git a/java/res/values-de/strings-config-important-notice.xml b/java/res/values-de/strings-config-important-notice.xml
new file mode 100644
index 000000000..a514364f9
--- /dev/null
+++ b/java/res/values-de/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Vorschläge anhand bisheriger Nachrichten und Eingaben verbessern"</string>
+</resources>
diff --git a/java/res/values-de/strings-talkback-descriptions.xml b/java/res/values-de/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..9fef63208
--- /dev/null
+++ b/java/res/values-de/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Schließen Sie ein Headset an, um das Passwort gesprochen zu hören."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Aktueller Text lautet %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Kein Text eingegeben"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"Mit <xliff:g id="KEY_NAME">%1$s</xliff:g> wird \"<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>\" in \"<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>\" geändert."</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Mit <xliff:g id="KEY_NAME">%1$s</xliff:g> erfolgt eine Autokorrektur."</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Tastencode %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Umschalttaste"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Umschalttaste aktiviert (zum Deaktivieren berühren)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Feststelltaste aktiviert (zum Deaktivieren berühren)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Löschen"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symbole"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Buchstaben"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Zahlen"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Einstellungen"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tabulatortaste"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Leertaste"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Spracheingabe"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Eingabetaste"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Suchen"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Aufzählungspunkt"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Sprache wechseln"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Weiter"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Zurück"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Umschalttaste aktiviert"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Feststelltaste aktiviert"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Umschalttaste deaktiviert"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbolmodus"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Buchstabenmodus"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefonmodus"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefon-Symbolmodus"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Tastatur ausgeblendet"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Tastatur für <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"Datum"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"Datum und Uhrzeit"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"E-Mail-Adresse"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"SMS/MMS"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"Zahl"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"Telefonnummer"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"Text"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"Zeit"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Neueste"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Kontakte"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objekte"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natur"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Orte"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symbole"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticons"</string>
+</resources>
diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index b65053465..f2074b762 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -38,7 +38,7 @@
<string name="show_language_switch_key" msgid="5915478828318774384">"Sprachwechsel"</string>
<string name="show_language_switch_key_summary" msgid="7343403647474265713">"Anzeigen, wenn mehrere Eingabesprachen aktiviert sind"</string>
<string name="sliding_key_input_preview" msgid="6604262359510068370">"Ziehbewegung anzeigen"</string>
- <string name="sliding_key_input_preview_summary" msgid="6340524345729093886">"Ziehen mit gedrückter Shift- oder Symboltaste visuell darstellen"</string>
+ <string name="sliding_key_input_preview_summary" msgid="6340524345729093886">"Ziehen mit gedrückter Symboltaste oder Shift visuell darstellen"</string>
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tasten-Pop-up"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Keine Verzögerung"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Standard"</string>
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Systemstandardeinstellung"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Kontakte vorschlagen"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Namen aus \"Kontakte\" als Vorschläge und Korrekturmöglichkeiten anzeigen"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Personalisierte Vorschläge"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Punkt plus Leerzeichen"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Für Punkt plus Leerzeichen zweimal auf die Leertaste tippen"</string>
<string name="auto_cap" msgid="1719746674854628252">"Autom. Groß-/Kleinschreibung"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Spur der Bewegung anzeigen"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dyn. unverankerter Vorschlag"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Vorgeschlagenes Wort bei Bewegung anzeigen"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: gespeichert"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Schließen Sie ein Headset an, um das Passwort gesprochen zu hören."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Aktueller Text lautet %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Kein Text eingegeben"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"Mit <xliff:g id="KEY">%1$s</xliff:g> wird <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> zu <xliff:g id="CORRECTED">%3$s</xliff:g> korrigiert."</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"Mit <xliff:g id="KEY">%1$s</xliff:g> erfolgt eine Autokorrektur."</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Tastencode %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Umschalttaste"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Umschalttaste aktiviert (zum Deaktivieren berühren)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Feststelltaste aktiviert (zum Deaktivieren berühren)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Entf"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symbole"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Buchstaben"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Zahlen"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Einstellungen"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabulator"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Leerzeichen"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Spracheingabe"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smiley"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Eingabe"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Suchen"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Aufzählungspunkt"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Sprache wechseln"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Nächste"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Vorherige"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Umschalttaste aktiviert"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Feststelltaste aktiviert"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Umschalttaste deaktiviert"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Symbolmodus"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Buchstabenmodus"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Telefonmodus"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Telefon-Symbolmodus"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Tastatur ausgeblendet"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Tastatur für <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"Datum"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"Datum &amp; Uhrzeit"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"E-Mail-Adresse"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"SMS/MMS"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"Zahl"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"Telefonnummer"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"Text"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"Zeit"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Phrasenbewegung"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Leerzeichen durch Bewegung über die Leertaste einfügen"</string>
<string name="voice_input" msgid="3583258583521397548">"Taste für Spracheingabe"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Auf Haupttastatur"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Auf Symboltastatur"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Aus"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikro auf Haupttastatur"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikro auf Symboltastatur"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Spracheingabe deaktiviert"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Keine Spracheingabemethoden aktiviert. Rufen Sie die Einstellungen für \"Sprache &amp; Eingabe\" auf."</string>
<string name="configure_input_method" msgid="373356270290742459">"Eingabemethoden konfigurieren"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Eingabesprachen"</string>
<string name="send_feedback" msgid="1780431884109392046">"Feedback geben"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Englisch (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Englisch (USA)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spanisch (USA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Englisch (GB) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Englisch (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spanisch (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (traditionell)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Englisch (GB) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Englisch (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spanisch (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (traditionell)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (kyrillisch)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (lateinisch)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Keine Sprache (lat. Alphabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Lat. Alphabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Lat. Alphabet (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Externe Wörterbuchdatei lesen"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Keine Wörterbuchdateien im Ordner \"Downloads\""</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Wörterbuchdatei zum Installieren auswählen"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Möchten Sie diese Datei für <xliff:g id="LOCALE_NAME">%s</xliff:g> installieren?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Möchten Sie diese Datei für <xliff:g id="LANGUAGE_NAME">%s</xliff:g> installieren?"</string>
<string name="error" msgid="8940763624668513648">"Es ist ein Fehler aufgetreten"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Auszug Kontaktwörterbuch"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Auszug persönliches Wörterbuch"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Auszug Nutzerverlaufswörterbuch"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Auszug Personalisierungswörterbuch"</string>
<string name="button_default" msgid="3988017840431881491">"Standard"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Willkommen bei <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"mit Bewegungseingabe"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Aktualisieren"</string>
<string name="last_update" msgid="730467549913588780">"Zuletzt aktualisiert"</string>
<string name="message_updating" msgid="4457761393932375219">"Suche nach Updates..."</string>
- <string name="message_loading" msgid="8689096636874758814">"Wird geladen..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Wird geladen…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Allgemeines Wörterbuch"</string>
<string name="cancel" msgid="6830980399865683324">"Abbrechen"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Einstellungen"</string>
<string name="install_dict" msgid="180852772562189365">"Installieren"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Abbrechen"</string>
<string name="delete_dict" msgid="756853268088330054">"Löschen"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Für die auf dem Mobilgerät ausgewählte Sprache ist ein Wörterbuch verfügbar.&lt;br/&gt; &lt;b&gt;Laden Sie das <xliff:g id="LANGUAGE">%1$s</xliff:g>-Wörterbuch herunter&lt;/b&gt; und verbessern Sie Ihre Eingabeerfahrung.&lt;br/&gt; &lt;br/&gt;Der Download über 3G kann ein bis zwei Minuten dauern. Falls Sie keine &lt;b&gt;Datenflatrate&lt;/b&gt; haben, fallen eventuell Gebühren an.&lt;br/&gt; Sollten Sie sich nicht sicher sein, welchen Datentarif Sie haben, suchen Sie eine WLAN-Verbindung, um den Download automatisch zu starten.&lt;br/&gt; &lt;br/&gt;Tipp: Im Menü &lt;b&gt;Einstellungen&lt;/b&gt; Ihres Mobilgeräts können Sie unter &lt;b&gt;Sprache &amp; Eingabe&lt;/b&gt; Wörterbücher herunterladen und entfernen."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Für die auf dem Mobilgerät ausgewählte Sprache ist ein Wörterbuch verfügbar.&lt;br/&gt; &lt;b&gt;Laden Sie das <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>-Wörterbuch herunter&lt;/b&gt; und verbessern Sie Ihre Eingabeerfahrung.&lt;br/&gt; &lt;br/&gt; Der Download über 3G kann ein bis zwei Minuten dauern. Falls Sie keine &lt;b&gt;Datenflatrate&lt;/b&gt; haben, fallen eventuell Gebühren an.&lt;br/&gt; Sollten Sie sich nicht sicher sein, welchen Datentarif Sie haben, suchen Sie eine WLAN-Verbindung, um den Download automatisch zu starten.&lt;br/&gt; &lt;br/&gt; Tipp: Im Menü &lt;b&gt;Einstellungen&lt;/b&gt; Ihres Mobilgeräts können Sie unter &lt;b&gt;Sprache &amp; Eingabe&lt;/b&gt; Wörterbücher herunterladen und entfernen."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Jetzt herunterladen (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Über WLAN herunterladen"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Es ist ein Wörterbuch für <xliff:g id="LANGUAGE">%1$s</xliff:g> verfügbar."</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Es ist ein Wörterbuch für <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> verfügbar."</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Zum Lesen und Herunterladen drücken"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Download wurde gestartet: Vorschläge für <xliff:g id="LANGUAGE">%1$s</xliff:g> sind in Kürze bereit."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Download wurde gestartet: Vorschläge für <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> sind in Kürze bereit."</string>
<string name="version_text" msgid="2715354215568469385">"Version <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Hinzufügen"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Zum Wörterbuch hinzufügen"</string>
diff --git a/java/res/values-el/strings-config-important-notice.xml b/java/res/values-el/strings-config-important-notice.xml
new file mode 100644
index 000000000..926ec9b6b
--- /dev/null
+++ b/java/res/values-el/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-el/strings-talkback-descriptions.xml b/java/res/values-el/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..7393e630e
--- /dev/null
+++ b/java/res/values-el/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Συνδέστε ένα σετ ακουστικών για να ακούσετε τα πλήκτρα του κωδικού πρόσβασης να εκφωνούνται δυνατά."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Το τρέχον κείμενο είναι %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Δεν υπάρχει κείμενο"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> διορθώνει το <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> σε <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> εκτελεί αυτόματη διόρθωση"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Κωδικός πλήκτρου %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Το Shift είναι ενεργοποιημένο (πατήστε για απενεργοποίηση)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Το Caps lock είναι ενεργοποιημένο (πατήστε για απενεργοποίηση)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Διαγραφή"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Σύμβολα"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Γράμματα"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Αριθμοί"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Ρυθμίσεις"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Πλήκτρο διαστήματος"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Φωνητική είσοδος"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoticon"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Επιστροφή"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Αναζήτηση"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Κουκκίδα"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Εναλλαγή γλώσσας"</string>
+ <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">"Το Shift είναι ενεργοποιημένο"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Το Caps lock είναι ενεργοποιημένο"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Το Shift είναι απενεργοποιημένο"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Λειτουργία συμβόλων"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Λειτουργία γραμμάτων"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Λειτουργία τηλεφώνου"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Λειτουργία συμβόλων τηλεφώνου"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Απόκρυψη πληκτρολογίου"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Εμφάνιση πληκτρολογίου <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"ημερομηνία"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"ημερομηνία και ώρα"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"ανταλλαγή μηνυμάτων"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"αριθμός"</string>
+ <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">"διεύθυνση URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Φύση"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Μέρη"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Σύμβολα"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticon"</string>
+</resources>
diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml
index 79e83423c..7f0e3f3d7 100644
--- a/java/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Προεπιλογή"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Πρόταση ονομάτων επαφών"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Χρησιμοποιήστε ονόματα από τις Επαφές για προτάσεις και διορθ."</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Εξατομικευμένες προτάσεις"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Τελεία με διπλό πάτημα πλήκτρ.διαστ."</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Το διπλό πάτημα του πλήκτρ.διαστ. εισάγει μια τελεία και ένα κενό"</string>
<string name="auto_cap" msgid="1719746674854628252">"Αυτόματη χρήση κεφαλαίων"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Εμφάνιση διαδρομής χειρονομίας"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Προεπισκόπ. δυναμικής κίνησης"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Εμφάνιση της προτεινόμενης λέξης κατά την κίνηση"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Αποθηκεύτηκε"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Συνδέστε ένα σετ ακουστικών για να ακούσετε τα πλήκτρα του κωδικού πρόσβασης να εκφωνούνται δυνατά."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Το τρέχον κείμενο είναι %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Δεν υπάρχει κείμενο"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> διορθώνει το <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> σε <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> εκτελεί αυτόματη διόρθωση"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Κωδικός πλήκτρου %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Το Shift είναι ενεργοποιημένο (πατήστε για απενεργοποίηση)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Το Caps lock είναι ενεργοποιημένο (πατήστε για απενεργοποίηση)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Πλήκτρο Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Σύμβολα"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Γράμματα:"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Αριθμοί"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Ρυθμίσεις"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Πλήκτρο Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Πλήκτρο διαστήματος"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Μικρόφωνο"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smiley"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Πλήκτρο Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Αναζήτηση"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Κουκκίδα"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Αλλαγή γλώσσας"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Επόμενο"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Προηγούμενο"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Το Shift ενεργοποιημένο"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Το Caps lock είναι ενεργοποιημένο"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Το Shift είναι απενεργοποιημένο"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Λειτουργία συμβόλων"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Λειτουργία γραμμάτων"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Λειτουργία τηλεφώνου"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Λειτουργία συμβόλων τηλεφώνου"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Πληκτρολόγιο είναι κρυμμένο"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Εμφάνιση πληκτρολογίου <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"ημερομηνία"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"ημερομηνία και ώρα"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"ανταλλαγή μηνυμάτων"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"αριθμός"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"τηλέφωνο"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"κείμενο"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"ώρα"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"διεύθυνση URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Εισαγωγή φράσεων με κίνηση"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Εισαγάγετε κενά στις κινήσεις με ολίσθηση στο πλήκτρο διαστήματος"</string>
<string name="voice_input" msgid="3583258583521397548">"Κλειδί φωνητικής εξόδου"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Στο κύριο πληκτρολ."</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Πληκτρ. συμβ. ενερ."</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Απενεργοποίηση"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Μικ. στο κύριο πληκ."</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Μικ. στο πληκ. συμβ."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Απεν. φωνητ. είσοδος"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Δεν έχουν ενεργοποιηθεί μέθοδοι φωνητικής εισαγωγής. Ελέγξτε τις Ρυθμίσεις Γλώσσας και εισαγωγής."</string>
<string name="configure_input_method" msgid="373356270290742459">"Διαμόρφωση μεθόδων εισαγωγής"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Γλώσσες εισόδου"</string>
<string name="send_feedback" msgid="1780431884109392046">"Αποστολή σχολίων"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Αγγλικά (Η.Β.)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Αγγλικά (Η.Π.Α)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Ισπανικά (ΗΠΑ)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Αγγλικά (ΗΒ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Αγγλικά (ΗΠΑ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Ισπανικά (ΗΠΑ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Παραδοσιακά)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Αγγλικά (Ηνωμένο Βασίλειο) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Αγγλικά (ΗΠΑ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Ισπανικά (ΗΠΑ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Παραδοσιακά)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Κυριλλικά)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Λατινικά)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Καμία γλώσσα (Αλφάβητο)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Αλφάβητο (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Αλφάβητο (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Ανάγνωση εξωτερικού αρχείου λεξικού"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Δεν υπάρχουν αρχεία λεξικού στο φάκελο \"Λήψεις\""</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Επιλογή αρχείου λεξικού για εγκατάσταση"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Να εγκατασταθεί όντως αυτό το αρχείο για <xliff:g id="LOCALE_NAME">%s</xliff:g>;"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Εγκατάσταση αυτού του αρχείου για τα <xliff:g id="LANGUAGE_NAME">%s</xliff:g>;"</string>
<string name="error" msgid="8940763624668513648">"Παρουσιάστηκε σφάλμα."</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Εξαγωγή λεξικού επαφών"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Αποτύπωση προσωπικού λεξικού"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Αποτύπωση λεξικού ιστορικού χρήστη"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Αποτύπωση λεξικού εξατομίκευσης"</string>
<string name="button_default" msgid="3988017840431881491">"Προεπιλογή"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Καλώς ορίσατε στο <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"με Πληκτρολόγηση με κίνηση"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Ανανέωση"</string>
<string name="last_update" msgid="730467549913588780">"Τελευταία ενημέρωση"</string>
<string name="message_updating" msgid="4457761393932375219">"Έλεγχος για ενημερώσεις"</string>
- <string name="message_loading" msgid="8689096636874758814">"Φόρτωση…"</string>
+ <string name="message_loading" msgid="5638680861387748936">"Φόρτωση…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Κύριο λεξικό"</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="delete_dict" msgid="756853268088330054">"Διαγραφή"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Η επιλ. γλώσσα στην κιν. συσκευή σας διαθέτει λεξικό.&lt;br/&gt; Προτείνουμε να &lt;b&gt;κάνετε λήψη&lt;/b&gt; του λεξικού <xliff:g id="LANGUAGE">%1$s</xliff:g> για να βελτ. την πληκτρολόγηση.&lt;br/&gt; &lt;br/&gt; Για τη λήψη μπορεί να χρειαστούν 1 ή 2 λεπτά μέσω 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; Προτείνουμε να &lt;b&gt;κατεβάσετε&lt;/b&gt; το λεξικό <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> για βελτίωση της πληκτρολόγησης.&lt;br/&gt; &lt;br/&gt; Για τη λήψη μπορεί να χρειαστούν 1 ή 2 λεπτά μέσω 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>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Λήψη μέσω Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Υπάρχει διαθέσιμο λεξικό για τα <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Υπάρχει διαθέσιμο λεξικό για τα <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Πατήστε για έλεγχο και λήψη"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Λήψη: Οι προτάσεις για τα <xliff:g id="LANGUAGE">%1$s</xliff:g> θα είναι έτοιμες σύντομα."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Λήψη: οι προτάσεις για τα <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> θα είναι έτοιμες σύντομα."</string>
<string name="version_text" msgid="2715354215568469385">"Έκδοση <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Προσθήκη"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Προσθήκη στο λεξικό"</string>
diff --git a/java/res/values-en-rGB/strings-config-important-notice.xml b/java/res/values-en-rGB/strings-config-important-notice.xml
new file mode 100644
index 000000000..80ddd3e4b
--- /dev/null
+++ b/java/res/values-en-rGB/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Learn from your communications and typed data to improve suggestions"</string>
+</resources>
diff --git a/java/res/values-en-rGB/strings-talkback-descriptions.xml b/java/res/values-en-rGB/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..c9393ee79
--- /dev/null
+++ b/java/res/values-en-rGB/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Plug in a headset to hear password keys spoken aloud."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Current text is %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"No text entered"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corrects <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> to <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> performs auto-correction"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Key code %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift on (tap to disable)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock on (tap to disable)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Delete"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symbols"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Letters"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Numbers"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Settings"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Space"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Voice input"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Return"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Search"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Full stop"</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_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>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift disabled"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbols mode"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Letters mode"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Phone mode"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Phone symbols mode"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Keyboard hidden"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Showing <xliff:g id="KEYBOARD_MODE">%s</xliff:g> keyboard"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"date"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"date and time"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"email"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"messaging"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"number"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"phone"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"text"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"time"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Recents"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"People"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objects"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Nature"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Places"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symbols"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticons"</string>
+</resources>
diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml
index 4bc1b15cf..89e978925 100644
--- a/java/res/values-en-rGB/strings.xml
+++ b/java/res/values-en-rGB/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"System default"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Suggest Contact names"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Use names from Contacts for suggestions and corrections"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Personalised suggestions"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Double-space full stop"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Double tap on spacebar inserts a full stop followed by a space"</string>
<string name="auto_cap" msgid="1719746674854628252">"Auto-capitalisation"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Show gesture trail"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamic floating preview"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"See the suggested word while gesturing"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Saved"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Plug in a headset to hear password keys spoken aloud."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Current text is %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"No text entered"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> corrects <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> to <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> performs auto-correction"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Key code %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift on (tap to disable)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock on (tap to disable)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symbols"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Letters"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Numbers"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Settings"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Space"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Voice input"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smiley face"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Search"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Dot"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Switch language"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Next"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Previous"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift enabled"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock enabled"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift disabled"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Symbols mode"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Letters mode"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Phone mode"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Phone symbols mode"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Keyboard hidden"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Showing <xliff:g id="MODE">%s</xliff:g> keyboard"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"date"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"date and time"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"email"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"messaging"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"number"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"phone"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"text"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"time"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Phrase gesture"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Input spaces during gestures by gliding to the space key"</string>
<string name="voice_input" msgid="3583258583521397548">"Voice input key"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"On main keyboard"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"On symbols keyboard"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Off"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mic on main keyboard"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mic on symbols keyboard"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Voice input is disabled"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"No voice input methods enabled. Check Language &amp; input settings."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configure input methods"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Input languages"</string>
<string name="send_feedback" msgid="1780431884109392046">"Send feedback"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"English (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"English (US)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spanish (US)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"English (UK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"English (US) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spanish (US) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Traditional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"English (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"English (US) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spanish (US) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Traditional)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Cyrillic)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"No language (Alphabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alphabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alphabet (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Read external dictionary file"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"No dictionary files in the Downloads folder"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Select a dictionary file to install"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Really install this file for <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Really install this file for <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"There was an error"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Dump contacts dictionary"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Dump personal dictionary"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Dump user history dictionary"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Dump personalisation dictionary"</string>
<string name="button_default" msgid="3988017840431881491">"Default"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Welcome to <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"with Gesture Typing"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Refresh"</string>
<string name="last_update" msgid="730467549913588780">"Last updated"</string>
<string name="message_updating" msgid="4457761393932375219">"Checking for updates"</string>
- <string name="message_loading" msgid="8689096636874758814">"Loading..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Loading…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Main dictionary"</string>
<string name="cancel" msgid="6830980399865683324">"Cancel"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Settings"</string>
<string name="install_dict" msgid="180852772562189365">"Install"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Cancel"</string>
<string name="delete_dict" msgid="756853268088330054">"Delete"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"The selected language on your mobile device has an available dictionary.&lt;br/&gt; We recommend &lt;b&gt;downloading&lt;/b&gt; the <xliff:g id="LANGUAGE">%1$s</xliff:g> dictionary to improve your typing experience.&lt;br/&gt; &lt;br/&gt; The download could take a minute or two over 3G. Charges may apply if you don\'t have an &lt;b&gt;unlimited data plan&lt;/b&gt;.&lt;br/&gt; If you are not sure which data plan you have, we recommend finding a Wi-Fi connection to start the download automatically.&lt;br/&gt; &lt;br/&gt; Tip: You can download and remove dictionaries by going to &lt;b&gt;Language &amp; input&lt;/b&gt; in the &lt;b&gt;Settings&lt;/b&gt; menu of your mobile device."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"The selected language on your mobile device has an available dictionary.&lt;br/&gt; We recommend &lt;b&gt;downloading&lt;/b&gt; the <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> dictionary to improve your typing experience.&lt;br/&gt; &lt;br/&gt; The download could take a minute or two over 3G. Charges may apply if you don\'t have an &lt;b&gt;unlimited data plan&lt;/b&gt;.&lt;br/&gt; If you are not sure which data plan you have, we recommend finding a Wi-Fi connection to start the download automatically.&lt;br/&gt; &lt;br/&gt; Tip: You can download and remove dictionaries by going to &lt;b&gt;Language &amp; input&lt;/b&gt; in the &lt;b&gt;Settings&lt;/b&gt; menu of your mobile device."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Download now (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Download over Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"A dictionary is available for <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"A dictionary is available for <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Press to review and download"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Downloading: suggestions for <xliff:g id="LANGUAGE">%1$s</xliff:g> will be ready soon."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Downloading: suggestions for <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> will be ready soon."</string>
<string name="version_text" msgid="2715354215568469385">"Version <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Add"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Add to dictionary"</string>
diff --git a/java/res/values-en-rIN/strings-config-important-notice.xml b/java/res/values-en-rIN/strings-config-important-notice.xml
new file mode 100644
index 000000000..80ddd3e4b
--- /dev/null
+++ b/java/res/values-en-rIN/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Learn from your communications and typed data to improve suggestions"</string>
+</resources>
diff --git a/java/res/values-en-rIN/strings-talkback-descriptions.xml b/java/res/values-en-rIN/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..c9393ee79
--- /dev/null
+++ b/java/res/values-en-rIN/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Plug in a headset to hear password keys spoken aloud."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Current text is %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"No text entered"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corrects <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> to <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> performs auto-correction"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Key code %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift on (tap to disable)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock on (tap to disable)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Delete"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symbols"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Letters"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Numbers"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Settings"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Space"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Voice input"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Return"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Search"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Full stop"</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_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>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift disabled"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbols mode"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Letters mode"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Phone mode"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Phone symbols mode"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Keyboard hidden"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Showing <xliff:g id="KEYBOARD_MODE">%s</xliff:g> keyboard"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"date"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"date and time"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"email"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"messaging"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"number"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"phone"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"text"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"time"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Recents"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"People"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objects"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Nature"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Places"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symbols"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticons"</string>
+</resources>
diff --git a/java/res/values-en-rIN/strings.xml b/java/res/values-en-rIN/strings.xml
index 4bc1b15cf..89e978925 100644
--- a/java/res/values-en-rIN/strings.xml
+++ b/java/res/values-en-rIN/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"System default"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Suggest Contact names"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Use names from Contacts for suggestions and corrections"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Personalised suggestions"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Double-space full stop"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Double tap on spacebar inserts a full stop followed by a space"</string>
<string name="auto_cap" msgid="1719746674854628252">"Auto-capitalisation"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Show gesture trail"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamic floating preview"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"See the suggested word while gesturing"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Saved"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Plug in a headset to hear password keys spoken aloud."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Current text is %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"No text entered"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> corrects <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> to <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> performs auto-correction"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Key code %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift on (tap to disable)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock on (tap to disable)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symbols"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Letters"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Numbers"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Settings"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Space"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Voice input"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smiley face"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Search"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Dot"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Switch language"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Next"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Previous"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift enabled"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock enabled"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift disabled"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Symbols mode"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Letters mode"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Phone mode"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Phone symbols mode"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Keyboard hidden"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Showing <xliff:g id="MODE">%s</xliff:g> keyboard"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"date"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"date and time"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"email"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"messaging"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"number"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"phone"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"text"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"time"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Phrase gesture"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Input spaces during gestures by gliding to the space key"</string>
<string name="voice_input" msgid="3583258583521397548">"Voice input key"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"On main keyboard"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"On symbols keyboard"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Off"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mic on main keyboard"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mic on symbols keyboard"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Voice input is disabled"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"No voice input methods enabled. Check Language &amp; input settings."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configure input methods"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Input languages"</string>
<string name="send_feedback" msgid="1780431884109392046">"Send feedback"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"English (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"English (US)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spanish (US)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"English (UK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"English (US) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spanish (US) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Traditional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"English (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"English (US) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spanish (US) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Traditional)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Cyrillic)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"No language (Alphabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alphabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alphabet (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Read external dictionary file"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"No dictionary files in the Downloads folder"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Select a dictionary file to install"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Really install this file for <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Really install this file for <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"There was an error"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Dump contacts dictionary"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Dump personal dictionary"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Dump user history dictionary"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Dump personalisation dictionary"</string>
<string name="button_default" msgid="3988017840431881491">"Default"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Welcome to <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"with Gesture Typing"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Refresh"</string>
<string name="last_update" msgid="730467549913588780">"Last updated"</string>
<string name="message_updating" msgid="4457761393932375219">"Checking for updates"</string>
- <string name="message_loading" msgid="8689096636874758814">"Loading..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Loading…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Main dictionary"</string>
<string name="cancel" msgid="6830980399865683324">"Cancel"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Settings"</string>
<string name="install_dict" msgid="180852772562189365">"Install"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Cancel"</string>
<string name="delete_dict" msgid="756853268088330054">"Delete"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"The selected language on your mobile device has an available dictionary.&lt;br/&gt; We recommend &lt;b&gt;downloading&lt;/b&gt; the <xliff:g id="LANGUAGE">%1$s</xliff:g> dictionary to improve your typing experience.&lt;br/&gt; &lt;br/&gt; The download could take a minute or two over 3G. Charges may apply if you don\'t have an &lt;b&gt;unlimited data plan&lt;/b&gt;.&lt;br/&gt; If you are not sure which data plan you have, we recommend finding a Wi-Fi connection to start the download automatically.&lt;br/&gt; &lt;br/&gt; Tip: You can download and remove dictionaries by going to &lt;b&gt;Language &amp; input&lt;/b&gt; in the &lt;b&gt;Settings&lt;/b&gt; menu of your mobile device."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"The selected language on your mobile device has an available dictionary.&lt;br/&gt; We recommend &lt;b&gt;downloading&lt;/b&gt; the <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> dictionary to improve your typing experience.&lt;br/&gt; &lt;br/&gt; The download could take a minute or two over 3G. Charges may apply if you don\'t have an &lt;b&gt;unlimited data plan&lt;/b&gt;.&lt;br/&gt; If you are not sure which data plan you have, we recommend finding a Wi-Fi connection to start the download automatically.&lt;br/&gt; &lt;br/&gt; Tip: You can download and remove dictionaries by going to &lt;b&gt;Language &amp; input&lt;/b&gt; in the &lt;b&gt;Settings&lt;/b&gt; menu of your mobile device."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Download now (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Download over Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"A dictionary is available for <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"A dictionary is available for <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Press to review and download"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Downloading: suggestions for <xliff:g id="LANGUAGE">%1$s</xliff:g> will be ready soon."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Downloading: suggestions for <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> will be ready soon."</string>
<string name="version_text" msgid="2715354215568469385">"Version <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Add"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Add to dictionary"</string>
diff --git a/java/res/values-es-rUS/strings-config-important-notice.xml b/java/res/values-es-rUS/strings-config-important-notice.xml
new file mode 100644
index 000000000..5b895fb4a
--- /dev/null
+++ b/java/res/values-es-rUS/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Aprende de mensajes y datos ingresados para mejorar las sugerencias."</string>
+</resources>
diff --git a/java/res/values-es-rUS/strings-talkback-descriptions.xml b/java/res/values-es-rUS/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..ab4979fc7
--- /dev/null
+++ b/java/res/values-es-rUS/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Enchufa tus auriculares para escuchar en voz alta qué teclas presionas al ingresar una contraseña."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"El texto actual es %s."</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"No se ingresó texto."</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corrige <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> por <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>."</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corrige automáticamente."</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Clave de código %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Mayúsculas"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Mayúsculas activado (presiona para desactivarlo)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Bloqueo de mayúsculas activado (presiona para desactivarlo)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Eliminar"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Símbolos"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Letras"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Números"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Configuración"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Pestaña"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Espacio"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Entrada de voz"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Volver"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Búsqueda"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Punto"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Cambiar idioma"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Siguiente"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Anterior"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Mayúsculas activado"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Bloqueo de mayúsculas activado"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Mayúsculas desactivado"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modo Símbolos"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modo Letras"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modo Teléfono"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modo Símbolos del teléfono"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Teclado oculto"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Mostrando teclado de <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"fecha"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"fecha y hora"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"correo electrónico"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"mensaje de texto"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"número"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"teléfono"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"texto"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"hora"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Recientes"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Contactos"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objetos"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Naturaleza"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Lugares"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Símbolos"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticones"</string>
+</resources>
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index 1fd9cf8f0..d440c0ce6 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Valor predet. sist."</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Sugerir nombres de contacto"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Usar nombres de los contactos para sugerencias y correcciones"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Sugerenc. personalizadas"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Punto y doble espacio"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Tocar dos veces la barra espaciadora inserta un punto y espacio."</string>
<string name="auto_cap" msgid="1719746674854628252">"Mayúsculas automáticas"</string>
@@ -73,56 +74,10 @@
<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>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Enchufa tus auriculares para escuchar en voz alta qué teclas presionas al ingresar una contraseña."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"El texto actual es %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"No se ingresó texto."</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"La tecla <xliff:g id="KEY">%1$s</xliff:g> corrige <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> por <xliff:g id="CORRECTED">%3$s</xliff:g>."</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"La tecla <xliff:g id="KEY">%1$s</xliff:g> corrige automáticamente."</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Clave de código %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Mayús"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Se activó el modo Mayúscula (toca para desactivarlo)."</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Se activó el bloqueo de mayúsculas (toca para desactivarlo)."</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Borrar"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Símbolos"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Letras"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Números"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Configuración"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Pestaña"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Espacio"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Entrada de voz"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Carita sonriente"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Volver"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Buscar"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Punto"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Cambiar idioma"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Siguiente"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Anterior"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Se activó el modo Mayúscula."</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Se activó el bloqueo de mayúsculas."</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Se desactivó el modo Mayúscula"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Modo Símbolos"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Modo Letras"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Modo Teléfono"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Modo Símbolos del teléfono"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Teclado oculto"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Mostrando teclado para <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"fecha"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"fecha y hora"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"correo"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"mensaje de texto"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"número"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"teléfono"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"texto"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"hora"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Frase gestual"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Desliza el dedo hasta la tecla de espacio para ingresar espacios."</string>
<string name="voice_input" msgid="3583258583521397548">"Tecla de entrada por voz"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"En el teclado principal"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"En el teclado de símbolos"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Desactivado"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Micrófono en el teclado principal"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Micrófono en el teclado de símbolos"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"La entrada por voz está inhabilitada"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"No hay métodos de entrada de voz habilitados. Comprueba la configuración de Teclado e idioma."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configurar métodos de entrada"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Idiomas de entrada"</string>
<string name="send_feedback" msgid="1780431884109392046">"Enviar comentarios"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Inglés (Reino Unido)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Inglés (EE.UU.)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Español (EE.UU.)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Inglés (Reino Unido) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Inglés (EE.UU.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Español (EE.UU.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradicional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Inglés, Reino Unido (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Inglés, EE. UU. (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Español, EE. UU. (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradicional)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cirílico)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latinoamérica)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Ningún idioma (alfabeto)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabeto (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabeto (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Leer archivo de diccionario externo"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"No hay archivos de diccionario en la carpeta de descargas."</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Seleccionar archivo de diccionario para instalar"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"¿Realmente quieres instalar este archivo para <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"¿Realmente quieres instalar este archivo para <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Se produjo un error."</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Generar diccionario de contactos"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Volcar diccionario personal"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Volcar diccionario hist. usuario"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Volcar diccionario personalización"</string>
<string name="button_default" msgid="3988017840431881491">"Predeterminado"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Te damos la bienvenida a <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"con escritura gestual"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Actualizar"</string>
<string name="last_update" msgid="730467549913588780">"Última actualización"</string>
<string name="message_updating" msgid="4457761393932375219">"Buscando actualizaciones"</string>
- <string name="message_loading" msgid="8689096636874758814">"Cargando..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Cargando…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Diccionario principal"</string>
<string name="cancel" msgid="6830980399865683324">"Cancelar"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Configuración"</string>
<string name="install_dict" msgid="180852772562189365">"Instalar"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Cancelar"</string>
<string name="delete_dict" msgid="756853268088330054">"Eliminar"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Hay un diccionario disponible para el idioma seleccionado en tu dispositivo móvil.&lt;br/&gt; Te recomendamos que &lt;b&gt;descargues&lt;/b&gt; el diccionario de <xliff:g id="LANGUAGE">%1$s</xliff:g> para mejorar tu experiencia de escritura.&lt;br/&gt; &lt;br/&gt; La descarga puede tardar unos minutos en redes 3G. Si no tienes un &lt;b&gt;plan de datos ilimitado&lt;/b&gt;, es posible que se apliquen cargos.&lt;br/&gt; Si no conoces las características de tu plan de datos, te recomendamos que uses una conexión Wi-Fi para iniciar la descarga automáticamente.&lt;br/&gt; &lt;br/&gt; Sugerencia: Puedes descargar y eliminar diccionarios en la sección &lt;b&gt;Teclado e idioma&lt;/b&gt; del menú &lt;b&gt;Configuración&lt;/b&gt; del dispositivo móvil."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Hay un diccionario disponible para el idioma seleccionado en tu dispositivo móvil.&lt;br/&gt; Te recomendamos que &lt;b&gt;descargues&lt;/b&gt; el diccionario de <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> para mejorar tu experiencia de escritura.&lt;br/&gt; &lt;br/&gt; La descarga puede tardar unos minutos en redes 3G. Si no tienes un &lt;b&gt;plan de datos ilimitado&lt;/b&gt;, es posible que se apliquen cargos.&lt;br/&gt; Si no sabes qué plan de datos tienes, te recomendamos que uses una conexión Wi-Fi para iniciar la descarga automáticamente.&lt;br/&gt; &lt;br/&gt; Sugerencia: Puedes descargar y eliminar diccionarios desde &lt;b&gt;Teclado e idioma&lt;/b&gt; en el menú &lt;b&gt;Configuración&lt;/b&gt; del dispositivo móvil."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Descargar ahora (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Descargar por Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Hay un diccionario disponible de <xliff:g id="LANGUAGE">%1$s</xliff:g>."</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Hay un diccionario disponible de <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>."</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Pulsar para opinar y descargar"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Descargando: las sugerencias de <xliff:g id="LANGUAGE">%1$s</xliff:g> estarán disponibles en breve."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"La descarga de sugerencias para <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> estará lista en breve."</string>
<string name="version_text" msgid="2715354215568469385">"Versión <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Agregar"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Agregar al diccionario"</string>
diff --git a/java/res/values-es/strings-config-important-notice.xml b/java/res/values-es/strings-config-important-notice.xml
new file mode 100644
index 000000000..6771265c5
--- /dev/null
+++ b/java/res/values-es/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Aprende de mensajes y datos escritos para mejorar sugerencias"</string>
+</resources>
diff --git a/java/res/values-es/strings-talkback-descriptions.xml b/java/res/values-es/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..72bb6f104
--- /dev/null
+++ b/java/res/values-es/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Conecta un auricular para escuchar las contraseñas en voz alta."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"El texto actual es %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"No se ha introducido texto"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corrige <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> a <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corregirá la palabra automáticamente"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Código del teclado: %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Mayús"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Mayúsculas activadas (tocar para inhabilitar)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Bloqueo de mayúsculas activado (tocar para inhabilitar)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Eliminar"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Símbolos"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Letras"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Números"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Ajustes"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Pestaña"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Espacio"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Entrada de voz"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emojis"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Intro"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Buscar"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Punto"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Cambiar idioma"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Siguiente"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Anterior"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Mayúsculas habilitadas"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Bloq Mayús habilitado"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Mayúsculas inhabilitadas"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modo de símbolos"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modo de letras"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modo de teléfono"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modo de símbolos de teléfono"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Teclado oculto"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Mostrando teclado de <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"fecha"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"fecha y hora"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"correo electrónico"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"mensajes"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"número"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"teléfono"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"texto"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"hora"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Recientes"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Personas"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objetos"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Naturaleza"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Sitios"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Símbolos"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticonos"</string>
+</resources>
diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index 39b45e0c4..3476ac5dd 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Predeterminado"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Sugerir contactos"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Utilizar nombres de contactos para sugerencias y correcciones"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Sugerencias personalizadas"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Punto y espacio"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Si tocas dos veces el espacio, se inserta un punto seguido de un espacio"</string>
<string name="auto_cap" msgid="1719746674854628252">"Mayúsculas automáticas"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Mostrar recorrido del 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">"Ver palabra sugerida al hacer gestos"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Conecta un auricular para escuchar las contraseñas en voz alta."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"El texto actual es %s."</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"No se ha introducido texto."</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"La tecla <xliff:g id="KEY">%1$s</xliff:g> corrige <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> a <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"La tecla <xliff:g id="KEY">%1$s</xliff:g> corrige automáticamente"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Código del teclado: %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Mayús"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Mayúsculas activadas (tocar para inhabilitar)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Bloqueo de mayúsculas activado (tocar para inhabilitar)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Eliminar"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Símbolos"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Letras"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Números"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Ajustes"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabulador"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Barra espaciadora"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Entrada de voz"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Emoticono"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Tecla Intro"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Buscar"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Punto"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Cambiar idioma"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Siguiente"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Anterior"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Mayúsculas habilitadas"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Bloqueo de mayúsculas habilitado"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Mayúsculas inhabilitadas"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Modo de símbolos"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Modo de letras"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Modo de teléfono"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Modo de símbolos de teléfono"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Teclado oculto"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Mostrando teclado <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"fecha"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"fecha y hora"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"correo electrónico"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"mensajes"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"número"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"teléfono"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"texto"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"hora"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Gestos con tecla Espacio"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Desliza el dedo a Espacio para introducir espacios durante gestos"</string>
<string name="voice_input" msgid="3583258583521397548">"Tecla de entrada de voz"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"En teclado principal"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"En teclado de símbolos"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"No"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Micrófono en teclado principal"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Micrófono en teclado de símbolos"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Entrada de voz inhabilitada"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Sin métodos de introducción de voz habilitados. Comprueba ajustes de Idioma e introducción de texto."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configurar métodos de entrada"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Idiomas"</string>
<string name="send_feedback" msgid="1780431884109392046">"Danos tu opinión"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"inglés (Reino Unido)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"inglés (EE.UU.)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Español (EE.UU.)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Inglés (Reino Unido) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Inglés (EE.UU.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Español (EE.UU.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradicional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Inglés (Reino Unido) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Inglés (EE.UU.) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Español (EE.UU.) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradicional)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cirílico)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latinoamérica)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Ningún idioma (alfabeto)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabeto (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabeto (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Leer archivo de diccionario externo"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"No hay archivos de diccionario en la carpeta de descargas."</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Selecciona un archivo de diccionario para instalar"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"¿Seguro que quieres instalar este archivo para <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"¿Seguro que quieres instalar este archivo para <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Se ha producido un error"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Generar diccionario de contactos"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Volcar diccionario personal"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Volcar diccionario historial usuario"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Volcar diccionario personalización"</string>
<string name="button_default" msgid="3988017840431881491">"Predeterminado"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Te damos la bienvenida a <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"con escritura gestual"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Actualizar"</string>
<string name="last_update" msgid="730467549913588780">"Última actualización"</string>
<string name="message_updating" msgid="4457761393932375219">"Buscando actualizaciones"</string>
- <string name="message_loading" msgid="8689096636874758814">"Cargando..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Cargando…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Diccionario principal"</string>
<string name="cancel" msgid="6830980399865683324">"Cancelar"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Ajustes"</string>
<string name="install_dict" msgid="180852772562189365">"Instalar"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Cancelar"</string>
<string name="delete_dict" msgid="756853268088330054">"Eliminar"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Hay un diccionario disponible para el idioma seleccionado en tu dispositivo móvil.&lt;br/&gt; Te recomendamos que &lt;b&gt;descargues&lt;/b&gt; el diccionario de <xliff:g id="LANGUAGE">%1$s</xliff:g> para mejorar tu experiencia de escritura.&lt;br/&gt; &lt;br/&gt; La descarga puede tardar unos minutos en redes 3G. Si no tienes un &lt;b&gt;plan de datos ilimitado&lt;/b&gt;, se pueden aplicar cargos.&lt;br/&gt; Si no conoces las características de tu plan de datos, te recomendamos que uses una conexión Wi-Fi para iniciar la descarga automáticamente.&lt;br/&gt; &lt;br/&gt; Sugerencia: puedes descargar y eliminar diccionarios en la sección &lt;b&gt;Idioma e introducción de texto&lt;/b&gt; del menú &lt;b&gt;Ajustes&lt;/b&gt; del dispositivo móvil."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Hay un diccionario disponible para el idioma seleccionado en tu dispositivo móvil.&lt;br/&gt; Te recomendamos que &lt;b&gt;descargues&lt;/b&gt; el diccionario de <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> para mejorar la experiencia de escritura.&lt;br/&gt; &lt;br/&gt; La descarga puede tardar unos minutos en redes 3G. Es posible que se apliquen cargos si no tienes un &lt;b&gt;plan de datos ilimitado&lt;/b&gt;.&lt;br/&gt; Si no sabes con certeza cuál es tu plan de datos, te recomendamos que te conectes a una red Wi-Fi para que la descarga empiece automáticamente.&lt;br/&gt; &lt;br/&gt; Consejo: Puedes descargar y eliminar diccionarios en la sección &lt;b&gt;Idioma e introducción de texto&lt;/b&gt; en el menú &lt;b&gt;Ajustes&lt;/b&gt; de tu dispositivo móvil."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Descargar ahora (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Descargar mediante Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Hay un diccionario disponible de <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Hay disponible un diccionario de <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Pulsa para comprobar y descargar"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Descargando: las sugerencias de <xliff:g id="LANGUAGE">%1$s</xliff:g> estarán disponibles en breve."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"La descarga de sugerencias para <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> estará disponible próximamente."</string>
<string name="version_text" msgid="2715354215568469385">"Versión <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Añadir"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Añadir al diccionario"</string>
diff --git a/java/res/values-et-rEE/strings-config-important-notice.xml b/java/res/values-et-rEE/strings-config-important-notice.xml
new file mode 100644
index 000000000..1c363d697
--- /dev/null
+++ b/java/res/values-et-rEE/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Kommunikats. ja sisestatud andmetest õppimine soovit. täiustamiseks"</string>
+</resources>
diff --git a/java/res/values-et-rEE/strings-talkback-descriptions.xml b/java/res/values-et-rEE/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..5a359c1a3
--- /dev/null
+++ b/java/res/values-et-rEE/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Parooliklahvide kuulamiseks ühendage peakomplekt."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Praegune tekst on %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Teksti ei ole sisestatud"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> parandab sõna <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> järgmiselt: <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> teeb automaatse paranduse"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Klahvi kood: %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Tõstuklahv"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Tõstuklahv sees (puudutage keelamiseks)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Suurtähelukk on sees (puudutage keelamiseks)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Kustutamine"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Sümbolid"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Tähed"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Numbrid"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Seaded"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tabulaator"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Tühik"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Häälsisend"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emotikon"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Tagasi"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Otsing"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Punkt"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Keele vahetamine"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Järgmine"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Eelmine"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Tõstuklahv on lubatud"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Suurtähelukk on lubatud"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Tõstuklahv on keelatud"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Sümbolite režiim"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Tähtede režiim"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefonirežiim"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefoni sümbolite režiim"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Klaviatuur on peidetud"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Näitab klaviatuuri režiimil <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"kuupäev"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"kuupäev ja kellaaeg"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-post"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"sõnumiside"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"number"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"tekst"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"aeg"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Hiljutised"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Inimesed"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objektid"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Loodus"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Kohad"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Sümbolid"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emotikonid"</string>
+</resources>
diff --git a/java/res/values-et-rEE/strings.xml b/java/res/values-et-rEE/strings.xml
index e0f992c0d..6fbc4b40c 100644
--- a/java/res/values-et-rEE/strings.xml
+++ b/java/res/values-et-rEE/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Süsteemi vaikeväärt."</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Soovita kontaktkirjeid"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Kasuta soovitusteks ja parandusteks nimesid kontaktiloendist"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Isikupärast. soovitused"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Punkt tühikuklahviga"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Tühikuklahvi kaks korda puudutades sisestatakse punkt ja tühik"</string>
<string name="auto_cap" msgid="1719746674854628252">"Automaatne suurtähtede kasutamine"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Näita liigutuse jälge"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dünaamiline ujuv eelvaade"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Soovitatud sõna vaatamine joonistusega sisestamise ajal"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : salvestatud"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Ühendage peakomplekt, et kuulata paroole."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Praegune tekst on %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Teksti ei ole sisestatud"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"Klahvi <xliff:g id="KEY">%1$s</xliff:g> vajutamisel parandatakse sõna <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> sõnaks <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"Klahvi <xliff:g id="KEY">%1$s</xliff:g> vajutamisel tehakse automaatne parandus"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Klahvi kood: %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Tõstuklahv"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Tõstuklahv sees (puudutage keelamiseks)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Suurtähelukk on sees (puudutage keelamiseks)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Kustuta"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Sümbolid"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Tähed"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Numbrid"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Seaded"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabulaator"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Tühik"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Kõnesisend"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Naerunägu"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Tagasi"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Otsing"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Punkt"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Keele vahetamine"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Järgmine"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Eelmine"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Tõstuklahv on lubatud"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Suurtähelukk on lubatud"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Tõstuklahv on keelatud"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Sümbolite režiim"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Tähtede režiim"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Telefonirežiim"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Telefoni sümbolite režiim"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Klaviatuur on peidetud"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Näitab klaviatuuri režiimil <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"kuupäev"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"kuupäev ja kellaaeg"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-post"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"sõnumiside"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"number"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"tekst"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"aeg"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Fraasi liigutus"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Sisestage liigutuste kasutamisel tühikuid, libistades tühikuklahvile"</string>
<string name="voice_input" msgid="3583258583521397548">"Häälesisendi klahv"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Peamisel klaviatuuril"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Sümbolite klaviatuuril"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Väljas"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikrofon peamisel klaviatuuril"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikr. sümb. klaviat."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Kõnesisend on keelatud"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Ühtegi häälsisendmeetodit pole lubatud. Kontrollige keele- ja sisendiseadeid."</string>
<string name="configure_input_method" msgid="373356270290742459">"Sisestusmeetodite seadistamine"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Sisestuskeeled"</string>
<string name="send_feedback" msgid="1780431884109392046">"Saatke tagasisidet"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Inglise (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Inglise (USA)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"hispaania (USA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Inglise (UK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Inglise (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"hispaania (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (traditsiooniline)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Inglise (Ühendk.) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Inglise (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Hispaania (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (traditsiooniline)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (kirillitsa)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ladina)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Keel puudub (tähestik)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Tähestik (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Tähestik (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Välise sõnastikufaili lugemine"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Kaustas Allalaadimised pole ühtegi sõnastikufaili"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Installitava sõnastikufaili valimine"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Kas soovite tõesti installida faili lokaadile <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Kas soovite tõesti installida faili <xliff:g id="LANGUAGE_NAME">%s</xliff:g> keele jaoks?"</string>
<string name="error" msgid="8940763624668513648">"Ilmnes viga"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Kontaktisõnastiku tõmmistamine"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Isikliku sõnastiku tõmmistamine"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Kasutaja ajaloo sõnastiku tõmmist."</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Isikupärast. sõnastiku tõmmistamine"</string>
<string name="button_default" msgid="3988017840431881491">"Vaikeväärtus"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Tere tulemast rakendusse <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"joonistusega sisestamisega"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Värskenda"</string>
<string name="last_update" msgid="730467549913588780">"Viimati värskendatud"</string>
<string name="message_updating" msgid="4457761393932375219">"Värskenduste otsimine"</string>
- <string name="message_loading" msgid="8689096636874758814">"Laadimine ..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Laadimine …"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Peamine sõnastik"</string>
<string name="cancel" msgid="6830980399865683324">"Tühista"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Seaded"</string>
<string name="install_dict" msgid="180852772562189365">"Installi"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Tühista"</string>
<string name="delete_dict" msgid="756853268088330054">"Kustuta"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Mobiilseadmes valitud keelele on saadaval sõnastik.&lt;br/&gt; Teksti mugavamaks sisestamiseks soovitame &lt;b&gt;alla laadida&lt;/b&gt; <xliff:g id="LANGUAGE">%1$s</xliff:g> keele sõnastiku.&lt;br/&gt; &lt;br/&gt; 3G kaudu allalaadimisele võib kuluda minut või paar. Kehtida võivad tasud, kui te ei kasuta &lt;b&gt;piiramatut andmepaketti&lt;/b&gt;.&lt;br/&gt; Kui te ei tea, millist andmepaketti kasutate, soovitame allalaadimise automaatseks käivitamiseks leida WiFi-ühenduse.&lt;br/&gt; &lt;br/&gt; Nõuanne: sõnastikke saate alla laadida ja eemaldada, tehes valiku &lt;b&gt;Keel ja sisestamine&lt;/b&gt; mobiilseadme menüüs &lt;b&gt;Seaded&lt;/b&gt;."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Mobiilseadmes valitud keelele on saadaval sõnastik.&lt;br/&gt; Teksti mugavamaks sisestamiseks soovitame <b>alla laadida</b> <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> keele sõnastiku.&lt;br/&gt; &lt;br/&gt; 3G kaudu allalaadimisele võib kuluda minut või paar. Kui te ei kasuta <b>piiramatut andmepaketti</b>, võivad rakenduda tasud.<br/> Kui te ei tea, millist andmepaketti kasutate, soovitame allalaadimise automaatseks käivitamiseks leida WiFi-ühenduse.&lt;br/&gt; &lt;br/&gt; Nõuanne: sõnastikke saate alla laadida ja eemaldada, tehes mobiilseadme menüüs <b>Seaded</b> valiku &lt;b&gt;Keel ja sisend&lt;/b&gt;."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Laadi kohe alla (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Laadi alla WiFi kaudu"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Sõnastik on <xliff:g id="LANGUAGE">%1$s</xliff:g> keele jaoks saadaval"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Sõnastik on saadaval <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> keeles"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Vajutage ülevaatamiseks ja allalaadimiseks"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Allalaadimine: <xliff:g id="LANGUAGE">%1$s</xliff:g> keele soovitused on varsti saadaval."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Allalaadimine: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> keele soovitused on peagi saadaval."</string>
<string name="version_text" msgid="2715354215568469385">"Versioon <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Lisa"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Sõnaraamatusse lisamine"</string>
diff --git a/java/res/values-fa-sw600dp/donottranslate-config-spacing-and-punctuations.xml b/java/res/values-fa-sw600dp/donottranslate-config-spacing-and-punctuations.xml
new file mode 100644
index 000000000..d7aca6fb4
--- /dev/null
+++ b/java/res/values-fa-sw600dp/donottranslate-config-spacing-and-punctuations.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- The all letters need to be mirrored are found at
+ http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
+ <!-- Symbols that are suggested between words -->
+ <!-- U+061F: "؟" ARABIC QUESTION MARK
+ U+061B: "؛" ARABIC SEMICOLON -->
+ <string name="suggested_punctuations">!,&#x061F;,:,&#x061B;,\",\',(|),)|(,-,/,@,_</string>
+</resources>
diff --git a/java/res/values-fa/donottranslate-config-spacing-and-punctuations.xml b/java/res/values-fa/donottranslate-config-spacing-and-punctuations.xml
new file mode 100644
index 000000000..21bb3318f
--- /dev/null
+++ b/java/res/values-fa/donottranslate-config-spacing-and-punctuations.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- The all letters need to be mirrored are found at
+ http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
+ <!-- Symbols that are suggested between words -->
+ <!-- U+061F: "؟" ARABIC QUESTION MARK
+ U+060C: "،" ARABIC COMMA
+ U+061B: "؛" ARABIC SEMICOLON -->
+ <string name="suggested_punctuations">!,&#x061F;,&#x060C;,:,&#x061B;,\",(|),)|(,\',-,/,@,_</string>
+</resources>
diff --git a/java/res/values-fa/strings-config-important-notice.xml b/java/res/values-fa/strings-config-important-notice.xml
new file mode 100644
index 000000000..22a50cd4a
--- /dev/null
+++ b/java/res/values-fa/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-fa/strings-talkback-descriptions.xml b/java/res/values-fa/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..26e99cb7b
--- /dev/null
+++ b/java/res/values-fa/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"برای شنیدن کلیدهای گذرواژه که با صدای بلند خوانده می‌شوند، از هدست استفاده کنید."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"‏نوشتار کنونی %s است"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"نوشتاری وارد نشده است"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g>، ‏<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> را به <xliff:g id="CORRECTED_WORD">%3$s</xliff:g> تصحیح می‌کند"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> تصحیح خودکار را انجام می‌دهد"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"‏کد کلید %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"‏Shift روشن است (برای غیرفعال کردن ضربه بزنید)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"‏Caps Lock روشن است (برای غیرفعال کردن ضربه بزنید)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"حذف"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"نمادها"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"حروف"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"اعداد"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"تنظیمات"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"فاصله"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"ورودی صدا"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"‏شکلک Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"بازگشت"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"جستجو"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"نقطه"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"تغییر زبان"</string>
+ <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">"‏Shift فعال شد"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"‏Caps lock فعال شد"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"‏Shift غیرفعال شد"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"حالت نمادها"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"حالت حروف"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"حالت تلفن"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"حالت نمادهای تلفن"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"صفحه‌کلید پنهان است"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"در حال نمایش صفحه‌کلید <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"تاریخ"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"تاریخ و زمان"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"ایمیل"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"پیام‌رسانی"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"عدد"</string>
+ <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="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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"طبیعت"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"مکان‌ها"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"نمادها"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"شکلک‌ها"</string>
+</resources>
diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml
index af886ef8c..04c6a5aca 100644
--- a/java/res/values-fa/strings.xml
+++ b/java/res/values-fa/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"پیش‌فرض سیستم"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"پیشنهاد نام‌های مخاطب"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"برای پیشنهاد و تصحیح از نام مخاطبین استفاده شود"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"پیشنهادات شخصی شده"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"نقطه با دو فاصله"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"با دوبار ضربه روی دکمه فاصله نقطه با یک فاصله بعد آن درج می‌شود"</string>
<string name="auto_cap" msgid="1719746674854628252">"بزرگ‌کردن خودکار حروف"</string>
@@ -73,60 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"نمایش نسخه آزمایشی حرکت"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"پیش‌نمایش متحرک پویا"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"مشاهده کلمه پیشنهادی در حین انجام حرکات"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : ذخیره شد"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"برای شنیدن کلیدهای گذرواژه که با صدای بلند خوانده می‌شوند، از هدست استفاده کنید."</string>
- <!-- String.format failed for translation -->
- <!-- no translation found for spoken_current_text_is (2485723011272583845) -->
- <skip />
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"متنی وارد نشده است"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g>، ‏<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> را به <xliff:g id="CORRECTED">%3$s</xliff:g> تصحیح می‌کند"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> تصحیح خودکار را انجام می‌دهد"</string>
- <!-- String.format failed for translation -->
- <!-- no translation found for spoken_description_unknown (3197434010402179157) -->
- <skip />
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"‏Shift فعال است (برای غیرفعال کردن ضربه بزنید)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"‏Caps Lock روشن است (برای غیرفعال کردن ضربه بزنید)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"نمادها"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"حروف"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"اعداد"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"تنظیمات"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"فاصله"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"ورودی صدا"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"صورت متبسم"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"جستجو"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"نقطه"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"تغییر زبان"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"بعدی"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"قبلی"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"‏Shift فعال است"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"‏Caps lock فعال شد"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"‏Shift غیرفعال است"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"حالت نمادها"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"حالت حروف"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"حالت تلفن"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"حالت نمادهای تلفن"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"صفحه کلید پنهان شد"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"نمایش صفحه کلید <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"تاریخ"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"تاریخ و زمان"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"ایمیل"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"پیام‌رسانی"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"عدد"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"تلفن"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"نوشتار"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"زمان"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"نشانی اینترنتی"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"‫ورود عبارت با حرکت اشاره‌ای"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"با سراندن انگشت به کلید فاصله در زمان اشاره‌ها، فاصله را وارد کنید"</string>
<string name="voice_input" msgid="3583258583521397548">"کلید ورودی صدا"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"در صفحه‌کلید اصلی"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"در صفحه‌کلید نمادها"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"خاموش"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"میکروفن در صفحه‌کلید اصلی"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"میکروفن در صفحه‌کلید نمادها"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"ورودی صدا غیرفعال است"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"هیچ روش ورودی صوتی فعال نشده است. تنظیمات زبان و ورودی را بررسی کنید."</string>
<string name="configure_input_method" msgid="373356270290742459">"پیکربندی روش‌های ورودی"</string>
<string name="language_selection_title" msgid="1651299598555326750">"زبان‌های ورودی"</string>
<string name="send_feedback" msgid="1780431884109392046">"ارسال بازخورد"</string>
@@ -139,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"انگلیسی (بریتانیا)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"انگلیسی (امریکا)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"اسپانیایی (آمریکا)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"انگلیسی (انگلستان) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"انگلیسی (ایالات متحده) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"اسپانیایی (آمریکا) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (سنتی)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"انگلیسی (بریتانیا) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"انگلیسی (آمریکا) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"اسپانیایی (آمریکا) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (سنتی)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (سیریلیک)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (لاتین)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"بدون زبان (حروف الفبا)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"‏حروف الفبا (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"‏حروف الفبا (QWERTZ)"</string>
@@ -172,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"خواندن فایل فرهنگ لغت خارجی"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"فایل فرهنگ لغتی در پوشه دانلودها وجود ندارد"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"یک فایل فرهنگ لغت برای نصب انتخاب کنید"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"این فایل واقعاً برای <xliff:g id="LOCALE_NAME">%s</xliff:g> نصب شود؟"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"این فایل واقعاً برای <xliff:g id="LANGUAGE_NAME">%s</xliff:g> نصب شود؟"</string>
<string name="error" msgid="8940763624668513648">"خطایی روی داد"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"ایجاد فهرست کلی واژه‌نامه مخاطبین"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"ایجاد فهرست کلی واژه‌نامه شخصی"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"ایجاد فهرست کلی واژه‌نامه سابقه کاربر"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"ایجاد فهرست کلی واژه‌نامه شخصی‌سازی"</string>
<string name="button_default" msgid="3988017840431881491">"پیش‌فرض"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"به <xliff:g id="APPLICATION_NAME">%s</xliff:g> خوش آمدید"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"با ورودی اشاره‌ای"</string>
@@ -211,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"بازخوانی"</string>
<string name="last_update" msgid="730467549913588780">"آخرین به‌روزرسانی"</string>
<string name="message_updating" msgid="4457761393932375219">"در حال بررسی به‌روزرسانی‌ها"</string>
- <string name="message_loading" msgid="8689096636874758814">"در حال بارگیری…"</string>
+ <string name="message_loading" msgid="5638680861387748936">"در حال بارگیری…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"فرهنگ‌ لغت اصلی"</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="delete_dict" msgid="756853268088330054">"حذف"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"‏برای زبان انتخاب شده در دستگاه همراه شما فرهنگ لغتی موجود است.&lt;br/&gt; توصیه می‌کنیم فرهنگ لغت <xliff:g id="LANGUAGE">%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="6514288591959117288">"یک فرهنگ لغت برای <xliff:g id="LANGUAGE">%1$s</xliff:g> موجود است"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"یک فرهنگ لغت برای <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> در دسترس است"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"برای مرور و دانلود فشار دهید"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"دانلود لغات پیشنهادی برای <xliff:g id="LANGUAGE">%1$s</xliff:g> به زودی شروع می‌شود."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"دانلود کردن پیشنهادات برای <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> به زودی شروع می‌شود."</string>
<string name="version_text" msgid="2715354215568469385">"نسخه <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"افرودن"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"افزودن به فرهنگ‌ لغت"</string>
diff --git a/java/res/values-fi/strings-config-important-notice.xml b/java/res/values-fi/strings-config-important-notice.xml
new file mode 100644
index 000000000..ad064c0a7
--- /dev/null
+++ b/java/res/values-fi/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Ehdotusten parannus viestinnän ja kirjoitettujen tietojen avulla"</string>
+</resources>
diff --git a/java/res/values-fi/strings-talkback-descriptions.xml b/java/res/values-fi/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..2d0d7a782
--- /dev/null
+++ b/java/res/values-fi/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Liitä kuulokkeet, niin kuulet mitä näppäimiä painat kirjoittaessasi salasanaa."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Nykyinen teksti on %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Ei kirjoitettua tekstiä"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> korjaa sanan <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> sanaksi <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> suorittaa automaattisen korjauksen"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Näppäimen koodi %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Vaihto"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Vaihto päällä (poista käytöstä napauttamalla)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps Lock päällä (poista käytöstä napauttamalla)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Delete"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symbolit"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Kirjaimet"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Numerot"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Asetukset"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Sarkain"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Välilyönti"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Äänisyöte"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Haku"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Piste"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Vaihda kieli"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Seuraava"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Edellinen"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Vaihto päällä"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock päällä"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Vaihto pois päältä"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbolit-tila"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Näppäimistötila"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Puhelintila"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Puhelinsymbolit-tila"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Näppäimistö on piilotettu"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Näytetään näppäimistö <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"päivämäärä"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"päivämäärä ja aika"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"sähköposti"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"viestit"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"numero"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"puhelin"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"teksti"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"aika"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL-osoite"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Viimeisimmät"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Ihmiset"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Esineet"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Luonto"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Paikat"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symbolit"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Hymiöt"</string>
+</resources>
diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml
index a58bfac3e..756684ae0 100644
--- a/java/res/values-fi/strings.xml
+++ b/java/res/values-fi/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Järjestelmän oletusarvo"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Ehdota yht.tietojen nimiä"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Käytä yhteystietojen nimiä ehdotuksissa ja korjauksissa"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Räätälöidyt ehdotukset"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Kaksoisvälilyönti = piste"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Välilyönnin kaksoisnapautus lisää tekstiin pisteen ja välilyönnin"</string>
<string name="auto_cap" msgid="1719746674854628252">"Automaattiset isot kirjaimet"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Näytä eleen jälki"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynaaminen kelluva esikatselu"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Näytä ehdotettu sana piirron aikana"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: tallennettu"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Liitä kuulokkeet, niin kuulet mitä näppäimiä painat kirjoittaessasi salasanaa."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Nykyinen teksti on %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Ei kirjoitettua tekstiä"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> korjaa sanan <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> sanaksi <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> suorittaa automaattisen korjauksen"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Näppäimen koodi %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Vaihto"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Vaihto päällä (poista käytöstä napauttamalla)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock päällä (poista käytöstä napauttamalla)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Poista"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symbolit"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Kirjaimet"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Numerot"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Asetukset"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Sarkain"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Välilyönti"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Äänisyöte"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Hymiö"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Takaisin"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Haku"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Piste"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Vaihda kieli"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Seuraava"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Edellinen"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Vaihto päällä"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps Lock päällä"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Vaihto pois käytöstä"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Symbolit-tila"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Näppäimistötila"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Puhelintila"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Puhelinsymbolit-tila"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Näppäimistö on piilotettu"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Näytetään <xliff:g id="MODE">%s</xliff:g>-näppäimistö"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"päivämäärä"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"päivämäärä ja aika"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"sähköposti"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"viestit"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"numero"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"puhelin"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"teksti"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"aika"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL-osoite"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Ilmausele"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Lisää välilyöntejä eleiden aikana liukumalla välilyöntinäppäim."</string>
<string name="voice_input" msgid="3583258583521397548">"Äänisyöteavain"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Päänäppäimistössä"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Symbolinäppäim."</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Ei käytössä"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikr. päänäppäim."</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikr. symbolinäpp."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Äänisyöte ei käyt."</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Äänen syöttötapoja ei ole otettu käyttöön. Tarkista Kieli ja syöttötapa -asetukset."</string>
<string name="configure_input_method" msgid="373356270290742459">"Määritä syöttötavat"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Syöttökielet"</string>
<string name="send_feedback" msgid="1780431884109392046">"Lähetä palautetta"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"englanti (Iso-Britannia)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"englanti (Yhdysvallat)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"espanja (Yhdysvallat)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"englanti (Iso-Br.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"englanti (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"espanja (Yhdysvallat) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (perinteinen)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"englanti (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"englanti (US) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"espanja (US) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (perinteinen)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (kyrillinen)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latinalainen)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Ei kieltä (aakkoset)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Aakkoset (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Aakkoset (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Lue ulkoista sanakirjatiedostoa"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Lataukset-kansiossa ei ole sanakirjatiedostoja"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Valitse asennettava sanakirjatiedosto"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Haluatko asentaa tämä tiedoston kielelle <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Haluatko asentaa tämän tiedoston kielelle <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Tapahtui virhe"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Vedosta yhteystietosanakirja"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Vedosta oma sanakirja"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Vedosta käyttäjähistorian sanakirja"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Vedosta muokkaussanakirja"</string>
<string name="button_default" msgid="3988017840431881491">"Oletusarvot"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Tervetuloa käyttämään sovellusta <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"ja piirtokirjoitus"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Päivitä"</string>
<string name="last_update" msgid="730467549913588780">"Päivitetty viimeksi"</string>
<string name="message_updating" msgid="4457761393932375219">"Tarkistetaan päivityksiä"</string>
- <string name="message_loading" msgid="8689096636874758814">"Ladataan…"</string>
+ <string name="message_loading" msgid="5638680861387748936">"Ladataan…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Pääsanakirja"</string>
<string name="cancel" msgid="6830980399865683324">"Peruuta"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Asetukset"</string>
<string name="install_dict" msgid="180852772562189365">"Asenna"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Peruuta"</string>
<string name="delete_dict" msgid="756853268088330054">"Poista"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Laitteesi käyttökielelle on saatavilla sanakirja.&lt;br/&gt; Suosittelemme <xliff:g id="LANGUAGE">%1$s</xliff:g>-sanakirjan &lt;b&gt;lataamista&lt;/b&gt;, sillä se helpottaa laitteella kirjoittamista.&lt;br/&gt; &lt;br/&gt; Lataus kestää useimmiten muutaman minuutin 3G-yhteydellä. Latauksesta saatetaan periä maksu, ellei käytössäsi ole &lt;b&gt;rajoittamatonta tiedonsiirtopakettia&lt;/b&gt;.&lt;br/&gt; Jos et ole varma tiedonsiirtosopimuksesi tyypistä, etsi käyttöösi wifi-yhteys, niin lataus alkaa automaattisesti.&lt;br/&gt; &lt;br/&gt; Vinkki: voit ladata ja poistaa sanakirjoja mobiililaitteesi &lt;b&gt;Asetukset&lt;/b&gt;-valikon &lt;b&gt;Kieli ja syöttötapa&lt;/b&gt; -osiossa."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Laitteesi käyttökielelle on saatavilla sanakirja.&lt;br/&gt; Suosittelemme <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>-sanakirjan &lt;b&gt;lataamista&lt;/b&gt;, sillä se helpottaa laitteella kirjoittamista.&lt;br/&gt; &lt;br/&gt; Lataus kestää useimmiten muutaman minuutin 3G-yhteydellä. Latauksesta saatetaan periä maksu, ellei käytössäsi ole &lt;b&gt;rajoittamatonta tiedonsiirtopakettia&lt;/b&gt;.&lt;br/&gt; Jos et ole varma tiedonsiirtosopimuksesi tyypistä, etsi käyttöösi wifi-yhteys, niin lataus alkaa automaattisesti.&lt;br/&gt; &lt;br/&gt; Vinkki: voit ladata ja poistaa sanakirjoja mobiililaitteesi &lt;b&gt;Asetukset&lt;/b&gt;-valikon &lt;b&gt;Kieli ja syöttötapa&lt;/b&gt; -osiossa."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Lataa nyt (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> Mt)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Lataa wifi-yhteydellä"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Kielen <xliff:g id="LANGUAGE">%1$s</xliff:g> sanakirja on saatavilla"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Sanakirja on saatavilla kielelle <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Paina tätä, jos haluat tarkastella kohdetta ja ladata sen"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Ladataan: ehdotuksia näytetään pian kielellä <xliff:g id="LANGUAGE">%1$s</xliff:g>."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Ladataan: kielen <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> ehdotukset ovat pian käytettävissä."</string>
<string name="version_text" msgid="2715354215568469385">"Versio <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Lisää"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Lisää sanakirjaan"</string>
diff --git a/java/res/values-fr-rCA/donottranslate.xml b/java/res/values-fr-rCA/donottranslate-config-spacing-and-punctuations.xml
index 21f18d852..e4c30c4d7 100644
--- a/java/res/values-fr-rCA/donottranslate.xml
+++ b/java/res/values-fr-rCA/donottranslate-config-spacing-and-punctuations.xml
@@ -25,7 +25,7 @@
<string name="symbols_followed_by_space">.,;:!?)]}&amp;</string>
<!-- Symbols that separate words -->
<!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
- <string name="symbols_word_separators">"&#x0009;&#x0020;\n"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
+ <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
<!-- Word connectors -->
<string name="symbols_word_connectors">\'-</string>
</resources>
diff --git a/java/res/values-fr-rCA/strings-config-important-notice.xml b/java/res/values-fr-rCA/strings-config-important-notice.xml
new file mode 100644
index 000000000..2247ec6cc
--- /dev/null
+++ b/java/res/values-fr-rCA/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Apprendre de vos communic. et données entrées pour amél. suggestions"</string>
+</resources>
diff --git a/java/res/values-fr-rCA/strings-talkback-descriptions.xml b/java/res/values-fr-rCA/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..b632edca3
--- /dev/null
+++ b/java/res/values-fr-rCA/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Branchez des écouteurs pour entendre l\'énoncé à haute voix des touches lors de l\'entrée du mot de passe."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Le texte actuel est %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Aucun texte entré"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"La touche <xliff:g id="KEY_NAME">%1$s</xliff:g> permet de remplacer <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> par <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"La touche <xliff:g id="KEY_NAME">%1$s</xliff:g> permet d\'effectuer une correction automatique"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Code touche %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Majuscule"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Touche Majuscule activée (toucher pour désactiver)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Verrouillage des majuscules activé (toucher pour désactiver)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Supprimer"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symboles"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Lettres"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Chiffres"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Paramètres"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tabulation"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Espace"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Entrée vocale"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Retour"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Recherche"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Point"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Changer de langue"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Suivante"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Précédente"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Touche Maj activée"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Verrouillage des majuscules activé"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Touche Majuscule désactivée"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Mode Symboles"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Mode Lettres"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Mode Téléphone"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Mode Symboles du téléphone"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Clavier masqué"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Affichage du clavier <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"date"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"date et heure"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"courriel"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"messagerie"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"numérique"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"téléphone"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"texte"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"heure"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Récents"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Personnes"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objets"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Nature"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Lieux"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symboles"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Émoticônes"</string>
+</resources>
diff --git a/java/res/values-fr-rCA/strings.xml b/java/res/values-fr-rCA/strings.xml
index 2551ce9f8..5b1308166 100644
--- a/java/res/values-fr-rCA/strings.xml
+++ b/java/res/values-fr-rCA/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Paramètres par défaut"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Proposer noms de contacts"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Utiliser des noms de contacts pour les suggestions et corrections"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Suggestions personnalisées"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Point et espace"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Appuyez deux fois sur la barre d\'espace pour insérer un point et une espace"</string>
<string name="auto_cap" msgid="1719746674854628252">"Majuscules automatiques"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Afficher le tracé du geste"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Aperçu flottant dynamique"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Afficher le mot suggéré lors des gestes"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : enregistré"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Branchez des écouteurs pour entendre l\'énoncé à haute voix des touches lors de la saisie du mot de passe."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Le texte actuel est %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Aucun texte saisi"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"La touche <xliff:g id="KEY">%1$s</xliff:g> permet de corriger « <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> » par « <xliff:g id="CORRECTED">%3$s</xliff:g> »"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"La touche <xliff:g id="KEY">%1$s</xliff:g> permet d\'activer la correction automatique"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Code touche %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Maj"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Touche Maj activée (appuyer pour désactiver)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Verrouillage des majuscules activé (appuyer pour désactiver)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Supprimer"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symboles"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Lettres"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Nombres"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Paramètres"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Onglet"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Espace"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Saisie vocale"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Émoticône"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Renvoyer"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Rechercher"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Point"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Changer de langue"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Suivant"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Précédent"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Touche Maj activée"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Verrouillage des majuscules activé"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Touche Maj désactivée"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Mode Symboles"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Mode Lettres"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Mode Téléphone"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Mode Symboles du téléphone"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Clavier masqué"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Affichage du clavier <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"Date"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"Date et heure"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"Courriel"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"SMS/MMS"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"Nombre"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"Numéro de téléphone"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"Texte"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"Heure"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Geste multiterme"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Insérer une espace avec barre d\'espace lors de l\'entrée gestuelle"</string>
<string name="voice_input" msgid="3583258583521397548">"Touche de saisie vocale"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Sur le clavier principal"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Sur clavier symboles"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Désactiver"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Micro sur le clavier principal"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Micro sur le clavier des symboles"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Saisie vocale désactivée"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Aucun mode d\'entrée vocale n\'a été activé. Vérifiez les paramètres de langues et d\'entrée de texte."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configurer les modes de saisie"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Langues de saisie"</string>
<string name="send_feedback" msgid="1780431884109392046">"Envoyer des commentaires"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Anglais (britannique)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Anglais (États-Unis)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Espagnol (États-Unis)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Anglais (Royaume-Uni) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Anglais (États-Unis) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Espagnol, États-Unis (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (traditionnel)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"anglais (Royaume-Uni) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"anglais (États-Unis) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"espagnol (États-Unis) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (traditionnel)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cyrillique)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Aucune langue (alphabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alphabet latin (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alphabet latin (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Lire un fichier de dictionnaire externe"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Aucun fichier de dictionnaire dans le dossier \"Téléchargements\""</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Sélectionner un fichier de dictionnaire à installer"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Installer ce fichier pour la langue \"<xliff:g id="LOCALE_NAME">%s</xliff:g>\" ?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Installer ce fichier pour la langue « <xliff:g id="LANGUAGE_NAME">%s</xliff:g> »?"</string>
<string name="error" msgid="8940763624668513648">"Une erreur s\'est produite"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Extraire dictionnaire des contacts"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Vider le dictionnaire personnel"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Vider dictionnaire hist. utilisateur"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Vider dictionnaire personnalisation"</string>
<string name="button_default" msgid="3988017840431881491">"Par défaut"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Bienvenue dans <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"avec la saisie gestuelle"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Actualiser"</string>
<string name="last_update" msgid="730467549913588780">"Dernière mise à jour"</string>
<string name="message_updating" msgid="4457761393932375219">"Recherche de mises à jour en cours…"</string>
- <string name="message_loading" msgid="8689096636874758814">"Chargement en cours..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Chargement en cours…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Dictionnaire principal"</string>
<string name="cancel" msgid="6830980399865683324">"Annuler"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Paramètres"</string>
<string name="install_dict" msgid="180852772562189365">"Installer"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Annuler"</string>
<string name="delete_dict" msgid="756853268088330054">"Supprimer"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Un dictionnaire est disponible pour la langue sélectionnée sur votre appareil mobile.&lt;br/&gt; Nous vous invitons à &lt;b&gt;télécharger&lt;/b&gt; le dictionnaire <xliff:g id="LANGUAGE">%1$s</xliff:g> pour faciliter votre saisie.&lt;br/&gt; &lt;br/&gt; Le téléchargement peut prendre une à deux minutes via une connexion 3G. Des frais peuvent s\'appliquer si vous ne disposez pas d\'un &lt;b&gt;forfait Internet illimité&lt;/b&gt;.&lt;br/&gt; Si vous n\'êtes pas sûr de votre forfait, nous vous conseillons d\'utiliser une connexion Wi-Fi pour lancer automatiquement le téléchargement.&lt;br/&gt; &lt;br/&gt; Astuce : Vous pouvez télécharger et supprimer des dictionnaires dans la section &lt;b&gt;Langue et saisie&lt;/b&gt; du menu &lt;b&gt;Paramètres&lt;/b&gt; de votre appareil mobile."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Un dictionnaire est offert pour la langue sélectionnée sur votre appareil mobile.&lt;br/&gt; Nous vous invitons à &lt;b&gt;télécharger&lt;/b&gt; le dictionnaire pour la langue <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> pour faciliter votre réaction de texte.&lt;br/&gt; &lt;br/&gt; Le téléchargement peut prendre une à deux minutes par connexion 3G. Des frais peuvent s\'appliquer si vous ne disposez pas d\'un &lt;b&gt;forfait Internet illimité&lt;/b&gt;.&lt;br/&gt; Si vous n\'êtes pas sûr de votre forfait, nous vous conseillons d\'utiliser une connexion Wi-Fi pour lancer automatiquement le téléchargement.&lt;br/&gt; &lt;br/&gt; Astuce : Vous pouvez télécharger et supprimer des dictionnaires dans la section &lt;b&gt;Langue et entrée&lt;/b&gt; du menu &lt;b&gt;Paramètres&lt;/b&gt; de votre appareil mobile."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Télécharger (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> Mo)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Télécharger via Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Un dictionnaire est disponible en <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Un dictionnaire est offert pour la langue suivante : <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Appuyez ici pour consulter et télécharger le dictionnaire."</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"En cours de téléchargement. Des suggestions pour la langue suivante seront bientôt disponibles : <xliff:g id="LANGUAGE">%1$s</xliff:g>."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Téléchargement en cours… Les suggestions seront bientôt offertes pour la langue suivante : <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>."</string>
<string name="version_text" msgid="2715354215568469385">"Version <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Ajouter"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Ajouter au dictionnaire"</string>
diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml
index f0644118a..d72f72b92 100644
--- a/java/res/values-fr/donottranslate.xml
+++ b/java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml
@@ -24,7 +24,7 @@
<string name="symbols_followed_by_space">.,;:!?)]}&amp;</string>
<!-- Symbols that separate words -->
<!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
- <string name="symbols_word_separators">"&#x0009;&#x0020;\n"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
+ <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
<!-- Word connectors -->
<string name="symbols_word_connectors">\'-</string>
</resources>
diff --git a/java/res/values-fr/strings-config-important-notice.xml b/java/res/values-fr/strings-config-important-notice.xml
new file mode 100644
index 000000000..82bdcf5b0
--- /dev/null
+++ b/java/res/values-fr/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Améliorer suggestions en fonction des messages et données saisies"</string>
+</resources>
diff --git a/java/res/values-fr/strings-talkback-descriptions.xml b/java/res/values-fr/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..efa140b49
--- /dev/null
+++ b/java/res/values-fr/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Branchez des écouteurs pour entendre l\'énoncé à haute voix des touches lors de la saisie du mot de passe."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Le texte actuel est \"%s\"."</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Aucun texte saisi"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"La touche <xliff:g id="KEY_NAME">%1$s</xliff:g> permet de remplacer \"<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>\" par \"<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>\"."</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"La touche <xliff:g id="KEY_NAME">%1$s</xliff:g> permet d\'effectuer une correction automatique."</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Code touche %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Maj"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Touche Maj activée (appuyer pour désactiver)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Verrouillage des majuscules activé (appuyer pour désactiver)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Supprimer"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symboles"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Lettres"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Chiffres"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Paramètres"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tabulation"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Espace"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Saisie vocale"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Entrée"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Recherche"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Point"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Changer de langue"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Suivant"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Précédent"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"La touche Maj a bien été activée."</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Le verrouillage des majuscules a bien été activé."</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"La touche Maj a bien été désactivée."</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Mode Symboles"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Mode Lettres"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Mode Téléphone"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Mode Symboles du téléphone"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Clavier masqué"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Affichage du clavier <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"Date"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"Date et heure"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"Adresse e-mail"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"SMS/MMS"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"Chiffre"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"Numéro de téléphone"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"Texte"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"Heure"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Récents"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Personnes"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objets"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Nature"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Lieux"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symboles"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Émoticônes"</string>
+</resources>
diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index b877db014..1bb856783 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Paramètres par défaut"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Proposer noms de contacts"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Utiliser des noms de contacts pour les suggestions et corrections"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Suggestions personnalisées"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Point et espace"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Appuyez deux fois sur la barre d\'espace pour insérer un point et un espace."</string>
<string name="auto_cap" msgid="1719746674854628252">"Majuscules auto"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Afficher le tracé du geste"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Aperçu flottant dynamique"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Afficher le mot suggéré lors des gestes"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : enregistré"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Branchez des écouteurs pour entendre l\'énoncé à haute voix des touches lors de la saisie du mot de passe."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Le texte actuel est %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Aucun texte saisi"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"La touche <xliff:g id="KEY">%1$s</xliff:g> permet de remplacer \"<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>\" par \"<xliff:g id="CORRECTED">%3$s</xliff:g>\"."</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"La touche <xliff:g id="KEY">%1$s</xliff:g> permet d\'activer la correction automatique."</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Code touche %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Maj"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Touche Maj activée (appuyer pour désactiver)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Verrouillage des majuscules activé (appuyer pour désactiver)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Supprimer"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symboles"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Lettres"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Chiffres"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Paramètres"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabulation"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Espace"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Saisie vocale"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Émoticône"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Entrée"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Rechercher"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Point"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Changer de langue"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Touche suivante"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Touche précédente"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Touche Maj activée"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Verrouillage des majuscules activé"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Touche Maj désactivée"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Mode Symboles"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Mode Lettres"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Mode Téléphone"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Mode Symboles du téléphone"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Clavier masqué"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Affichage du clavier <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"Date"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"Date et heure"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"Adresse e-mail"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"SMS/MMS"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"Chiffre"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"Numéro de téléphone"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"Texte"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"Heure"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Geste multiterme"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Insérer un espace avec barre d\'espace lors de la saisie gestuelle"</string>
<string name="voice_input" msgid="3583258583521397548">"Touche de saisie vocale"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Sur clavier principal"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Sur clavier symboles"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Désactiver"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Micro sur le clavier principal"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Micro sur clavier symboles"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Saisie vocale désactivée"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Aucun mode de saisie vocale activé. Vérifiez les paramètres de langue et de saisie."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configurer les modes de saisie"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Langues de saisie"</string>
<string name="send_feedback" msgid="1780431884109392046">"Envoyer des commentaires"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Anglais (Royaume-Uni)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Anglais (États-Unis)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Espagnol (États-Unis)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Anglais (Royaume-Uni) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Anglais (États-Unis) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Espagnol (États-Unis) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (traditionnel)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"anglais (Royaume-Uni) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"anglais (États-Unis) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"espagnol (États-Unis) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (traditionnel)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cyrillique)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Aucune langue (latin)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alphabet latin (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alphabet latin (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Lire un fichier de dictionnaire externe"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Aucun fichier de dictionnaire dans le dossier \"Téléchargements\""</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Sélectionner un fichier de dictionnaire à installer"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Installer ce fichier pour la langue \"<xliff:g id="LOCALE_NAME">%s</xliff:g>\" ?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Installer ce fichier pour la langue \"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>\" ?"</string>
<string name="error" msgid="8940763624668513648">"Une erreur s\'est produite"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Extraire dictionnaire des contacts"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Extraire le dictionnaire personnel"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Extraire dict. de l\'histor. util."</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Extraire dict. de personnalisation"</string>
<string name="button_default" msgid="3988017840431881491">"Par défaut"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Bienvenue dans <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"avec la saisie gestuelle"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Actualiser"</string>
<string name="last_update" msgid="730467549913588780">"Dernière mise à jour"</string>
<string name="message_updating" msgid="4457761393932375219">"Recherche de mises à jour en cours…"</string>
- <string name="message_loading" msgid="8689096636874758814">"Chargement en cours..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Chargement en cours…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Dictionnaire principal"</string>
<string name="cancel" msgid="6830980399865683324">"Annuler"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Paramètres"</string>
<string name="install_dict" msgid="180852772562189365">"Installer"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Annuler"</string>
<string name="delete_dict" msgid="756853268088330054">"Supprimer"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Un dictionnaire est disponible pour la langue sélectionnée sur votre appareil mobile.&lt;br/&gt; Nous vous invitons à &lt;b&gt;télécharger&lt;/b&gt; le dictionnaire <xliff:g id="LANGUAGE">%1$s</xliff:g> pour faciliter votre saisie.&lt;br/&gt; &lt;br/&gt; Le téléchargement peut prendre une à deux minutes via une connexion 3G. Des frais peuvent s\'appliquer si vous ne disposez pas d\'un &lt;b&gt;forfait Internet illimité&lt;/b&gt;.&lt;br/&gt; Si vous n\'êtes pas sûr de votre forfait, nous vous conseillons d\'utiliser une connexion Wi-Fi pour lancer automatiquement le téléchargement.&lt;br/&gt; &lt;br/&gt; Astuce : Vous pouvez télécharger et supprimer des dictionnaires dans la section &lt;b&gt;Langue et saisie&lt;/b&gt; du menu &lt;b&gt;Paramètres&lt;/b&gt; de votre appareil mobile."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Un dictionnaire est disponible pour la langue sélectionnée sur votre appareil mobile.&lt;br/&gt; Nous vous invitons à &lt;b&gt;télécharger&lt;/b&gt; le dictionnaire pour cette langue : <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>. Cela facilitera votre saisie.&lt;br/&gt; &lt;br/&gt; Le téléchargement peut prendre une à deux minutes via une connexion 3G. Des frais peuvent s\'appliquer si vous n\'avez pas un &lt;b&gt;forfait Internet illimité&lt;/b&gt;.&lt;br/&gt; Si vous avez un doute concernant le type de forfait dont vous disposez, nous vous conseillons d\'utiliser le Wi-Fi pour lancer automatiquement le téléchargement.&lt;br/&gt; &lt;br/&gt; Astuce : Vous pouvez télécharger et supprimer des dictionnaires sous &lt;b&gt;Langue et saisie&lt;/b&gt;, dans le menu &lt;b&gt;Paramètres&lt;/b&gt; de votre appareil mobile."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Télécharger (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> Mo)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Télécharger via Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Un dictionnaire est disponible en <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Un dictionnaire est disponible pour la langue suivante : <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>."</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Appuyez ici pour consulter et télécharger le dictionnaire."</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"En cours de téléchargement. Des suggestions pour la langue suivante seront bientôt disponibles : <xliff:g id="LANGUAGE">%1$s</xliff:g>."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Téléchargement en cours… Les suggestions seront bientôt disponibles pour la langue suivante : <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>."</string>
<string name="version_text" msgid="2715354215568469385">"Version <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Ajouter"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Ajouter au dictionnaire"</string>
diff --git a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
index bc7928d6a..adc3e35a9 100644
--- a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
+++ b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">38sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
diff --git a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
index aebf6d2f3..1ff43ff9f 100644
--- a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
+++ b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">22sp</dimen>
<dimen name="setup_step_bullet_text_size">22sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">20sp</dimen>
<dimen name="setup_step_instruction_text_size">16sp</dimen>
<dimen name="setup_step_action_text_size">18sp</dimen>
diff --git a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
index aedf79fb2..a0e30cd37 100644
--- a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
+++ b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">32sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
diff --git a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
index 6d66f46eb..cf2a10a9e 100644
--- a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
+++ b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">26sp</dimen>
<dimen name="setup_step_bullet_text_size">22sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">20sp</dimen>
<dimen name="setup_step_instruction_text_size">16sp</dimen>
<dimen name="setup_step_action_text_size">18sp</dimen>
diff --git a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
index e22b741fb..a782ef8f4 100644
--- a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
+++ b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">38sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
diff --git a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
index 86cf3a04a..9ac0f115f 100644
--- a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
+++ b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">36sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
diff --git a/java/res/values-hi/strings-config-important-notice.xml b/java/res/values-hi/strings-config-important-notice.xml
new file mode 100644
index 000000000..3f22541eb
--- /dev/null
+++ b/java/res/values-hi/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-hi/strings-talkback-descriptions.xml b/java/res/values-hi/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..df9511905
--- /dev/null
+++ b/java/res/values-hi/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"जोर से बोली जाने वाली पासवर्ड कुंजियां सुनने के लिए हैडसेट प्‍लग करें."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"वर्तमान पाठ %s है"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"कोई पाठ नहीं डाला गया"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> को सुधार कर <xliff:g id="CORRECTED_WORD">%3$s</xliff:g> करता है"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> स्वत: सुधार करता है"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"कुंजी कोड %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"शिफ़्ट"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"शिफ़्ट चालू (अक्षम करने के लिए टैप करें)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"कैप्स लॉक चालू (अक्षम करने के लिए टैप करें)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"डिलीट"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"प्रतीक"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"अक्षर"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"संख्‍याएं"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"सेटिंग"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"टैब"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"स्पेस"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"ध्‍वनि इनपुट"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"ईमोजी"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"रिटर्न"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"खोजें"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"डॉट"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"भाषा स्विच करें"</string>
+ <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_off" msgid="5039126122829961331">"शिफ़्ट अक्षम किया गया"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"प्रतीक मोड"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"अक्षर मोड"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"फ़ोन मोड"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"फ़ोन प्रतीक मोड"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"कीबोर्ड छिपा हुआ है"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"<xliff:g id="KEYBOARD_MODE">%s</xliff:g> कीबोर्ड दिखाया जा रहा है"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"दिनांक"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"दिनांक और समय"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"ईमेल"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"संदेश सेवा"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"संख्या"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"प्रकृति"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"स्थान"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"प्रतीक"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"इमोटिकॉन्स"</string>
+</resources>
diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml
index d7735433d..3129d86cc 100644
--- a/java/res/values-hi/strings.xml
+++ b/java/res/values-hi/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"सिस्टम डिफ़ॉल्ट"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"संपर्क नाम सुझाएं"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"सुझाव और सुधार के लिए संपर्क से नामों का उपयोग करें"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"वैयक्तिकृत सुझाव"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"दोहरे स्पेस वाला पीरियड"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"स्पेसबार पर डबल टैप करने से पीरियड शामिल हो जाता है जिसके बाद एक रिक्ति होती है"</string>
<string name="auto_cap" msgid="1719746674854628252">"स्‍वत: अक्षर बड़े करना"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"जेस्चर ट्रेल दिखाएं"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"गतिशील फ़्लोटिंग पूर्वावलोकन"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"जेस्‍चर बनाते समय सुझाया गया शब्द देखें"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: सहेजा गया"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"ज़ोर से बोली गई पासवर्ड कुंजियां सुनने के लिए हेडसेट प्‍लग इन करें."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"वर्तमान पाठ %s है"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"कोई पाठ दर्ज नहीं किया गया"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> को सुधार कर <xliff:g id="CORRECTED">%3$s</xliff:g> करता है"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> स्वत: सुधार करता है"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"कुंजी कोड %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"शिफ़्ट"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift चालू (अक्षम करने के लिए टैप करें)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock चालू (अक्षम करने के लिए टैप करें)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"डिलीट"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"प्रतीक"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"अक्षर"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"संख्‍याएं"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"सेटिंग"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"टैब"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"स्पेस"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"ध्‍वनि इनपुट"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"मुस्कुराता चेहरा"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"रिटर्न"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"खोजें"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"बिंदु"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"भाषा स्विच करें"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"अगला"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"पिछला"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift सक्षम किया गया"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock सक्षम किया गया"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift अक्षम किया गया"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"प्रतीक मोड"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"अक्षर मोड"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"फ़ोन मोड"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"फ़ोन प्रतीक मोड"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"कीबोर्ड छिपा हुआ है"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"<xliff:g id="MODE">%s</xliff:g> कीबोर्ड दिखाया जा रहा है"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"दिनांक"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"दिनांक और समय"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"ईमेल"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"संदेश सेवा"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"संख्या"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"फ़ोन"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"पाठ"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"समय"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"वाक्यांश जेस्चर"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"स्पेस कुंजी तक ग्लाइड करके जेस्चर के दौरान रिक्तियां इनपुट करें"</string>
<string name="voice_input" msgid="3583258583521397548">"ध्‍वनि‍ इनपुट कुंजी"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"मुख्‍य कीबोर्ड पर"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"प्रतीक कीबोर्ड पर"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"बंद"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"मुख्‍य कीबोर्ड पर माइक"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"प्रतीक कीबोर्ड पर माइक"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"ध्‍वनि इनपुट अक्षम है"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"कोई ध्वनि इनपुट पद्धति सक्षम नहीं है. भाषा और इनपुट सेटिंग जांचें."</string>
<string name="configure_input_method" msgid="373356270290742459">"इनपुट पद्धति कॉन्‍फ़िगर करें"</string>
<string name="language_selection_title" msgid="1651299598555326750">"इनपुट भाषा"</string>
<string name="send_feedback" msgid="1780431884109392046">"सुझाव भेजें"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"अंग्रेज़ी (यूके)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"अंग्रेज़ी (यूएस)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"स्पेनिश (यूएस)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"अंग्रेज़ी (यूके) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"अंग्रेज़ी (यूएस) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"स्पेनिश (यूएस) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (पारंपरिक)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"अंग्रेज़ी (यूके) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"अंग्रेज़ी (यूएस) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"स्‍पेनिश (यूएस) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (पारंपरिक)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (सिरिलिक)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (लैटिन)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"भाषा उपलब्ध नहीं है (लैटिन वर्णाक्षर)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"वर्णाक्षर (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"वर्णाक्षर (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"बाहरी शब्दकोश फ़ाइल पढ़ें"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"डाउनलोड फ़ोल्डर में कोई शब्दकोश फ़ाइल नहीं है"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"इंस्टॉल करने के लिए कोई शब्दकोश फ़ाइल चुनें"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"<xliff:g id="LOCALE_NAME">%s</xliff:g> के लिए वास्तव में यह फ़ाइल इंस्टॉल करें?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"क्या वाकई <xliff:g id="LANGUAGE_NAME">%s</xliff:g> के लिए यह फ़ाइल इंस्‍टॉल करें?"</string>
<string name="error" msgid="8940763624668513648">"कोई त्रुटि हुई थी"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"संपर्क शब्दकोश सूचीबद्ध करें"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"व्यक्तिगत शब्दकोश डंप करें"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"उपयोगकर्ता इतिहास शब्दकोश डंप करें"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"वैयक्तिकरण शब्दकोश डंप करें"</string>
<string name="button_default" msgid="3988017840431881491">"सामान्य"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> में आपका स्वागत है"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"हावभाव लेखन के साथ"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"रीफ़्रेश करें"</string>
<string name="last_update" msgid="730467549913588780">"अंतिम बार का नई जानकारी"</string>
<string name="message_updating" msgid="4457761393932375219">"नई जानकारी देखा जा रहा हैं"</string>
- <string name="message_loading" msgid="8689096636874758814">"लोड हो रही है..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"लोड हो रहा है…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"मुख्‍य डिक्‍शनरी"</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="delete_dict" msgid="756853268088330054">"हटाएं"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"आपके मोबाइल उपकरण पर चयनित भाषा में डिक्‍शनरी उपलब्‍ध है.&lt;br/&gt; आपके लेखन अनुभव को बेहतर बनाने के लिए हम <xliff:g id="LANGUAGE">%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>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Wi-Fi से डाउनलोड करें"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"<xliff:g id="LANGUAGE">%1$s</xliff:g> के लिए डिक्‍शनरी उपलब्‍ध है"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> के लिए एक शब्‍दकोश उपलब्‍ध है"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"समीक्षा करने और डाउनलोड करने के लिए दबाएं"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"डाउनलोड हो रहा है: <xliff:g id="LANGUAGE">%1$s</xliff:g> के लिए सुझाव जल्दी ही तैयार हो जाएंगे."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"डाउनलोड प्रारंभ हो रहा है: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> के लिए सुझाव जल्दी ही उपलब्ध होंगे."</string>
<string name="version_text" msgid="2715354215568469385">"संस्करण <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"जोड़ें"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"शब्दकोश में जोड़ें"</string>
diff --git a/java/res/values-hr/strings-config-important-notice.xml b/java/res/values-hr/strings-config-important-notice.xml
new file mode 100644
index 000000000..9d4b18db1
--- /dev/null
+++ b/java/res/values-hr/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Upotrijebi poruke i upisane podatke za poboljšanje prijedloga"</string>
+</resources>
diff --git a/java/res/values-hr/strings-talkback-descriptions.xml b/java/res/values-hr/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..31c7eb5f8
--- /dev/null
+++ b/java/res/values-hr/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Priključite slušalice da biste čuli naglas izgovorene tipke dok upisujete zaporku."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Trenutačni tekst glasi %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Nije unesen tekst"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> ispravlja <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> u <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> vrši samoispravljanje"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Kôd tipke %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Uključena je tipka Shift (dodirnite za onemogućivanje)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Uključeno je pisanje velikim slovima (Caps Lock) (dodirnite za onemogućivanje)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Brisanje"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simboli"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Slova"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Brojevi"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Postavke"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tabulator"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Razmaknica"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Glasovni ulaz"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Pretraživanje"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Točka"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Promjena jezika"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Sljedeća"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Prethodna"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Omogućena je tipka Shift"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Omogućen je Caps Lock"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Tipka Shift onemogućena je"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Način unosa simbola"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Način unosa slova"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefonski način rada"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Način unosa telefonskih simbola"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Tipkovnica je skrivena"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Prikaz tipkovnice: <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"datum"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"datum i vrijeme"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-pošta"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"slanje poruka"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"brojevi"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"tekst"</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">"Najnoviji"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Osobe"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objekti"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Priroda"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Mjesta"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simboli"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emotikoni"</string>
+</resources>
diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml
index b9cfef384..0882faad4 100644
--- a/java/res/values-hr/strings.xml
+++ b/java/res/values-hr/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Zadano sustavom"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Predlaži imena kontakata"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Upotreba imena iz Kontakata za prijedloge i ispravke"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Prilagođeni prijedlozi"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Točka s dva razmaka"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Dvostrukim dodirivanjem razmaknice umeću se točka i razmak"</string>
<string name="auto_cap" msgid="1719746674854628252">"Automatsko pisanje velikih slova"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Prikaži trag pokreta"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dinamički plutajući pregled"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Vidi predloženu riječ tijekom pokreta"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Spremljeno"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Priključite slušalice da biste čuli tipke zaporke izgovorene naglas."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Trenutačni tekst je %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Nije unesen tekst"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> ispravlja <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> u <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> vrši samoispravljanje"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Kôd tipke %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Uključena tipka Shift (dotaknite da onemogućite)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Uključeno je pisanje velikim slovima (Caps Lock) (dotaknite da onemogućite)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Simboli"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Slova"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Brojevi"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Postavke"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Kartica"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Razmaknica"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Glasovni unos"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smješko"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Pretraživanje"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Točka"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Promijeni jezik"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Sljedeće"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Prethodno"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Omogućena tipka Shift"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Omogućeno pisanje velikih slova"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Onemogućena tipka Shift"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Način unosa simbola"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Način pisanja slova"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Telefonski način rada"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Način unosa telefonskih simbola"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Tipkovnica je skrivena"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Način prikazane tipkovnice: <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"datum"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"datum i vrijeme"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-pošta"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"slanje poruka"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"brojevi"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"tekst"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"vrijeme"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Pokret fraze"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Umećite razmake tijekom izvođenja pokreta klizeći do razmaknice"</string>
<string name="voice_input" msgid="3583258583521397548">"Tipka za glasovni unos"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Na glavnoj tipkovnici"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Na tipkovnici simb."</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Isključeno"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikrofon na gl. tipkovnici"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mik. na tipk. simb."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Glas. unos onemog."</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nije omogućen nijedan način glasovnog unosa. Provjerite postavke jezika i unosa."</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfiguriraj načine ulaza"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Jezici unosa"</string>
<string name="send_feedback" msgid="1780431884109392046">"Slanje povratnih informacija"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Engleski (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engleski (SAD)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"španjolski (SAD)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"engleski (UK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"engleski (SAD) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"španjolski (SAD) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradicionalni)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"engleska (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"engleska (SAD) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"španjolska (SAD) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradicionalni)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ćirilica)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latinica)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Nema jezika (abeceda)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Abeceda (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Abeceda (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Čitanje datoteke vanjskog rječnika"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"U mapi Preuzimanja nema datoteka rječnika"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Odabir datoteke rječnika za instaliranje"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Želite li doista instalirati ovu datoteku za <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Želite li zaista instalirati tu datoteku za <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Došlo je do pogreške"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Ispis rječnika kontakata"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Kopiranje osobnog rječnika"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Kopiranje rječ. povijesti korisnika"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Kopiranje rječnika za prilagodbu"</string>
<string name="button_default" msgid="3988017840431881491">"Zadano"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Dobro došli u aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"s Pisanjem kretnjama"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Osvježavanje"</string>
<string name="last_update" msgid="730467549913588780">"Zadnje ažuriranje"</string>
<string name="message_updating" msgid="4457761393932375219">"Provjera ažuriranja"</string>
- <string name="message_loading" msgid="8689096636874758814">"Učitavanje..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Učitavanje…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Glavni rječnik"</string>
<string name="cancel" msgid="6830980399865683324">"Odustani"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Postavke"</string>
<string name="install_dict" msgid="180852772562189365">"Instaliraj"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Odustani"</string>
<string name="delete_dict" msgid="756853268088330054">"Izbriši"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Dostupan je rječnik za odabrani jezik na vašem uređaju.&lt;br/&gt; Preporučujemo &lt;b&gt;preuzimanje&lt;/b&gt; rječnika za <xliff:g id="LANGUAGE">%1$s</xliff:g> radi boljeg doživljaja unosa teksta.&lt;br/&gt; &lt;br/&gt; Na 3G mreži preuzimanje može potrajati minutu ili dvije. Može podlijegati naplati ako nemate &lt;b&gt;neograničenu podatkovnu tarifu&lt;/b&gt;.&lt;br/&gt; Ako niste sigurni koju tarifu imate, preporučujemo da pronađete Wi-Fi mrežu i pokrenete automatsko preuzimanje.&lt;br/&gt; &lt;br/&gt; Savjet: rječnike možete preuzeti i ukloniti u odjeljku &lt;b&gt;Jezik i unos&lt;/b&gt; na izborniku &lt;b&gt;Postavke&lt;/b&gt; na mobilnom uređaju."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Dostupan je rječnik za odabrani jezik na vašem mobilnom uređaju.&lt;br/&gt; Preporučujemo da &lt;b&gt;preuzmete&lt;/b&gt; <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> rječnik radi lakšeg unosa teksta.&lt;br/&gt; &lt;br/&gt; Preuzimanje može potrajati jednu do dvije minute putem 3G-a. Možda se naplaćuje dodatna naknada ako nemate &lt;b&gt;neograničenu podatkovnu tarifu&lt;/b&gt;.&lt;br/&gt; Ako niste sigurni koju tarifu imate, preporučujemo da pronađete Wi-Fi vezu kako bi se automatski pokrenulo preuzimanje.&lt;br/&gt; &lt;br/&gt; Savjet: rječnike možete preuzeti i ukloniti u odjeljku &lt;b&gt;Jezik i unos&lt;/b&gt; u izborniku &lt;b&gt;Postavke&lt;/b&gt; na mobilnom uređaju."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Preuzmi sada (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Preuzmi putem Wi-Fi mreže"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Dostupan je rječnik za <xliff:g id="LANGUAGE">%1$s</xliff:g> jezik"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Dostupan je rječnik za <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> jezik"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Pritisnite za pregled i preuzimanje"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Preuzimanje: prijedlozi za <xliff:g id="LANGUAGE">%1$s</xliff:g> bit će spremni uskoro."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Preuzimanje: prijedlozi za <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> bit će spremni uskoro."</string>
<string name="version_text" msgid="2715354215568469385">"Verzija <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Dodavanje"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Dodaj u rječnik"</string>
diff --git a/java/res/values-hu/strings-config-important-notice.xml b/java/res/values-hu/strings-config-important-notice.xml
new file mode 100644
index 000000000..c023293e0
--- /dev/null
+++ b/java/res/values-hu/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Javaslatok javítása a kommunikáció és begépelt adatok alapján"</string>
+</resources>
diff --git a/java/res/values-hu/strings-talkback-descriptions.xml b/java/res/values-hu/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..ec2c353ab
--- /dev/null
+++ b/java/res/values-hu/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Csatlakoztasson egy headsetet, ha hallani szeretné a jelszót felolvasva."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"A jelenlegi szöveg: %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Nincs szöveg megadva"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> billentyű – <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> szóra javítja a következőt: <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> billentyű automatikus javítást végez"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Billentyűkód: %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"A Shift be van kapcsolva (érintse meg a kikapcsoláshoz)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"A Caps lock be van kapcsolva (érintse meg a kikapcsoláshoz)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Törlés"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Szimbólumok"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Betűk"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Számok"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Beállítások"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Szóköz"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Hangbevitel"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Hangulatjel"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Keresés"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Pont"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Nyelvváltás"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Következő"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Előző"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift bekapcsolva"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock bekapcsolva"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift kikapcsolva"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"„Szimbólumok” mód"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"„Betű” mód"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"„Telefon” mód"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"„Telefonos szimbólumok” mód"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Billentyűzet elrejtve"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"<xliff:g id="KEYBOARD_MODE">%s</xliff:g> billentyűzet megjelenítve"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"dátum"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"dátum és idő"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-mail"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"üzenetváltás"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"szám"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"szöveg"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"idő"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Legutóbbiak"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Emberek"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objektumok"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Természet"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Helyek"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Szimbólumok"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Hangulatjelek"</string>
+</resources>
diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml
index a61378fca..8a953ab9d 100644
--- a/java/res/values-hu/strings.xml
+++ b/java/res/values-hu/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Alapértelmezett"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Javasolt névjegyek"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"A névjegyek használata a javaslatokhoz és javításokhoz"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Testreszabott javaslatok"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Dupla szóköz: pont"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"A szóköz kétszeri megérintése beszúr egy pontot, majd egy szóközt"</string>
<string name="auto_cap" msgid="1719746674854628252">"Automatikusan nagy kezdőbetű"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Mozdulat irányának mutatása"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dinamikus lebegő előnézet"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"A javasolt szó megtekintése kézmozdulat közben"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : mentve"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Csatlakoztasson egy headsetet, ha hallani szeretné a jelszót felolvasva."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"A jelenlegi szöveg: %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Szöveg nincs megadva"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> billentyű: <xliff:g id="CORRECTED">%3$s</xliff:g> szóra javítja a következőt: <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> billentyű automatikus javítást végez"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Billentyűkód: %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift be van kapcsolva (érintse meg a kikapcsoláshoz)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock be van kapcsolva (érintse meg a kikapcsoláshoz)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Törlés"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Szimbólumok"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Betűk"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Számok"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Beállítások"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Szóköz"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Hangbevitel"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Mosolygós arc"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Keresés"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Pont"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Nyelvek felcserélése"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Következő"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Előző"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift bekapcsolva"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock bekapcsolva"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift kikapcsolva"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"\"Szimbólumok\" mód"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"\"Betű\" mód"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"\"Telefon\" mód"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"\"Telefonos szimbólumok\" mód"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Billentyűzet elrejtve"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"<xliff:g id="MODE">%s</xliff:g> billentyűzet megjelenítve"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"dátum"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"dátum és idő"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-mail"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"üzenetváltás"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"szám"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"szöveg"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"idő"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Kifejezés-kézmozdulat"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Szóköz írása kézmozdulatok során: húzza el ujját a szóköz felett"</string>
<string name="voice_input" msgid="3583258583521397548">"Hangbeviteli gomb"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"A fő billentyűzeten"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Szimbólumoknál"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Ki"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikrofon a billentyűzeten"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikr. a szimbólumoknál"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Hangbevivel KI"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nincs engedélyezett hangbeviteli módszer. Nézze meg a Nyelvi és beviteli beállításokat."</string>
<string name="configure_input_method" msgid="373356270290742459">"Beviteli módok beállítása"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Beviteli nyelvek"</string>
<string name="send_feedback" msgid="1780431884109392046">"Visszajelzés küldése"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"angol (brit)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"angol (amerikai)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"spanyol (USA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"angol (brit) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"angol (amerikai) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"spanyol (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (hagyományos)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"angol (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"angol (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"spanyol (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (hagyományos)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cirill)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Nincs nyelv (ábécé)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Ábécé (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Ábécé (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Külső szótárfájl olvasása"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Nincs szótárfájl a Letöltések mappában."</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Válasszon ki egy szótárfájlt a telepítéshez."</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Valóban telepíti ezt a fájlt <xliff:g id="LOCALE_NAME">%s</xliff:g> nyelvhez?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Valóban telepíti ezt a fájlt <xliff:g id="LANGUAGE_NAME">%s</xliff:g> nyelvhez?"</string>
<string name="error" msgid="8940763624668513648">"Hiba történt."</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Névjegytár kiírása"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Személyes szótár törlése"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Felhasználóielőzmény-szótár törlése"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Testreszabási szótár törlése"</string>
<string name="button_default" msgid="3988017840431881491">"Alapértelmezett"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Üdvözli a(z) <xliff:g id="APPLICATION_NAME">%s</xliff:g>!"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"kézmozdulatokkal történő bevitellel"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Frissítés"</string>
<string name="last_update" msgid="730467549913588780">"Legutóbb frissítve"</string>
<string name="message_updating" msgid="4457761393932375219">"Frissítések keresése"</string>
- <string name="message_loading" msgid="8689096636874758814">"Betöltés..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Betöltés…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Fő szótár"</string>
<string name="cancel" msgid="6830980399865683324">"Mégse"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Beállítások"</string>
<string name="install_dict" msgid="180852772562189365">"Telepítés"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Mégse"</string>
<string name="delete_dict" msgid="756853268088330054">"Törlés"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"A mobileszközön kiválasztott nyelvhez szótár érhető el.&lt;br/&gt; A gépelési élmény javításához javasoljuk a(z) <xliff:g id="LANGUAGE">%1$s</xliff:g> szótár &lt;b&gt;letöltését.&lt;br/&gt; &lt;br/&gt; A letöltés 3G hálózaton keresztül néhány percig tart. Ha &lt;b&gt;előfizetése nem korlátlan&lt;/b&gt;, a letöltés költségekkel járhat.&lt;br/&gt; Ha nem biztos abban, hogy milyen adatcsomagot használ, javasoljuk, hogy keressen egy Wi-Fi kapcsolatot a letöltés automatikus elindításához.&lt;br/&gt; &lt;br/&gt; Tipp: a szótárakat a mobileszköz &lt;b&gt;Beállítások&lt;/b&gt; menüjében a &lt;b&gt;Nyelv és bevitel&lt;/b&gt; részben töltheti le és távolíthatja el."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"A mobileszközön kiválasztott nyelvhez szótár érhető el.&lt;br/&gt; A gépelési élmény javításához javasoljuk a(z) <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> szótár &lt;b&gt;letöltését.&lt;br/&gt; &lt;br/&gt; A letöltés 3G hálózaton keresztül néhány percig tart. Ha &lt;b&gt;előfizetése nem korlátlan&lt;/b&gt;, a letöltés költségekkel járhat.&lt;br/&gt; Ha nem biztos abban, hogy milyen adatcsomagot használ, javasoljuk, hogy keressen egy Wi-Fi-kapcsolatot a letöltés automatikus elindításához.&lt;br/&gt; &lt;br/&gt; Tipp: szótárakat a mobileszköz a &lt;b&gt;Beállítások&lt;/b&gt; menü &lt;b&gt;Nyelv és bevitel&lt;/b&gt; részében tölthet le és távolíthat el."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Töltse le most (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Letöltés Wi-Fivel"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"<xliff:g id="LANGUAGE">%1$s</xliff:g> nyelvhez van rendelkezésre álló szótár"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> nyelvhez van rendelkezésre álló szótár"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Nyomja meg az áttekintéshez és letöltéshez"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Letöltés: a(z) <xliff:g id="LANGUAGE">%1$s</xliff:g> nyelvvel kapcsolatos javaslatok hamarosan elérhetők lesznek."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Letöltés: a(z) <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> nyelvvel kapcsolatos javaslatok hamarosan elérhetők lesznek."</string>
<string name="version_text" msgid="2715354215568469385">"Verzió: <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Hozzáadás"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Hozzáadás a szótárhoz"</string>
diff --git a/java/res/values-hy-rAM/donottranslate.xml b/java/res/values-hy-rAM/donottranslate-config-spacing-and-punctuations.xml
index 7b0c56655..ed35365a2 100644
--- a/java/res/values-hy-rAM/donottranslate.xml
+++ b/java/res/values-hy-rAM/donottranslate-config-spacing-and-punctuations.xml
@@ -25,7 +25,7 @@
<string name="symbols_followed_by_space">.,;:!?)]}&amp;&#x0589;&#x055D;</string>
<!-- Symbols that separate words. Adding armenian period and comma. -->
<!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
- <string name="symbols_word_separators">"&#x0009;&#x0020;\n"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"&#x0589;&#x055D;</string>
+ <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"&#x0589;&#x055D;</string>
<!-- The sentence separator code point, for capitalization -->
<!-- U+0589: "։" ARMENIAN FULL STOP ; 589h = 1417d -->
<integer name="sentence_separator">1417</integer>
diff --git a/java/res/values-hy-rAM/strings-config-important-notice.xml b/java/res/values-hy-rAM/strings-config-important-notice.xml
new file mode 100644
index 000000000..9fac63197
--- /dev/null
+++ b/java/res/values-hy-rAM/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-hy-rAM/strings-talkback-descriptions.xml b/java/res/values-hy-rAM/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..e5b1ce6d9
--- /dev/null
+++ b/java/res/values-hy-rAM/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Միացրեք ականջակալը՝ բարձրաձայն արտասանվող գաղտնաբառը լսելու համար:"</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Տվյալ տեքստը %s է"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Տեքստ չի մուտքագրվել"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g>-ը շտկում է <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>-ը՝ դարձնելով <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> ստեղնը ինքնաշտկում է կատարում"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Բանալու կոդը՝ %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift-ը միացված է (հպել անջատելու համար)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock-ը միացված է (հպել՝ անջատելու համար)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Ջնջել"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Նշաններ"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Տառեր"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Թվեր"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Կարգավորումներ"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Բացատ"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Ձայնային մուտքագրում"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Զմայլիկներ"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Վերադառնալ"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Որոնել"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Կետ"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Փոխել լեզուն"</string>
+ <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">"Shift-ը միացված է"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock-ը միացված է"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift-ն անջատված է"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Նշանների ռեժիմ"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Տառերի ռեժիմ"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Հեռախոսային ռեժիմ"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Հեռախոսի նշանների ռեժիմ"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Ստեղնաշարը թաքցված է"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Ցուցադրվում է <xliff:g id="KEYBOARD_MODE">%s</xliff:g> ստեղնաշարը"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"ամսաթիվ"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"ամսաթիվ և ժամ"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"էլփոստ"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"նամակագրություն"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"թվեր"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Բնություն"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Վայրեր"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Նշաններ"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Զմայլիկներ"</string>
+</resources>
diff --git a/java/res/values-hy-rAM/strings.xml b/java/res/values-hy-rAM/strings.xml
index 0b8e19a76..03d56a626 100644
--- a/java/res/values-hy-rAM/strings.xml
+++ b/java/res/values-hy-rAM/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Համակարգի լռելյայնները"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Առաջարկել կոնտակտների անունները"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Օգտագործել կոնտակտների անունները՝ առաջարկների և ուղղումների համար"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Անհատականացված առաջարկներ"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Կրկնաբացակի վերջակետ"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Բացակի ստեղնի կրկնակի հպումը բացակից հետո վերջակետ է դնում"</string>
<string name="auto_cap" msgid="1719746674854628252">"Ավտոմատ գլխատառացում"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Ցույց տալ ժեստի հետագիծը"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Դինամիկ սահող նախատեսք"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Տեսեք առաջարկված բառը՝ ժեստի միջոցով"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>` պահված է"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Միացրեք ականջակալը՝ բարձրաձայն արտասանվող գաղտնաբառը լսելու համար:"</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Տվյալ տեքստը %s է"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Տեքստ չի մուտքագրվել"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g>-ը շտկում է <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>-ը և դարձնում <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> ստեղնը ինքնաշտկում է կատարում"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Բանալու կոդը՝ %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift-ը միացված է (հպել անջատելու համար)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock-ը միացված է (հպել՝ անջատելու համար)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Ջնջել"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Նշաններ"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Տառեր"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Թվեր"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Կարգավորումներ"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Բացակ"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Ձայնային մուտքագրում"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Ժպիտ"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Վերադարձ"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Որոնել"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Կետ"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Փոխել լեզուն"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Հաջորդը"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Նախորդը"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift-ը միացված է"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps Lock-ը միացված է"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift-ն անջատված է"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Նշանների ռեժիմ"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Տառերի ռեժիմ"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Հեռախոսային ռեժիմ"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Հեռախոսի նշանների ռեժիմ"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Ստեղնաշարը թաքցված է"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Ցուցադրված է <xliff:g id="MODE">%s</xliff:g> ստեղնաշարը"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"ամսաթիվ"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"ամսաթիվ և ժամ"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"էլփոստ"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"նամակագրություն"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"թվեր"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"հեռախոսահամար"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"տեքստ"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"ժամանակ"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Բառակապակցային ժեստ"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Ներմուծեք բացատներ ժեստերի ընթացքում՝ սահելով բացատ ստեղնի վրայով"</string>
<string name="voice_input" msgid="3583258583521397548">"Ձայնային մուտքագրման ստեղն"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Հիմնական ստեղնաշարի վրա"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Նշանների ստեղնաշարի վրա"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Անջատված"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Բարձրախոս հիմնական ստեղնաշարի վրա"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Բարձրախոս նշանների ստեղնաշարի վրա"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Ձայնային մուտքագրումն անջատված է"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Ձայնային ներածման որևէ եղանակ միացված չէ։ Ստուգեք Լեզվի և ներածման կարգավորումները։"</string>
<string name="configure_input_method" msgid="373356270290742459">"Կարգավորել մուտքագրման մեթոդները"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Մուտքագրման լեզուներ"</string>
<string name="send_feedback" msgid="1780431884109392046">"Արձագանքել"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Անգլերեն (ՄԹ)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Անգլերեն (ԱՄՆ)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Իսպաներեն (ԱՄՆ)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Անգլերեն (ՄԹ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Անգլերեն (ԱՄՆ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Իսպաներեն (ԱՄՆ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (ավանդական)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Անգլերեն (ՄԹ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Անգլերեն (ԱՄՆ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Իսպաներեն (ԱՄՆ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ավանդական)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (կյուրեղյան)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (լատինական)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Ոչ մի լեզվով (Այբուբեն)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Այբուբեն (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Այբուբեն (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Կարդալ արտաքին բառարանի ֆայլը"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Ներբեռնումների թղթապանակում բառարանային ֆայլեր չկան"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Ընտրեք բառարանային ֆայլը տեղադրման համար"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Իրո՞ք ուզում եք տեղադրել այս ֆայլը <xliff:g id="LOCALE_NAME">%s</xliff:g>-ում:"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Տեղադրե՞լ այս ֆայլը <xliff:g id="LANGUAGE_NAME">%s</xliff:g> լեզվի համար:"</string>
<string name="error" msgid="8940763624668513648">"Տեղի է ունեցել սխալ"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Բեռնել կոնտակտների բառարանը"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Բեռնել անձնական բառարանը"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Բեռնել օգտվողի պատմության բառարանը"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Բեռնել անհատականացման բառարանը"</string>
<string name="button_default" msgid="3988017840431881491">"Լռելյայնը"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Բարի գալուստ <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"Ժեստային մուտքագրմամբ"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Թարմացնել"</string>
<string name="last_update" msgid="730467549913588780">"Վերջին անգամ թարմացվել է"</string>
<string name="message_updating" msgid="4457761393932375219">"Ստուգվում է թարմացումների առկայությունը"</string>
- <string name="message_loading" msgid="8689096636874758814">"Բեռնվում է..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Բեռնում..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"Հիմնական բառարան"</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="delete_dict" msgid="756853268088330054">"Ջնջել"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Ձեր բջջային սարքում ընտրված լեզվով առկա է բառարան:<br/> Խորհուրդ ենք տալիս &lt;b&gt;ներբեռնել&lt;/b&gt; <xliff:g id="LANGUAGE">%1$s</xliff:g> բառարանը ձեր մուտքագրման հմտությունների բարելավման համար:&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;Կարգավորումներ ցանկի Լեզու &amp; մուտքագրման&lt;/b&gt; բաժինը:"</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Ձեր բջջային սարքում ընտրված լեզվով առկա է բառարան:<br/> Խորհուրդ ենք տալիս &lt;b&gt;ներբեռնել&lt;/b&gt; <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> բառարանը՝ ձեր մուտքագրման հմտությունների բարելավման համար:&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; բաժինը:"</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="6514288591959117288">"<xliff:g id="LANGUAGE">%1$s</xliff:g>-ով առկա է մի բառարան"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> լեզվի համար առկա է բառարան"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Սեղմեք՝ վերանայելու և ներբեռնելու համար"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Ներբեռնվում է. <xliff:g id="LANGUAGE">%1$s</xliff:g>-ի համար առաջարկները շուտով պատրաստ կլինեն:"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Ներբեռնում. <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> լեզվի համար առաջարկները պատրաստ կլինեն շուտով:"</string>
<string name="version_text" msgid="2715354215568469385">"Տարբերակ <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Ավելացնել"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Ավելացնել բառարանում"</string>
diff --git a/java/res/values-in/strings-config-important-notice.xml b/java/res/values-in/strings-config-important-notice.xml
new file mode 100644
index 000000000..d5df91306
--- /dev/null
+++ b/java/res/values-in/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Belajar dari komunikasi &amp; data terketik untuk meningkatkan saran"</string>
+</resources>
diff --git a/java/res/values-in/strings-talkback-descriptions.xml b/java/res/values-in/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..73bf712f3
--- /dev/null
+++ b/java/res/values-in/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Pasang headset untuk mendengar tombol sandi yang diucapkan dengan lantang."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Teks saat ini adalah %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Tidak ada teks yang dimasukkan"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> mengoreksi <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> menjadi <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> melakukan koreksi otomatis"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Kode tombol %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift aktif (ketuk untuk menonaktifkan)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock aktif (ketuk untuk menonaktifkan)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Hapus"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simbol"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Huruf"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Angka"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Setelan"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Spasi"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Masukan suara"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Kembali"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Telusuri"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Titik"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Beralih bahasa"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Berikutnya"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Sebelumnya"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift diaktifkan"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock diaktifkan"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift dinonaktifkan"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Mode simbol"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Mode huruf"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Mode telepon"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Mode simbol telepon"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Keyboard disembunyikan"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Menampilkan keyboard <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"tanggal"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"tanggal dan waktu"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"email"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"pesan"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"angka"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telepon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"teks"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"waktu"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Terbaru"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Orang"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objek"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Alam"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Tempat"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simbol"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emotikon"</string>
+</resources>
diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml
index d83a22c6c..e3c551629 100644
--- a/java/res/values-in/strings.xml
+++ b/java/res/values-in/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Default sistem"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Sarankan nama Kontak"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Menggunakan nama dari Kontak untuk saran dan koreksi"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Saran hasil personalisasi"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Titik spasi ganda"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Mengetuk tombol spasi dua kali akan memasukkan titik diikuti satu spasi"</string>
<string name="auto_cap" msgid="1719746674854628252">"Kapitalisasi otomatis"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Tampilkan jalur isyarat"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Pratinjau mengambang dinamis"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Lihat kata yang disarankan saat melakukan isyarat"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Telah disimpan"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Pasang headset untuk mendengar tombol sandi yang diucapkan dengan keras."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Teks saat ini adalah %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Tidak ada teks yang dimasukkan"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> mengoreksi <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> menjadi <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> melakukan koreksi otomatis"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Kode tombol %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift hidup (ketuk untuk mematikan)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock hidup (ketuk untuk mematikan)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Hapus"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Simbol"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Huruf"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Angka"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Setelan"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Spasi"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Masukan suara"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Wajah tersenyum"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Kembali"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Telusuri"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Titik"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Ganti bahasa"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Berikutnya"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Sebelumnya"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift diaktifkan"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock diaktifkan"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift dinonaktifkan"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Mode simbol"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Mode huruf"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Mode telepon"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Mode simbol telepon"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Keyboard disembunyikan"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Menampilkan keyboard <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"tanggal"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"tanggal dan waktu"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"email"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"pesan"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"angka"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telepon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"teks"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"waktu"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Isyarat frasa"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Masukkan spasi dalam isyarat dengan meluncur ke tombol spasi"</string>
<string name="voice_input" msgid="3583258583521397548">"Tombol masukan suara"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Pada keyboard utama"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Pada keyboard simbol"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Mati"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mik pada keyboard utama"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mik pada keyboard simbol"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Masukan suara dinonaktifkan"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Tidak ada metode masukan suara yang diaktifkan. Periksa setelan Bahasan &amp; masukan."</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfigurasikan metode masukan"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Bahasa masukan"</string>
<string name="send_feedback" msgid="1780431884109392046">"Kirim masukan"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Inggris (Inggris)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Inggris (AS)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spanyol (AS)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Inggris (Inggris) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Inggris (AS) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spanyol (AS) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Tradisional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>) Inggris (Inggris)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>) Inggris (AS)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>) Spanyol (AS)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Tradisional)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Sirilik)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Tidak ada bahasa (Abjad)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Abjad (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Abjad (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Membaca file kamus eksternal"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Tidak ada file kamus di folder Unduhan"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Pilih file kamus untuk dipasang"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Yakin ingin memasang file ini untuk <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Yakin ingin memasang file ini untuk <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Terjadi kesalahan"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Buat daftar kamus kontak"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Buat daftar kamus pribadi"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Buat daftar kamus riwayat pengguna"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Buat daftar kamus personalisasi"</string>
<string name="button_default" msgid="3988017840431881491">"Default"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Selamat datang di <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"dengan Ketikan Isyarat"</string>
@@ -193,7 +154,7 @@
<string name="dictionary_provider_name" msgid="3027315045397363079">"Penyedia Kamus"</string>
<string name="dictionary_service_name" msgid="6237472350693511448">"Layanan Kamus"</string>
<string name="download_description" msgid="6014835283119198591">"Informasi pembaruan kamus"</string>
- <string name="dictionary_settings_title" msgid="8091417676045693313">"Kamus add-on"</string>
+ <string name="dictionary_settings_title" msgid="8091417676045693313">"Kamus pengaya"</string>
<string name="dictionary_install_over_metered_network_prompt" msgid="3587517870006332980">"Kamus yang tersedia"</string>
<string name="dictionary_settings_summary" msgid="5305694987799824349">"Setelan untuk kamus"</string>
<string name="user_dictionaries" msgid="3582332055892252845">"Kamus pengguna"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Segarkan"</string>
<string name="last_update" msgid="730467549913588780">"Terakhir diperbarui"</string>
<string name="message_updating" msgid="4457761393932375219">"Memeriksa pembaruan"</string>
- <string name="message_loading" msgid="8689096636874758814">"Memuat..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Memuat…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Kamus utama"</string>
<string name="cancel" msgid="6830980399865683324">"Batal"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Setelan"</string>
<string name="install_dict" msgid="180852772562189365">"Pasang"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Batal"</string>
<string name="delete_dict" msgid="756853268088330054">"Hapus"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Bahasa pilihan pada perangkat seluler Anda memiliki kamus yang tersedia.&lt;br/&gt; Silakan &lt;b&gt;mengunduh&lt;/b&gt; kamus <xliff:g id="LANGUAGE">%1$s</xliff:g> untuk meningkatkan pengalaman pengetikan.&lt;br/&gt; &lt;br/&gt; Unduhan dapat berlangsung selama satu atau dua menit melalui 3G. Mungkin dikenakan tagihan data jika Anda tidak memiliki &lt;b&gt;paket data tak terbatas&lt;/b&gt;.&lt;br/&gt; Jika tidak yakin paket data mana yang Anda miliki, sebaiknya Anda mencari sambungan Wi-Fi untuk memulai unduhan secara otomatis.&lt;br/&gt; &lt;br/&gt; Kiat: Anda dapat mengunduh atau menghapus kamus dengan membuka &lt;b&gt;Bahasa &amp; masukan&lt;/b&gt; di menu &lt;b&gt;Setelan&lt;/b&gt; perangkat seluler Anda."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Tersedia kamus untuk bahasa pilihan pada perangkat seluler Anda.&lt;br/&gt; Sebaiknya &lt;b&gt;unduh&lt;/b&gt; kamus <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> untuk meningkatkan pengalaman pengetikan.&lt;br/&gt; &lt;br/&gt; Unduhan dapat berlangsung selama satu atau dua menit melalui 3G. Mungkin dikenakan biaya data jika tidak memiliki &lt;b&gt;paket data tak terbatas&lt;/b&gt;.&lt;br/&gt; Jika tidak yakin dengan jenis paket data Anda, sebaiknya cari koneksi Wi-Fi untuk memulai unduhan secara otomatis.&lt;br/&gt; &lt;br/&gt; Kiat: Anda dapat mengunduh dan menghapus kamus dengan membuka &lt;b&gt;Bahasa &amp; masukan&lt;/b&gt; di menu &lt;b&gt;Setelan&lt;/b&gt; perangkat seluler Anda."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Unduh sekarang (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Unduh melalui Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Kamus tersedia untuk bahasa <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Kamus tersedia untuk <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Tekan untuk meninjau dan mengunduh"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Mengunduh: saran untuk bahasa <xliff:g id="LANGUAGE">%1$s</xliff:g> akan segera tersedia."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Mengunduh: saran untuk <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> akan segera tersedia."</string>
<string name="version_text" msgid="2715354215568469385">"Versi <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Tambahkan"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Tambahkan ke kamus"</string>
diff --git a/java/res/values-is/strings-talkback-descriptions.xml b/java/res/values-is/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..05b816ab7
--- /dev/null
+++ b/java/res/values-is/strings-talkback-descriptions.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- no translation found for spoken_use_headphones (896961781287283493) -->
+ <skip />
+ <!-- no translation found for spoken_current_text_is (2485723011272583845) -->
+ <skip />
+ <!-- no translation found for spoken_no_text_entered (7479685225597344496) -->
+ <skip />
+ <!-- no translation found for spoken_auto_correct (8005997889020109763) -->
+ <skip />
+ <!-- no translation found for spoken_auto_correct_obscured (6276420476908833791) -->
+ <skip />
+ <!-- no translation found for spoken_description_unknown (3197434010402179157) -->
+ <skip />
+ <!-- no translation found for spoken_description_shift (244197883292549308) -->
+ <skip />
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
+ <!-- no translation found for spoken_description_delete (8740376944276199801) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_symbol (5486340107500448969) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_alpha (23129338819771807) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_numeric (591752092685161732) -->
+ <skip />
+ <!-- no translation found for spoken_description_settings (4627462689603838099) -->
+ <skip />
+ <!-- no translation found for spoken_description_tab (2667716002663482248) -->
+ <skip />
+ <!-- no translation found for spoken_description_space (2582521050049860859) -->
+ <skip />
+ <!-- no translation found for spoken_description_mic (615536748882611950) -->
+ <skip />
+ <!-- no translation found for spoken_description_smiley (2256309826200113918) -->
+ <skip />
+ <!-- no translation found for spoken_description_return (8178083177238315647) -->
+ <skip />
+ <!-- no translation found for spoken_description_search (1247236163755920808) -->
+ <skip />
+ <!-- no translation found for spoken_description_dot (40711082435231673) -->
+ <skip />
+ <!-- no translation found for spoken_description_language_switch (5507091328222331316) -->
+ <skip />
+ <!-- no translation found for spoken_description_action_next (8636078276664150324) -->
+ <skip />
+ <!-- no translation found for spoken_description_action_previous (800872415009336208) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_on (5700440798609574589) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_locked (593175803181701830) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_off (657219998449174808) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_symbol (7183343879909747642) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_alpha (3528307674390156956) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_phone (6520207943132026264) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_phone_shift (5499629753962641227) -->
+ <skip />
+ <!-- no translation found for announce_keyboard_hidden (8718927835531429807) -->
+ <skip />
+ <!-- no translation found for announce_keyboard_mode (4729081055438508321) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_date (3137520166817128102) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_date_time (339593358488851072) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_email (6216248078128294262) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_im (1137405089766557048) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_number (7991623440699957069) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_phone (6851627527401433229) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_text (6479436687899701619) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_time (4381856885582143277) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_url (1519819835514911218) -->
+ <skip />
+</resources>
diff --git a/java/res/values-is/strings.xml b/java/res/values-is/strings.xml
index 6f685d395..1588534c9 100644
--- a/java/res/values-is/strings.xml
+++ b/java/res/values-is/strings.xml
@@ -126,106 +126,8 @@
<skip />
<!-- no translation found for gesture_floating_preview_text_summary (4472696213996203533) -->
<skip />
- <!-- no translation found for added_word (8993883354622484372) -->
- <skip />
- <!-- no translation found for spoken_use_headphones (896961781287283493) -->
- <skip />
- <!-- no translation found for spoken_current_text_is (2485723011272583845) -->
- <skip />
- <!-- no translation found for spoken_no_text_entered (7479685225597344496) -->
- <skip />
- <!-- no translation found for spoken_auto_correct (8005997889020109763) -->
- <skip />
- <!-- no translation found for spoken_auto_correct_obscured (6276420476908833791) -->
- <skip />
- <!-- no translation found for spoken_description_unknown (3197434010402179157) -->
- <skip />
- <!-- no translation found for spoken_description_shift (244197883292549308) -->
- <skip />
- <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
- <skip />
- <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
- <skip />
- <!-- no translation found for spoken_description_delete (8740376944276199801) -->
- <skip />
- <!-- no translation found for spoken_description_to_symbol (5486340107500448969) -->
- <skip />
- <!-- no translation found for spoken_description_to_alpha (23129338819771807) -->
- <skip />
- <!-- no translation found for spoken_description_to_numeric (591752092685161732) -->
- <skip />
- <!-- no translation found for spoken_description_settings (4627462689603838099) -->
- <skip />
- <!-- no translation found for spoken_description_tab (2667716002663482248) -->
- <skip />
- <!-- no translation found for spoken_description_space (2582521050049860859) -->
- <skip />
- <!-- no translation found for spoken_description_mic (615536748882611950) -->
- <skip />
- <!-- no translation found for spoken_description_smiley (2256309826200113918) -->
- <skip />
- <!-- no translation found for spoken_description_return (8178083177238315647) -->
- <skip />
- <!-- no translation found for spoken_description_search (1247236163755920808) -->
- <skip />
- <!-- no translation found for spoken_description_dot (40711082435231673) -->
- <skip />
- <!-- no translation found for spoken_description_language_switch (5507091328222331316) -->
- <skip />
- <!-- no translation found for spoken_description_action_next (8636078276664150324) -->
- <skip />
- <!-- no translation found for spoken_description_action_previous (800872415009336208) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_on (5700440798609574589) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_locked (593175803181701830) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_off (657219998449174808) -->
- <skip />
- <!-- no translation found for spoken_description_mode_symbol (7183343879909747642) -->
- <skip />
- <!-- no translation found for spoken_description_mode_alpha (3528307674390156956) -->
- <skip />
- <!-- no translation found for spoken_description_mode_phone (6520207943132026264) -->
- <skip />
- <!-- no translation found for spoken_description_mode_phone_shift (5499629753962641227) -->
- <skip />
- <!-- no translation found for announce_keyboard_hidden (8718927835531429807) -->
- <skip />
- <!-- no translation found for announce_keyboard_mode (4729081055438508321) -->
- <skip />
- <!-- no translation found for keyboard_mode_date (3137520166817128102) -->
- <skip />
- <!-- no translation found for keyboard_mode_date_time (339593358488851072) -->
- <skip />
- <!-- no translation found for keyboard_mode_email (6216248078128294262) -->
- <skip />
- <!-- no translation found for keyboard_mode_im (1137405089766557048) -->
- <skip />
- <!-- no translation found for keyboard_mode_number (7991623440699957069) -->
- <skip />
- <!-- no translation found for keyboard_mode_phone (6851627527401433229) -->
- <skip />
- <!-- no translation found for keyboard_mode_text (6479436687899701619) -->
- <skip />
- <!-- no translation found for keyboard_mode_time (4381856885582143277) -->
- <skip />
- <!-- no translation found for keyboard_mode_url (1519819835514911218) -->
- <skip />
<!-- no translation found for voice_input (3583258583521397548) -->
<skip />
- <!-- no translation found for voice_input_modes_main_keyboard (3360660341121083174) -->
- <skip />
- <!-- no translation found for voice_input_modes_symbols_keyboard (7203213240786084067) -->
- <skip />
- <!-- no translation found for voice_input_modes_off (3745699748218082014) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_main_keyboard (6586544292900314339) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_symbols_keyboard (5233725927281932391) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_off (63875609591897607) -->
- <skip />
<!-- no translation found for configure_input_method (373356270290742459) -->
<skip />
<!-- no translation found for language_selection_title (1651299598555326750) -->
diff --git a/java/res/values-it/strings-config-important-notice.xml b/java/res/values-it/strings-config-important-notice.xml
new file mode 100644
index 000000000..3690fac39
--- /dev/null
+++ b/java/res/values-it/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Usa comunicazioni e dati digitati per migliorare i suggerimenti"</string>
+</resources>
diff --git a/java/res/values-it/strings-talkback-descriptions.xml b/java/res/values-it/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..760db696c
--- /dev/null
+++ b/java/res/values-it/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Collega gli auricolari per ascoltare la pronuncia dei tasti premuti per la password."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Il testo attuale è %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Nessun testo inserito"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corregge <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> con <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> esegue la correzione automatica"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Codice tasto %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Maiusc"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Maiusc attivo (tocca per disattivare)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Blocco maiuscole attivo (tocca per disattivare)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Elimina"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simboli"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Lettere"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Numeri"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Impostazioni"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"TAB"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Spazio"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Input vocale"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Invio"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Cerca"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Pallino"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Cambia lingua"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Successivo"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Precedente"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Maiusc attivo"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Bloc Maiusc attivo"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Maiusc disattivato"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modalità simboli"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modalità lettere"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modalità telefono"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modalità simboli telefono"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Tastiera nascosta"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Ecco la tastiera <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"data"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"data e ora"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"email"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"messaggi"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"numero"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefono"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"testo"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"ora"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Recenti"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Persone"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Oggetti"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natura"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Luoghi"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simboli"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticon"</string>
+</resources>
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index 1111c4901..6685095be 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Predefinito sistema"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Suggerisci nomi di contatti"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Utilizza nomi di Contatti per suggerimenti e correzioni"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Suggerimenti personalizz."</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Doppio spazio per punto"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Tocca due volte barra spaziatr. per inserire punto seguito da spazio"</string>
<string name="auto_cap" msgid="1719746674854628252">"Maiuscole automatiche"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Mostra traccia con gesto"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Anteprima mobile dinamica"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Visualizza la parola suggerita durante il gesto"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : parola salvata"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Collega gli auricolari per ascoltare la pronuncia dei tasti premuti per la password."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Il testo attuale è %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Nessun testo inserito"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> corregge <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> con <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> esegue correzione automatica"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Codice tasto %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Maiuscolo"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Maiuscolo attivo (tocca per disattivare)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Blocco maiuscole attivo (tocca per disattivare)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Cancella"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Simboli"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Lettere"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Numeri"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Impostazioni"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabulazione"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Spazio"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Input vocale"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smile"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Invio"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Cerca"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Pallino"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Cambia lingua"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Successivo"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Precedente"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Maiuscolo attivo"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Blocco maiuscole attivo"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Maiuscolo disattivato"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Modalità simboli"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Modalità lettere"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Modalità telefono"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Modalità simboli telefono"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Tastiera nascosta"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Visualizzazione tastiera <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"data"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"data e ora"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"email"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"messaggi"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"numero"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefono"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"testo"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"ora"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Gesto frase"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Inserisci spazi durante gesti facendo scivolare dito su spazio"</string>
<string name="voice_input" msgid="3583258583521397548">"Tasto input vocale"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Su tastiera principale"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Su tastiera simboli"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"OFF"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Microfono su tastiera principale"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Microfono su tastiera simboli"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Input vocale disatt."</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nessun metodo di immissione vocale abilitato. Controlla le impostazioni Lingua e input."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configura metodi di immissione"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Lingue comandi"</string>
<string name="send_feedback" msgid="1780431884109392046">"Invia feedback"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Inglese (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Inglese (USA)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spagnolo (USA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Inglese (Regno Unito) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Inglese (Stati Uniti) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spagnolo (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradizionale)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Inglese (Regno Unito) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Inglese (Stati Uniti) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spagnolo (Stati Uniti) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradizionale)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Cirillico)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latino)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Nessuna lingua (alfabeto)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabeto (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabeto (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Leggi file dizionario esterno"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Nessun file di dizionario nella cartella Download"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Seleziona un file di dizionario da installare"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Installare questo file per <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Vuoi davvero installare questo file per <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Si è verificato un errore"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Estrai dizionario contatti"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Estrai dizionario personale"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Estrai dizion. cronologia utente"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Estrai dizionario di personalizz."</string>
<string name="button_default" msgid="3988017840431881491">"Predefinito"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Benvenuto in <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"con la Digitazione gestuale"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Aggiorna"</string>
<string name="last_update" msgid="730467549913588780">"Ultimo aggiornamento"</string>
<string name="message_updating" msgid="4457761393932375219">"Verifica disponibilità aggiornamenti"</string>
- <string name="message_loading" msgid="8689096636874758814">"Caricamento in corso..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Caricamento..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"Dizionario principale"</string>
<string name="cancel" msgid="6830980399865683324">"Annulla"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Impostazioni"</string>
<string name="install_dict" msgid="180852772562189365">"Installa"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Annulla"</string>
<string name="delete_dict" msgid="756853268088330054">"Elimina"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Per la lingua selezionata sul dispositivo mobile è disponibile un dizionario.&lt;br/&gt; Ti consigliamo di &lt;b&gt;scaricare&lt;/b&gt; il dizionario in <xliff:g id="LANGUAGE">%1$s</xliff:g> per migliorare l\'esperienza di digitazione.&lt;br/&gt; &lt;br/&gt; Il download potrebbe richiedere un paio di minuti su 3G. Potrebbero essere applicati costi se non disponi di un &lt;b&gt;piano dati illimitato&lt;/b&gt;.&lt;br/&gt; Se non sei sicuro di quale sia il tuo piano dati, dovresti trovare una connessione Wi-Fi per avviare il download automaticamente.&lt;br/&gt; &lt;br/&gt; Suggerimento. Puoi scaricare e rimuovere dizionari passando a &lt;b&gt;Lingue e immissione&lt;/b&gt; nel menu &lt;b&gt;Impostazioni&lt;/b&gt; del dispositivo mobile."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Per la lingua selezionata sul dispositivo mobile è disponibile un dizionario.&lt;br/&gt; Ti consigliamo di &lt;b&gt;scaricare&lt;/b&gt; il dizionario in <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> per migliorare la digitazione.&lt;br/&gt; &lt;br/&gt; Il download potrebbe richiedere un paio di minuti su 3G. Potrebbero essere applicati costi se non disponi di un &lt;b&gt;piano dati illimitato&lt;/b&gt;.&lt;br/&gt; Se non sei sicuro di quale sia il tuo piano dati, dovresti trovare una connessione Wi-Fi per avviare il download automaticamente.&lt;br/&gt; &lt;br/&gt; Suggerimento. Puoi scaricare e rimuovere dizionari selezionando &lt;b&gt;Lingua e immissione&lt;/b&gt; nel menu &lt;b&gt;Impostazioni&lt;/b&gt; del dispositivo mobile."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Scarica ora (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Scarica tramite Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"È disponibile un dizionario per <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"È disponibile un dizionario per: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Premi per esaminare e scaricare"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Download: i suggerimenti per <xliff:g id="LANGUAGE">%1$s</xliff:g> saranno pronti a breve."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Download: i suggerimenti per <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> saranno pronti a breve."</string>
<string name="version_text" msgid="2715354215568469385">"Versione <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Aggiungi"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Aggiungi al dizionario"</string>
diff --git a/java/res/values-fa/donottranslate.xml b/java/res/values-iw-sw600dp/donottranslate-config-spacing-and-punctuations.xml
index 57de2538b..22f0353ff 100644
--- a/java/res/values-fa/donottranslate.xml
+++ b/java/res/values-iw-sw600dp/donottranslate-config-spacing-and-punctuations.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2012, The Android Open Source Project
+** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -21,5 +21,5 @@
<!-- The all letters need to be mirrored are found at
http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
<!-- Symbols that are suggested between words -->
- <string name="suggested_punctuations">!,?,\\,,:,;,\",(|),)|(,\',-,/,@,_</string>
+ <string name="suggested_punctuations">:,;,\",(|),)|(,\',-,/,@,_</string>
</resources>
diff --git a/java/res/values-ar/donottranslate.xml b/java/res/values-iw/donottranslate-config-spacing-and-punctuations.xml
index 57de2538b..d30720811 100644
--- a/java/res/values-ar/donottranslate.xml
+++ b/java/res/values-iw/donottranslate-config-spacing-and-punctuations.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2012, The Android Open Source Project
+** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
diff --git a/java/res/values-iw/strings-config-important-notice.xml b/java/res/values-iw/strings-config-important-notice.xml
new file mode 100644
index 000000000..34ef4cab5
--- /dev/null
+++ b/java/res/values-iw/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-iw/strings-talkback-descriptions.xml b/java/res/values-iw/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..e6344fb04
--- /dev/null
+++ b/java/res/values-iw/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"חבר אוזניות כדי לשמוע הקראה של מפתחות סיסמה."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"‏הטקסט הנוכחי הוא %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"לא הוזן טקסט"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> מתקן את <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> ל-<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> מבצע תיקון אוטומטי"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"‏קוד מקש %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"‏Shift פועל (הקש כדי להשבית)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"‏Caps Lock פועל (הקש כדי להשבית)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"מחק"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"סמלים"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"אותיות"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"מספרים"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"הגדרות"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"רווח"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"קלט הקול"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"אמוג\'י"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"חפש"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"נקודה"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"החלף שפה"</string>
+ <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">"‏Shift פועל"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"‏Caps Lock פועל"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"‏Shift מושבת"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"מצב סמלים"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"מצב אותיות"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"מצב טלפון"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"מצב סמלי טלפון"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"המקלדת מוסתרת"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"מציג מקלדת <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"תאריך"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"תאריך ושעה"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"דוא\"ל"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"העברת הודעות"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"מספרים"</string>
+ <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="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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"טבע"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"מקומות"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"סמלים"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"רגשונים"</string>
+</resources>
diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml
index 8d02e685b..dab2d8ed8 100644
--- a/java/res/values-iw/strings.xml
+++ b/java/res/values-iw/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"ברירת מחדל של המערכת"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"הצע שמות של אנשי קשר"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"השתמש בשמות מרשימת אנשי הקשר עבור הצעות ותיקונים"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"הצעות מותאמות אישית"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"רווח כפול לנקודה"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"הקשה פעמיים על מקש הרווח מזינה נקודה ואחריה רווח"</string>
<string name="auto_cap" msgid="1719746674854628252">"הפיכת אותיות לרישיות באופן אוטומטי"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"הצג שובל תנועות"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"תצוגה צפה דינמית"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"ראה את המילה המוצעת תוך כדי הזזת האצבע"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : נשמרה"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"חבר אוזניות כדי לשמוע הקראה של מפתחות סיסמה."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"‏הטקסט הנוכחי הוא %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"לא הוזן טקסט"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> מתקן את <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> ל-<xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> מבצע תיקון אוטומטי"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"‏קוד מקש %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"‏Shift פועל (הקש כדי להשבית)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"‏Caps Lock פועל (הקש כדי להשבית)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"מחק"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"סמלים"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"אותיות"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"מספרים"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"הגדרות"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"כרטיסייה"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"רווח"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"קלט קולי"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"סמיילי"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"חזרה"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"חפש"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"נקודה"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"החלף שפה"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"הבא"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"הקודם"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"‏Shift פועל"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"‏Caps Lock פועל"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"‏Shift מושבת"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"מצב סמלים"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"מצב אותיות"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"מצב טלפון"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"מצב סמלי טלפון"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"המקלדת מוסתרת"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"מציג מקלדת <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"תאריך"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"תאריך ושעה"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"דוא\"ל"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"העברת הודעות"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"מספרים"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"מספרי טלפון"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"טקסט"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"זמן"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"כתובות אתרים"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"הקלדת משפט בהחלקה"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"הזן רווחים במהלך התנועה על ידי החלקה אל מקש הרווח"</string>
<string name="voice_input" msgid="3583258583521397548">"מקש קלט קולי"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"במקלדת הראשית"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"במקלדת סמלים"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"כבוי"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"מיקרופון במקלדת הראשית"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"מיקרופון במקלדת סמלים"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"הקלט הקולי מושבת"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"לא הופעלו שיטות של קלט קולי. בדוק את הגדרות השפה והקלט."</string>
<string name="configure_input_method" msgid="373356270290742459">"הגדרת שיטות קלט"</string>
<string name="language_selection_title" msgid="1651299598555326750">"שפות קלט"</string>
<string name="send_feedback" msgid="1780431884109392046">"שלח משוב"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"אנגלית (בריטניה)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"אנגלית (ארה\"ב)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"ספרדית (ארצות הברית)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"אנגלית (בריטניה) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"אנגלית (ארה\"ב) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"ספרדית (ארצות הברית) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (מסורתית)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"אנגלית (בריטניה)‏ (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"אנגלית (ארה\"ב) ‏(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"ספרדית (ארה\"ב) ‏(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (מסורתית)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (קירילית)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (לטינית)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"ללא שפה (אלף-בית)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"‏אלף-בית (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"‏אלף-בית (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"קריאה של קובץ מילון חיצוני"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"אין קובצי מילונים בתיקיית ההורדות"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"בחירת קובץ מילון להתקנה"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"האם באמת להתקין את הקובץ הזה עבור <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"האם אתה באמת רוצה להתקין את הקובץ הזה עבור <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"אירעה שגיאה"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"צור מילון אנשי קשר"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"מחק מילון אישי"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"מחק את המילון של היסטוריית המשתמשים"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"מחק את מילון ההתאמה האישית"</string>
<string name="button_default" msgid="3988017840431881491">"ברירת מחדל"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"ברוך הבא אל <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"עם הקלדת החלקה"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"רענן"</string>
<string name="last_update" msgid="730467549913588780">"עודכן לאחרונה"</string>
<string name="message_updating" msgid="4457761393932375219">"מחפש עדכונים"</string>
- <string name="message_loading" msgid="8689096636874758814">"טוען..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"טוען…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"מילון ראשי"</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="delete_dict" msgid="756853268088330054">"מחק"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"‏לשפה הנבחרת במכשיר הנייד שלך יש מילון זמין.&lt;br/&gt; אנו ממליצים &lt;b&gt;להוריד&lt;/b&gt; את המילון ב<xliff:g id="LANGUAGE">%1$s</xliff:g> כדי לשפר את חוויית ההקלדה.&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; אנחנו ממליצים &lt;b&gt;להוריד&lt;/b&gt; את המילון ב<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> לשיפור חוויית ההקלדה.&lt;br/&gt; &lt;br/&gt; ייתכן שההורדה תארך דקה או שתיים ברשת דור שלישי. ייתכנו חיובים אם אין לך &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>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"‏הורד באמצעות Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"יש מילון זמין עבור <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"יש מילון זמין עבור <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"לחץ כדי לעיין ולהוריד"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"מוריד: הצעות ב<xliff:g id="LANGUAGE">%1$s</xliff:g> יהיו מוכנות בקרוב."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"מוריד: הצעות עבור <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> יהיו מוכנות בקרוב."</string>
<string name="version_text" msgid="2715354215568469385">"גרסה <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"הוסף"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"הוסף למילון"</string>
diff --git a/java/res/values-ja/strings-config-important-notice.xml b/java/res/values-ja/strings-config-important-notice.xml
new file mode 100644
index 000000000..03c1f48e9
--- /dev/null
+++ b/java/res/values-ja/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-ja/strings-talkback-descriptions.xml b/java/res/values-ja/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..990774e16
--- /dev/null
+++ b/java/res/values-ja/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"パスワードのキーが音声出力されるのでヘッドセットを接続してください。"</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"現在のテキスト: %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"テキストが入力されていません"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g>は<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>を<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>に修正します"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g>で自動修正が実行されます"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"キーコード: %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift有効(タップして解除)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"CapsLock有効(タップして解除)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"削除"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"記号"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"英字"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"数字"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"設定"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"タブ"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Space"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"音声入力"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"絵文字"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"検索"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"ドット"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"言語を切り替え"</string>
+ <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">"Shift有効"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"CapsLock有効"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift解除"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"記号モード"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"英数モード"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"電話モード"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"電話記号モード"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"キーボードは非表示です"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"<xliff:g id="KEYBOARD_MODE">%s</xliff:g>のキーボードを表示しています"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"日付"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"日時"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"メールアドレス"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"メッセージ"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"数値"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"自然"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"場所"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"記号"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"絵文字"</string>
+</resources>
diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index fbfd3b7f7..7d749a6a2 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"システムのデフォルト"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"連絡先の名前を候補に表示"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"連絡先の名前を使用して候補表示や自動修正を行います"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"入力候補のカスタマイズ"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"ダブルスペースピリオド"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"スペースバーをダブルタップするとピリオドとスペースを挿入できます"</string>
<string name="auto_cap" msgid="1719746674854628252">"自動大文字変換"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"ジェスチャートレイルを表示"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"動的フローティングプレビュー"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"ジェスチャーで入力候補を表示できます"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>:保存しました"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"パスワードのキーが音声出力されるのでヘッドセットを接続してください。"</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"現在のテキスト:%s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"テキストが入力されていません"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g>は<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>を<xliff:g id="CORRECTED">%3$s</xliff:g>に修正します"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g>で自動修正が実行されます"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"キーコード:%d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift有効(タップして解除)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock有効(タップして解除)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"DEL"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"記号"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"英字"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"数字"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"設定"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Space"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"音声入力"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"顔文字"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"検索"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"中点"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"言語を切り替え"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"次へ"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"前へ"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift有効"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock有効"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift解除"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"記号モード"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"英数モード"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"電話モード"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"電話記号モード"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"キーボードは非表示です"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"<xliff:g id="MODE">%s</xliff:g>のキーボードを表示しています"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"日付"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"日時"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"メールアドレス"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"メッセージ"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"数値"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"電話番号"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"テキスト"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"時刻"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"フレーズジェスチャー"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Spaceキーに指を滑らせると、ジェスチャー中にスペースを入力できます"</string>
<string name="voice_input" msgid="3583258583521397548">"音声入力キー"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"メインキーボード上"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"記号キーボード上"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"OFF"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"メインキーボードのマイク"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"記号キーボードのマイク"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"音声入力は無効です"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"有効になっている音声入力方法がありません。[言語と入力]設定をご確認ください。"</string>
<string name="configure_input_method" msgid="373356270290742459">"入力方法を設定"</string>
<string name="language_selection_title" msgid="1651299598555326750">"入力言語"</string>
<string name="send_feedback" msgid="1780431884109392046">"フィードバックを送信"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"英語 (英国)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"英語 (米国)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"スペイン語 (米国)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"英語 (英国) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"英語 (米国) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"スペイン語 (米国) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g>(伝統言語)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"英語(英国)(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"英語(米国)(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"スペイン語(米国)(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(伝統言語)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(キリル文字)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(ラテン文字)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"言語なし(アルファベット)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"アルファベット(QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"アルファベット(QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"外部辞書ファイルの読み取り"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"ダウンロードフォルダに辞書ファイルはありません"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"インストールする辞書ファイルの選択"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"この<xliff:g id="LOCALE_NAME">%s</xliff:g>のファイルをインストールしてもよろしいですか?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"この<xliff:g id="LANGUAGE_NAME">%s</xliff:g>のファイルをインストールしますか?"</string>
<string name="error" msgid="8940763624668513648">"エラーが発生しました"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"連絡先辞書のダンプ"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"単語リストのダンプ"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"ユーザー履歴辞書のダンプ"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"カスタマイズ辞書のダンプ"</string>
<string name="button_default" msgid="3988017840431881491">"デフォルト"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>へようこそ"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"新しいジェスチャー入力をお試しください"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"更新"</string>
<string name="last_update" msgid="730467549913588780">"最終更新"</string>
<string name="message_updating" msgid="4457761393932375219">"アップデートを確認しています"</string>
- <string name="message_loading" msgid="8689096636874758814">"読み込んでいます..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"読み込んでいます…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"メイン辞書"</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="delete_dict" msgid="756853268088330054">"削除"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"お使いの携帯端末で選択した言語に対応する辞書があります。&lt;br/&gt;入力機能をより快適にご利用いただくため、<xliff:g id="LANGUAGE">%1$s</xliff:g>の辞書の&lt;b&gt;ダウンロード&lt;/b&gt;をおすすめします。&lt;br/&gt; &lt;br/&gt;3G経由の場合、ダウンロードに要する時間は1~2分です。&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経由の場合、ダウンロードに要する時間は1~2分です。&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>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Wi-Fi経由でダウンロード"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"<xliff:g id="LANGUAGE">%1$s</xliff:g>の辞書を利用できます"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>の辞書を利用できます"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"押すと確認/ダウンロードできます"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"ダウンロード中: <xliff:g id="LANGUAGE">%1$s</xliff:g>の入力候補をまもなく利用できます。"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"ダウンロード中: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>の入力候補をまもなく利用できます。"</string>
<string name="version_text" msgid="2715354215568469385">"バージョン<xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"追加"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"辞書に追加"</string>
diff --git a/java/res/values-ka-rGE/strings-config-important-notice.xml b/java/res/values-ka-rGE/strings-config-important-notice.xml
new file mode 100644
index 000000000..188ac871c
--- /dev/null
+++ b/java/res/values-ka-rGE/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-ka-rGE/strings-talkback-descriptions.xml b/java/res/values-ka-rGE/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..c4fd65939
--- /dev/null
+++ b/java/res/values-ka-rGE/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"შეაერთეთ ყურსასმენი, რათა მოისმინოთ აკრეფილი პაროლის კლავიშების სახელები."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"მიმდინარე ტექსტი არის %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"ტექსტი შეყვანილი არ არის"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> შეასწორებს <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>-ს <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>-ად"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> ასრულებს ავტოკორექციას"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"კლავიატურის კოდი %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift ჩართულია (შეეხეთ გამოსართავად)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"ჩართულია Caps (შეეხეთ გამოსართავად)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"წაშლა"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"სიმბოლოები"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"ასოები"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"ნომრები"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"პარამეტრები"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab კლავიში"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"შორისი"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"ხმოვანი შეყვანა"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"სიცილაკები"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"დაბრუნება"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"ძიება"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"წერტილი"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"ენის გადართვა"</string>
+ <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">"Shift ჩართულია"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"ჩართულია Caps"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift გამორთულია"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"სიმბოლოების რეჟიმი"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"ასოების რეჟიმი"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"ტელეფონის რეჟიმი"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"ტელეფონის სიმბოლოების რეჟიმი"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"კლავიატურა დამალულია"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"ნაჩვენებია <xliff:g id="KEYBOARD_MODE">%s</xliff:g> კლავიატურა"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"თარიღი"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"თარიღი და დრო"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"ელფოსტა"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"შეტყობინებები"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"რიცხვები"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"ბუნება"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"ადგილები"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"სიმბოლოები"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"სიცილაკები"</string>
+</resources>
diff --git a/java/res/values-ka-rGE/strings.xml b/java/res/values-ka-rGE/strings.xml
index dec6b3a6b..547bf29ca 100644
--- a/java/res/values-ka-rGE/strings.xml
+++ b/java/res/values-ka-rGE/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"სისტემის ნაგულისხმევი"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"კონტაქტის სახელების შეთავაზება"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"კონტაქტებიდან სახელების გამოყენება შეთავაზებებისთვის და კორექციისთვის"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"პერსონალიზებული შეთავაზებები"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"წერტილი ორმაგი შორისით"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"შორისზე ორჯერ შეხება დაწერს წერტილს და შორისის სიმბოლოს"</string>
<string name="auto_cap" msgid="1719746674854628252">"ავტო-კაპიტალიზაცია"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"ჟესტიკულაციის კუდის ჩვენება"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"დინამიურად მოლივლივე გადახედვა"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"ჟესტიკულაციისას შეთავაზებული სიტყვის ნახვა"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : შეინახა"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"შეაერთეთ ყურსაცვამი, რათა მოისმინოთ აკრეფილი პაროლის კლავიშების სახელები."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"მიმდინარე ტექსტი არის %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"ტექსტი არ შეყვანილა"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> შეასწორებს <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>-ს <xliff:g id="CORRECTED">%3$s</xliff:g>-ად"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> ასრულებს ავტოკორექციას"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"კლავიატურის კოდი %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift ჩართულია (შეეხეთ გამოსართავად)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"ჩართულია Caps (შეეხეთ გამოსართავად)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"სიმბოლოები"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"ასოები"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"ნომრები"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"პარამეტრები"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"შორისი"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"ხმოვანი შეყვანა"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"ღიმილი"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"დაბრუნება"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"ძიება"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"წერტილი"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"ენის გადართვა"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"შემდეგი"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"წინა"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift ჩართულია"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"ჩართულია Caps"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift გამორთულია"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"სიმბოლოების რეჟიმი"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"ასოების რეჟიმი"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"ტელეფონის რეჟიმი"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"ტელეფონის სიმბოლოების რეჟიმი"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"კლავიატურა დამალულია"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"ნაჩვენებია <xliff:g id="MODE">%s</xliff:g> კლავიატურა"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"თარიღი"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"თარიღი და დრო"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"ელფოსტა"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"შეტყობინებები"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"რიცხვები"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"ტელეფონი"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"ტექსტი"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"დრო"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"ფრაზის ჟესტი"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"შეიყვანეთ შორისები ჟესტიკულაციისას შორისის კლავიშზე გასრიალებით"</string>
<string name="voice_input" msgid="3583258583521397548">"ხმოვანი შეყვანის კლავიში"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"მთავარ კლავიატურაზე"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"სიმბოლოთა კლავიატურაზე"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"გამორთვა"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"მიკროფონი მთავარ კლავიატურაზე"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"მიკროფონი სიმბოლოთა კლავიატურაზე"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"ხმოვანი შეყვანა გამორთულია"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"ხმოვანი შეყვანის მეთოდები ჩართული არ არის. შეამოწმეთ ენის &amp; შეყვანის პარამეტრები."</string>
<string name="configure_input_method" msgid="373356270290742459">"შეყვანის მეთოდების კონფიგურაცია"</string>
<string name="language_selection_title" msgid="1651299598555326750">"შეყვანის ენები"</string>
<string name="send_feedback" msgid="1780431884109392046">"უკუკავშირის გაგზავნა"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"ინგლისური (გართ. სამ.)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"ინგლისური (აშშ)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"ესპანური (აშშ)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"ინგლისური (გაერთ. სამ.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"ინგლისური (აშშ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"ესპანური (აშშ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (ტრადიციული)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"ინგლისური (გაერთ.სამ.) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"ინგლისური (აშშ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"ესპანური (აშშ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ტრადიციული)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (კირილიცა)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ლათინური)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"ენის გარეშე (ანბანი)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"ანბანი (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"ანბანი (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"გარე ლექსიკონის ფაილის წაკითხვა"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"ჩამოტვირთვების საქაღალდეში ლექსიკონის ფაილები არ არის"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"ინსტალაციისათვის აირჩიეთ ლექსიკონის ფაილი"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"ნამდვილად გსურთ ამ ფაილის <xliff:g id="LOCALE_NAME">%s</xliff:g>-ისთვის ინსტალაცია?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"ნამდვილად გსურთ ამ ფაილის <xliff:g id="LANGUAGE_NAME">%s</xliff:g>-ისთვის ინსტალაცია?"</string>
<string name="error" msgid="8940763624668513648">"წარმოიშვა შეცდომა"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"კონტაქტების საქაღალდის ამონაწერი"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"პერსონალური საქაღალდის ჩამოწერა"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"მომხმ. ისტორიის საქაღალდის ჩამოწერა"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"პერსონალიზაციის საქაღალდის ჩამოწერა"</string>
<string name="button_default" msgid="3988017840431881491">"ნაგულისხმევი"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"კეთილი იყოს თქვენი მობრძანება <xliff:g id="APPLICATION_NAME">%s</xliff:g>-ში"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"ჟესტებით წერით"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"განახლება"</string>
<string name="last_update" msgid="730467549913588780">"ბოლო განახლება"</string>
<string name="message_updating" msgid="4457761393932375219">"მიმდინარეობს განახლებების შემოწმება"</string>
- <string name="message_loading" msgid="8689096636874758814">"იტვირთება…"</string>
+ <string name="message_loading" msgid="5638680861387748936">"იტვირთება..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"მთავარი ლექსიკონი"</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="delete_dict" msgid="756853268088330054">"წაშლა"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"თქვენ მიერ მობილურ მოწყობილობაზე არჩეული ენისათვის ხელმისაწვდომია ლექსიკონი.&lt;br/&gt; გირჩევთ, &lt;b&gt;ჩამოტვირთოთ&lt;/b&gt; <xliff:g id="LANGUAGE">%1$s</xliff:g> ლექსიკონი, რათა გაიმარტივოთ ტექსტის შეყვანა.&lt;br/&gt; &lt;br/&gt; ჩამოტვირთვას შესაძლოა დაჭირდეს ერთი ან ორი წუთი 3G სისწრაფეზე. თუ ულიმიტო არ გაქვთ &lt;b&gt; მობილური ინტერნეტის ტარიფი&lt;/b&gt;.&lt;br/&amp;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; გირჩევთ, &lt;b&gt;ჩამოტვირთოთ&lt;/b&gt; <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> ლექსიკონი, რათა გაიმარტივოთ ტექსტის შეყვანა.&lt;br/&gt; &lt;br/&gt; ჩამოტვირთვას შესაძლოა დასჭირდეს ერთი ან ორი წუთი 3G სისწრაფეზე. თუ &lt;b&gt; მობილური ინტერნეტის ტარიფი&lt;/b&gt;.&lt;br/&amp;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="6514288591959117288">"<xliff:g id="LANGUAGE">%1$s</xliff:g>-ისთვის ხელმისაწვდომია ლექსიკონი"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>-სთვის ხელმისაწვდომია ლექსიკონი"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"დააჭირეთ განხილვას და ჩამოტვირთეთ"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"ჩამოტვირთვა: <xliff:g id="LANGUAGE">%1$s</xliff:g>-ის შემოთავაზებები მალე მომზადდება."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"იტვირთება: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>-ის შემოთავაზებები მალე მომზადდება."</string>
<string name="version_text" msgid="2715354215568469385">"ვერსია <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"დამატება"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"ლექსიკონში დამატება"</string>
diff --git a/java/res/values-kk/strings-talkback-descriptions.xml b/java/res/values-kk/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..13adf830d
--- /dev/null
+++ b/java/res/values-kk/strings-talkback-descriptions.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="896961781287283493">"Дауыспен айтылатын құпия сөз кілттерін есту үшін құлақаспап қосыңыз."</string>
+ <string name="spoken_current_text_is" msgid="2485723011272583845">"Ағымдағы мәтін - %s"</string>
+ <string name="spoken_no_text_entered" msgid="7479685225597344496">"Мәтін енгізілмеген"</string>
+ <!-- no translation found for spoken_auto_correct (8005997889020109763) -->
+ <skip />
+ <!-- no translation found for spoken_auto_correct_obscured (6276420476908833791) -->
+ <skip />
+ <string name="spoken_description_unknown" msgid="3197434010402179157">"Перне коды %d"</string>
+ <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift қосулы (өшіру үшін түрту)"</string>
+ <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock қосулы (өшіру үшін түрту)"</string>
+ <string name="spoken_description_delete" msgid="8740376944276199801">"Жою"</string>
+ <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Таңбалар"</string>
+ <string name="spoken_description_to_alpha" msgid="23129338819771807">"Әріптер"</string>
+ <string name="spoken_description_to_numeric" msgid="591752092685161732">"Сандар"</string>
+ <string name="spoken_description_settings" msgid="4627462689603838099">"Баптаулар"</string>
+ <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
+ <string name="spoken_description_space" msgid="2582521050049860859">"Бос орын"</string>
+ <string name="spoken_description_mic" msgid="615536748882611950">"Дауыстық енгізу"</string>
+ <string name="spoken_description_smiley" msgid="2256309826200113918">"Жымиған жүз"</string>
+ <string name="spoken_description_return" msgid="8178083177238315647">"Қалпына келтіру"</string>
+ <string name="spoken_description_search" msgid="1247236163755920808">"Іздеу"</string>
+ <string name="spoken_description_dot" msgid="40711082435231673">"Нүкте"</string>
+ <string name="spoken_description_language_switch" msgid="5507091328222331316">"Тілді ауыстыру"</string>
+ <string name="spoken_description_action_next" msgid="8636078276664150324">"Келесі"</string>
+ <string name="spoken_description_action_previous" msgid="800872415009336208">"Алдағы"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift қосылған"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock қосылған"</string>
+ <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift өшірілген"</string>
+ <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Таңбалар режимі"</string>
+ <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Әріптер режимі"</string>
+ <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Телефон режимі"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Телефон таңбалары режимі"</string>
+ <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Пернетақта жасырылған"</string>
+ <string name="announce_keyboard_mode" msgid="4729081055438508321">"Көрсетілетін <xliff:g id="MODE">%s</xliff:g> пернетақтасы"</string>
+ <string name="keyboard_mode_date" msgid="3137520166817128102">"күн"</string>
+ <string name="keyboard_mode_date_time" msgid="339593358488851072">"күн мен уақыт"</string>
+ <string name="keyboard_mode_email" msgid="6216248078128294262">"электрондық пошта"</string>
+ <string name="keyboard_mode_im" msgid="1137405089766557048">"хабар алмасу"</string>
+ <string name="keyboard_mode_number" msgid="7991623440699957069">"нөмір"</string>
+ <string name="keyboard_mode_phone" msgid="6851627527401433229">"телефон"</string>
+ <string name="keyboard_mode_text" msgid="6479436687899701619">"мәтін"</string>
+ <string name="keyboard_mode_time" msgid="4381856885582143277">"уақыт"</string>
+ <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+</resources>
diff --git a/java/res/values-kk/strings.xml b/java/res/values-kk/strings.xml
index 947ff2fe9..83ac0daf7 100644
--- a/java/res/values-kk/strings.xml
+++ b/java/res/values-kk/strings.xml
@@ -73,58 +73,9 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Қимыл қадамын көрсету"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Динамикалық қалқымалы қарап шығу"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Қимылдау кезінде ұсынылған сөзді көру"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Сақталды"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Дауыспен айтылатын құпия сөз кілттерін есту үшін құлақаспап қосыңыз."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Ағымдағы мәтін - %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Мәтін енгізілмеген"</string>
- <!-- no translation found for spoken_auto_correct (8005997889020109763) -->
- <skip />
- <!-- no translation found for spoken_auto_correct_obscured (6276420476908833791) -->
- <skip />
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Перне коды %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift қосулы (өшіру үшін түрту)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock қосулы (өшіру үшін түрту)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Жою"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Таңбалар"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Әріптер"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Сандар"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Баптаулар"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Бос орын"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Дауыстық енгізу"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Жымиған жүз"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Қалпына келтіру"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Іздеу"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Нүкте"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Тілді ауыстыру"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Келесі"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Алдағы"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift қосылған"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock қосылған"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift өшірілген"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Таңбалар режимі"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Әріптер режимі"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Телефон режимі"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Телефон таңбалары режимі"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Пернетақта жасырылған"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Көрсетілетін <xliff:g id="MODE">%s</xliff:g> пернетақтасы"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"күн"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"күн мен уақыт"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"электрондық пошта"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"хабар алмасу"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"нөмір"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"телефон"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"мәтін"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"уақыт"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="8244483979855138643">"Фраза қимылы"</string>
+ <string name="gesture_space_aware_summary" msgid="3226298212755100667">"Бос орын пернесін жанау арқылы қимылдар барысында бос орындарды енгізу"</string>
<string name="voice_input" msgid="3583258583521397548">"Дауыстық енгізу пернесі"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Негізгі пернетақтада"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Таңбалар пернетақтасында"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Өшірулі"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Негізгі пернетақтадағы Mic"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Таңбалар пернетақтасындағы Mic"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Дауыстық енгізу өшірілген"</string>
<string name="configure_input_method" msgid="373356270290742459">"Енгізу әдістерін теңшеу"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Енгізу тілдері"</string>
<string name="send_feedback" msgid="1780431884109392046">"Кері байланыс жіберу"</string>
diff --git a/java/res/values-km-rKH/donottranslate.xml b/java/res/values-km-rKH/donottranslate-config-spacing-and-punctuations.xml
index a9893feec..a9893feec 100644
--- a/java/res/values-km-rKH/donottranslate.xml
+++ b/java/res/values-km-rKH/donottranslate-config-spacing-and-punctuations.xml
diff --git a/java/res/values-km-rKH/strings-config-important-notice.xml b/java/res/values-km-rKH/strings-config-important-notice.xml
new file mode 100644
index 000000000..9d694db74
--- /dev/null
+++ b/java/res/values-km-rKH/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-km-rKH/strings-talkback-descriptions.xml b/java/res/values-km-rKH/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..76bc35f84
--- /dev/null
+++ b/java/res/values-km-rKH/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"ដោត​កាស ដើម្បី​ស្ដាប់​ពាក្យ​សម្ងាត់​ដែល​និយាយ​​ឮ​ៗ។"</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"អត្ថបទ​បច្ចុប្បន្ន​គឺ %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"គ្មាន​អត្ថបទ​​​បាន​បញ្ចូល"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> កែ <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> ទៅ​ជា <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> អនុវត្ត​ការ​កែ​ស្វ័យ​ប្រវត្តិ"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"កូដ​គ្រាប់​ចុច %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"បើក Shift (​ប៉ះ​ដើម្បី​បិទ)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"បើក Caps lock (ប៉ះ​​ដើម្បី​បិទ)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"លុប"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"និមិត្តសញ្ញា"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"អក្សរ"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"លេខ"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"ការកំណត់"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"ដកឃ្លា"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"ការ​បញ្ចូល​សំឡេង"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"សញ្ញា​អារម្មណ៍"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Return"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"ស្វែងរក"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"សញ្ញា(.)"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"ប្ដូរ​​ភាសា"</string>
+ <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">"បាន​បើក Shift"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"បាន​បើក Caps lock"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"បាន​បិទ Shift"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"របៀប​និមិត្ត​សញ្ញា"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"របៀប​អក្សរ"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"របៀប​ទូរស័ព្ទ"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"​របៀប​និមិត្ត​សញ្ញា​ទូរស័ព្ទ"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"បាន​លាក់​ក្ដារចុច"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"បង្ហាញ​ក្ដារ​ចុច <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"កាលបរិច្ឆេទ"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"កាល​បរិច្ឆេទ​ និង​ពេល​វេលា"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"អ៊ីមែល"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"ការ​ផ្ញើ​សារ"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"លេខ"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"ធម្មជាតិ"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"ទីកន្លែង"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"និមិត្តសញ្ញា"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"សញ្ញា​អារម្មណ៍"</string>
+</resources>
diff --git a/java/res/values-km-rKH/strings.xml b/java/res/values-km-rKH/strings.xml
index 86ecc5e10..519aa44d0 100644
--- a/java/res/values-km-rKH/strings.xml
+++ b/java/res/values-km-rKH/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"លំនាំ​ដើម​​​ប្រព័ន្ធ"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"ស្នើ​ឈ្មោះ​ទំនាក់ទំនង"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"ប្រើ​ឈ្មោះ​ពី​ទំនាក់ទំនង​សម្រាប់​ការ​​ស្នើ និង​​​កែ"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"ការ​ស្នើ​ផ្ទាល់​ខ្លួន"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"រយៈ​ពេល​ចុច​ដកឃ្លា​ពីរដង"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"ប៉ះ​ដកឃ្លា​ពីរ​​ដង​បញ្ចូល​​​រយៈ​ពេល​ដែល​អនុវត្ត​តាម​ដកឃ្លា"</string>
<string name="auto_cap" msgid="1719746674854628252">"ការ​សរសេរ​ជា​អក្សរ​ធំ​​ស្វ័យប្រវត្តិ"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"បង្ហាញ​ដាន​កាយវិការ"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"មើល​ការ​​អណ្ដែត​ដែល​មាន​ចលនា​ជា​មុន"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"​មើល​ពាក្យ​​​ដែល​បាន​ស្នើ​​​ខណៈ​ពេល​កំពុង​ធ្វើ​កាយ​វិការ"</string>
- <string name="added_word" msgid="8993883354622484372">"បាន​រក្សាទុក <xliff:g id="WORD">%s</xliff:g> ៖"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"ដោត​កាស ដើម្បី​ស្ដាប់​ពាក្យ​សម្ងាត់។"</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"អត្ថបទ​បច្ចុប្បន្ន​គឺ %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"គ្មាន​អត្ថបទ​​​បាន​បញ្ចូល"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> កែ <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> ទៅ <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> អនុវត្ត​ការ​កែ​ដោយស្វ័យប្រវត្តិ"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"កូដ​គ្រាប់​ចុច %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"បើក Shift (​ប៉ះ​ដើម្បី​បិទ)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"បើក Caps lock (ប៉ះ​​ដើម្បី​បិទ)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"និមិត្ត​សញ្ញា"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"អក្សរ"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"លេខ"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"ការ​កំណត់"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"ដកឃ្លា"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"បញ្ចូលសំឡេង"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"មុខ​ញញឹម"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"ស្វែងរក"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Dot"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"ប្ដូរ​​ភាសា"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"បន្ទាប់"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"មុន"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"បាន​បើក Shift"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"បាន​បើក Caps lock"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"បាន​បិទ Shift"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"របៀប​និមិត្តសញ្ញា"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"របៀប​អក្សរ"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"របៀប​ទូរស័ព្ទ"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"​របៀប​និមិត្ត​សញ្ញា​ទូរស័ព្ទ"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"បាន​លាក់​ក្ដារចុច"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"បង្ហាញ​ក្ដារ​ចុច <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"កាលបរិច្ឆេទ"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"កាល​បរិច្ឆេទ​ និង​ពេល​វេលា"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"អ៊ីមែល"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"​ផ្ញើ​សារ"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"លេខ"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"ទូរស័ព្ទ"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"អត្ថបទ"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"ពេលវេលា"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"កាយវិការ​​ឃ្លា"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"បញ្ចូល​​ដកឃ្លា​​​អំឡុង​​​កាយវិការ​ ដោយ​រំកិល​ទៅ​គ្រាប់​ចុច​ដកឃ្លា"</string>
<string name="voice_input" msgid="3583258583521397548">"គ្រាប់​ចុច​បញ្ចូល​​សំឡេង"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"នៅ​លើ​ក្ដារចុច​ចម្បង"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"នៅ​លើ​ក្ដារចុច​​និមិត្ត​សញ្ញា"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"បិទ"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"មីក្រូហ្វូន​នៅ​លើ​​ក្ដារចុច​ចម្បង"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"មីក្រូហ្វូន​នៅ​លើ​​ក្ដារចុច​និមិត្ត​សញ្ញា"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"បាន​បិទ​ការ​បញ្ចូល​សំឡេង"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"គ្មាន​វិធីសាស្ត្រ​បញ្ចូល​សំឡេង​បាន​បើក។ ពិនិត្យ​មើល​ការ​កំណត់​ភាសា &amp; ការ​បញ្ចូល។"</string>
<string name="configure_input_method" msgid="373356270290742459">"កំណត់​រចនាសម្ព័ន្ធ​វិធីសាស្ត្រ​បញ្ចូល"</string>
<string name="language_selection_title" msgid="1651299598555326750">"បញ្ចូល​ភាសា"</string>
<string name="send_feedback" msgid="1780431884109392046">"ផ្ញើ​មតិ​អ្នក​ប្រើ"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"អង់គ្លេស (​អង់គ្លេស)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"អង់គ្លេស (សហរដ្ឋ​អាមេរិក)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"អេស្ប៉ាញ (សហរដ្ឋ​អាមេរិក​)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"អង់គ្លេស (ចក្រភព​អង់គ្លេស) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"អង់គ្លេស (អាមេរិក) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"អេស្ប៉ាញ (អាមេរិក​) ( <xliff:g id="LAYOUT">%s</xliff:g> )"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (អក្សរ​ពេញ​)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"អង់គ្លេស (ចក្រភព​អង់គ្លេស) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"អង់គ្លេស (អាមេរិក) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"អេស្ប៉ាញ (អាមេរិក) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (អក្សរ​ពេញ)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ស៊ីរី)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ឡាតាំង)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"គ្មាន​ភាសា (អក្សរ​ក្រម)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"តាម​លំដាប់​អក្សរក្រម (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"តាម​លំដាប់​អក្សរក្រម (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"អាន​ឯកសារ​វចនានុក្រម​ខាង​ក្រៅ"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"គ្មាន​ឯកសារ​វចនានុក្រម​នៅ​ក្នុង​ថត​ទាញ​យក"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"ជ្រើស​ឯកសារ​វចនានុក្រម​ ដើម្បី​ដំឡើង"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"ពិត​ជា​ដំឡើង​ឯកសារ​នេះ​សម្រាប់ <xliff:g id="LOCALE_NAME">%s</xliff:g> ឬ?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"ពិត​ជា​ដំឡើង​ឯកសារ​នេះ​សម្រាប់ <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"មាន​កំហុស"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"រាយ​វចនានុក្រម​ទំនាក់ទំនង"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"បោះបង់​វចនានុក្រម​ផ្ទាល់ខ្លួន"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"បោះបង់​វចនានុក្រម​​ប្រវត្តិ​អ្នកប្រើ"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"បោះបង់​វចនានុក្រម​ផ្ទាល់ខ្លួន"</string>
<string name="button_default" msgid="3988017840431881491">"លំនាំដើម"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"សូម​ស្វាគមន៍​មក​កាន់ <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"ជាមួយ​​​ការ​វាយ​បញ្ចូល​ដោយ​ប្រើ​​​កាយវិការ"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"ផ្ទុក​ឡើងវិញ"</string>
<string name="last_update" msgid="730467549913588780">"បាន​ធ្វើ​បច្ចុប្បន្នភាព​ចុងក្រោយ"</string>
<string name="message_updating" msgid="4457761393932375219">"ពិនិត្យមើល​បច្ចុប្បន្នភាព"</string>
- <string name="message_loading" msgid="8689096636874758814">"កំពុង​ផ្ទុក..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"កំពុង​ផ្ទុក..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"វចនានុក្រម​ចម្បង"</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="delete_dict" msgid="756853268088330054">"លុប"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"ភាសា​ដែល​បាន​ជ្រើស​នៅ​លើ​ឧបករណ៍​របស់​អ្នក​មាន​វចនានុក្រម។ &lt;br/&gt; យើង​បាន​ផ្ដល់​អនុសាសន៍ &lt;b&gt;ទាញ​យក​&lt;/b&gt; <xliff:g id="LANGUAGE">%1$s</xliff:g> វចនានុក្រម ដើម្បី​ធ្វើ​ឲ្យ​ការ​វាយ​បញ្ចូល​របស់​អ្នក​ប្រសើរ​ឡើង។ &lt;br/&gt; &lt;br/&gt; ការ​ទាញ​យក​អាច​ចំណាយ​ពេល​​មួយ ឬ​ពីរ​នាទី​​​តាម 3G ។ ការ​​កាត់​លុយ​អាច​អនុវត្ត​ ប្រសិន​​​បើ​អ្នក​​បាន​​ &lt;b&gt;កំណត់​ទិន្នន័យ​គ្មាន​ដែន​កំណត់ &lt;/b&gt;.&lt;br/&gt; ប្រសិនបើ​​អ្នក​មិន​ប្រាកដ​​ថា​ទិន្នន័យ​អ្នក​​មិន​បាន​​កំណត់ យើង​បាន​ផ្ដល់​អនុសាសន៍​ដោយ​ស្វែងរក​ការ​ភ្ជាប់​​វ៉ាយហ្វាយ ដើម្បី​ចាប់ផ្ដើម​ទាញ​យក​ដោយ​ស្វ័យប្រវត្តិ។&lt;br/&gt; &lt;br/&gt; ព័ត៌មាន​ជំនួយ៖ អ្នក​អាច​ទាញ​យក និង​លុប​​វចនានុក្រម​​ដោយ​ចូល​ទៅ​ &lt;b&gt;ភាសា&amp; បញ្ចូល&lt;/b&gt;​នៅ​ក្នុង​ម៉ឺនុយ &lt;b&gt;ការ​កំណត់ &lt;/b&gt; របស់​ឧបករណ៍​ចល័ត។"</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"ភាសា​ដែល​បាន​ជ្រើស​នៅ​លើ​ឧបករណ៍​ចល័ត​មាន​វចនានុក្រម​អាច​ប្រើ​បាន។&lt;br/&gt; យើង​ផ្ដល់​អនុសាសន៍​ឲ្យ &lt;b&gt;ទាញ​យក&lt;/b&gt; វចនានុក្រម​ភាសា <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> ដើម្បី​បង្កើន​បទពិសោធន៍​វាយ​បញ្ចូល​របស់​អ្នក។&lt;br/&gt; &lt;br/&gt; ការ​ទាញ​យក​អាច​ចំណាយ​ពេល​ប្រហែល​ពីរ​នាទី​នៅ​តាម 3G។ ការ​គិត​ថ្លៃ​អាច​អនុវត្ត​ប្រសិន​បើ​អ្នក​មិន​ប្រើ &lt;b&gt;ផែនការ​ទិន្នន័យ​គ្មាន​ដែន​កំណត់&lt;/b&gt;.&lt;br/&gt; បើ​អ្នក​មិន​ប្រាកដ​​ថា​ផែនការ​ណា​មួយ​ដែល​អ្នក​មាន យើង​ផ្ដល់​អនុសាសន៍​ឲ្យ​​ភ្ជាប់​វ៉ាយហ្វាយ ដើម្បី​ចាប់ផ្ដើម​ទាញ​យក​ដោយ​ស្វ័យ​ប្រវត្តិ។&lt;br/&gt; &lt;br/&gt; ជំនួយ៖ អ្នក​អាច​ទាញ​យក និង​លុប​វចនានុក្រម​ដោយ​ចូល​ទៅ​ &lt;b&gt;ភាសា &amp; ការ​បញ្ចូល&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">"ទាញ​យក​តាម​វ៉ាយហ្វាយ"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"វចនានុក្រម​​អាច​ប្រើ​បាន​​សម្រាប់ <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"វចនានុក្រម​អាច​ប្រើ​បាន​សម្រាប់ <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"ចុច​ ដើម្បី​ពិនិត្យ​មើល​ឡើង​​វិញ​ និង​ទាញ​យក"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"ទាញ​យក៖ ការ​​ស្នើ​សម្រាប់ <xliff:g id="LANGUAGE">%1$s</xliff:g> នឹង​បញ្ចប់​ឆាប់ៗ។"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"ទាញ​យក៖ ការ​ស្នើ​សម្រាប់ <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> នឹង​រួចរាល់​ក្នុង​ពេល​ឆាប់ៗ​នេះ។"</string>
<string name="version_text" msgid="2715354215568469385">"កំណែ <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"បន្ថែម"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"បន្ថែម​ទៅ​វចនានុក្រម"</string>
diff --git a/java/res/values-ko/strings-config-important-notice.xml b/java/res/values-ko/strings-config-important-notice.xml
new file mode 100644
index 000000000..47936efc3
--- /dev/null
+++ b/java/res/values-ko/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-ko/strings-talkback-descriptions.xml b/java/res/values-ko/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..6142c6a3b
--- /dev/null
+++ b/java/res/values-ko/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"비밀번호 키를 음성으로 들으려면 헤드셋을 연결하세요."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"입력한 텍스트: %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"입력한 텍스트 없음"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g>을(를) 누르면 <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>을(를) <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>(으)로 수정합니다."</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g>을(를) 누르면 자동 수정됩니다."</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"키 코드 %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift 키"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift 사용(사용하지 않으려면 탭하세요.)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps Lock 사용(사용하지 않으려면 탭하세요.)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"삭제"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"기호"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"문자"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"숫자"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"설정"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"탭"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"스페이스바"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"음성 입력"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"그림 이모티콘"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"돌아가기"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"검색"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"글머리 기호"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"언어 전환"</string>
+ <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">"Shift 사용"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock 사용"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift 사용 중지됨"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"기호 모드"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"문자 모드"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"다이얼 모드"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"전화 기호 모드"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"키보드 숨김"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"<xliff:g id="KEYBOARD_MODE">%s</xliff:g> 키보드 표시"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"날짜"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"날짜 및 시간"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"이메일"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"문자 메시지"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"숫자"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"자연"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"장소"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"기호"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"이모티콘"</string>
+</resources>
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index ca10bdf52..4037abd02 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"시스템 기본값"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"주소록 이름 활용"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"추천 및 수정에 주소록의 이름 사용"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"맞춤 추천 검색어"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"더블스페이스 마침표"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"스페이스바를 두 번 탭하면 마침표와 공백 한 개가 삽입됩니다."</string>
<string name="auto_cap" msgid="1719746674854628252">"자동 대문자화"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"제스처 흔적 표시"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"동적 플로팅 미리보기"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"제스처에 따라 추천 단어 보기"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: 저장됨"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"비밀번호 키를 음성으로 들으려면 헤드셋을 연결하세요."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"입력한 텍스트: %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"입력한 텍스트 없음"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g>을(를) 누르면 <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>을(를) <xliff:g id="CORRECTED">%3$s</xliff:g>(으)로 수정합니다."</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g>을(를) 누르면 자동 수정됩니다."</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"키 코드 %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"시프트 키"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift 사용(사용하지 않으려면 탭하세요.)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock 사용(사용하지 않으려면 탭하세요.)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"삭제 키"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"기호"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"문자"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"숫자"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"설정"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"탭"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"스페이스"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"음성 입력"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"웃는 얼굴"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"리턴 키"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"검색"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"점"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"언어 전환"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"다음"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"이전"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift 사용"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps Lock 사용"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift 사용중지"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"기호 모드"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"문자 모드"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"다이얼 모드"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"전화 기호 모드"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"키보드 숨김"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"<xliff:g id="MODE">%s</xliff:g> 키보드 표시"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"날짜"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"날짜 및 시간"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"이메일"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"문자 메시지"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"숫자"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"전화번호"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"텍스트"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"시간"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"구문 동작"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"동작 중에 스페이스바 쪽으로 움직여 공백 입력"</string>
<string name="voice_input" msgid="3583258583521397548">"음성 입력 키"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"기본 키보드"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"기호 키보드"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"사용 안함"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"기본 키보드의 마이크"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"기호 키보드의 마이크"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"음성 입력이 사용 중지됨"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"사용 설정된 음성 입력 방법이 없습니다. 언어 및 입력 설정을 확인하세요."</string>
<string name="configure_input_method" msgid="373356270290742459">"입력 방법 설정"</string>
<string name="language_selection_title" msgid="1651299598555326750">"입력 언어"</string>
<string name="send_feedback" msgid="1780431884109392046">"의견 보내기"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"영어(영국)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"영어(미국)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"스페인어(미국)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"영어(영국) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"영어(미국) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"스페인어(미국)(<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g>(일반)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"영어(영국)(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"영어(미국)(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"스페인어(미국)(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(번체)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(키릴어)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(라틴어)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"언어 없음(알파벳)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"알파벳(QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"알파벳(QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"외부 사전 파일 읽기"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"다운로드 폴더에 사전 파일이 없음"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"설치할 사전 파일 선택"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"이 파일을 <xliff:g id="LOCALE_NAME">%s</xliff:g>(으)로 설치하시겠습니까?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"이 파일을 <xliff:g id="LANGUAGE_NAME">%s</xliff:g>(으)로 설치하시겠습니까?"</string>
<string name="error" msgid="8940763624668513648">"오류 발생"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"연락처 사전 덤프"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"개인 사전 덤프"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"사용자 기록 사전 덤프"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"맞춤설정 사전 덤프"</string>
<string name="button_default" msgid="3988017840431881491">"기본값"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>에 오신 것을 환영합니다."</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"제스처 타이핑 사용"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"새로고침"</string>
<string name="last_update" msgid="730467549913588780">"최종 업데이트"</string>
<string name="message_updating" msgid="4457761393932375219">"업데이트를 확인하는 중"</string>
- <string name="message_loading" msgid="8689096636874758814">"로드 중..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"로드 중..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"기본 사전"</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="delete_dict" msgid="756853268088330054">"삭제"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"기기에서 선택한 언어로 사용할 수 있는 사전이 있습니다.&lt;br/&gt; <xliff:g id="LANGUAGE">%1$s</xliff:g> 사전을 &lt;b&gt;다운로드&lt;/b&gt;하여 입력 환경을 개선해 보세요..&lt;br/&gt; &lt;br/&gt; 3G로 다운로드하는 경우 1-2분 정도 걸립니다. &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로 다운로드하는 경우 1~2분 정도 걸립니다. &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>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Wi-Fi를 통해 다운로드"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"<xliff:g id="LANGUAGE">%1$s</xliff:g> 사전을 사용할 수 있습니다."</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> 사전을 사용할 수 있습니다."</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"검토하고 다운로드하려면 누르세요."</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"다운로드 중: <xliff:g id="LANGUAGE">%1$s</xliff:g>에 대한 추천항목이 곧 준비됩니다."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"다운로드 중: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>에 대한 추천항목이 곧 준비됩니다."</string>
<string name="version_text" msgid="2715354215568469385">"버전 <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"추가"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"사전에 추가"</string>
diff --git a/java/res/values-ky/strings-talkback-descriptions.xml b/java/res/values-ky/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..f218bfebe
--- /dev/null
+++ b/java/res/values-ky/strings-talkback-descriptions.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- no translation found for spoken_use_headphones (896961781287283493) -->
+ <skip />
+ <!-- no translation found for spoken_current_text_is (2485723011272583845) -->
+ <skip />
+ <!-- no translation found for spoken_no_text_entered (7479685225597344496) -->
+ <skip />
+ <!-- no translation found for spoken_description_unknown (3197434010402179157) -->
+ <skip />
+ <!-- no translation found for spoken_description_shift (244197883292549308) -->
+ <skip />
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
+ <!-- no translation found for spoken_description_delete (8740376944276199801) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_symbol (5486340107500448969) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_alpha (23129338819771807) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_numeric (591752092685161732) -->
+ <skip />
+ <!-- no translation found for spoken_description_settings (4627462689603838099) -->
+ <skip />
+ <!-- no translation found for spoken_description_tab (2667716002663482248) -->
+ <skip />
+ <!-- no translation found for spoken_description_space (2582521050049860859) -->
+ <skip />
+ <!-- no translation found for spoken_description_mic (615536748882611950) -->
+ <skip />
+ <!-- no translation found for spoken_description_smiley (2256309826200113918) -->
+ <skip />
+ <!-- no translation found for spoken_description_return (8178083177238315647) -->
+ <skip />
+ <!-- no translation found for spoken_description_dot (40711082435231673) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_on (5700440798609574589) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_locked (593175803181701830) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_off (657219998449174808) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_symbol (7183343879909747642) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_alpha (3528307674390156956) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_phone (6520207943132026264) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_phone_shift (5499629753962641227) -->
+ <skip />
+</resources>
diff --git a/java/res/values-ky/strings.xml b/java/res/values-ky/strings.xml
index e30c4b965..3758c2df1 100644
--- a/java/res/values-ky/strings.xml
+++ b/java/res/values-ky/strings.xml
@@ -110,76 +110,12 @@
<skip />
<!-- no translation found for bigram_prediction_summary (1747261921174300098) -->
<skip />
- <!-- no translation found for added_word (8993883354622484372) -->
- <skip />
<!-- no translation found for label_to_symbol_key (8516904117128967293) -->
<skip />
<!-- no translation found for label_to_symbol_with_microphone_key (9035925553010061906) -->
<skip />
- <!-- no translation found for spoken_use_headphones (896961781287283493) -->
- <skip />
- <!-- no translation found for spoken_current_text_is (2485723011272583845) -->
- <skip />
- <!-- no translation found for spoken_no_text_entered (7479685225597344496) -->
- <skip />
- <!-- no translation found for spoken_description_unknown (3197434010402179157) -->
- <skip />
- <!-- no translation found for spoken_description_shift (244197883292549308) -->
- <skip />
- <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
- <skip />
- <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
- <skip />
- <!-- no translation found for spoken_description_delete (8740376944276199801) -->
- <skip />
- <!-- no translation found for spoken_description_to_symbol (5486340107500448969) -->
- <skip />
- <!-- no translation found for spoken_description_to_alpha (23129338819771807) -->
- <skip />
- <!-- no translation found for spoken_description_to_numeric (591752092685161732) -->
- <skip />
- <!-- no translation found for spoken_description_settings (4627462689603838099) -->
- <skip />
- <!-- no translation found for spoken_description_tab (2667716002663482248) -->
- <skip />
- <!-- no translation found for spoken_description_space (2582521050049860859) -->
- <skip />
- <!-- no translation found for spoken_description_mic (615536748882611950) -->
- <skip />
- <!-- no translation found for spoken_description_smiley (2256309826200113918) -->
- <skip />
- <!-- no translation found for spoken_description_return (8178083177238315647) -->
- <skip />
- <!-- no translation found for spoken_description_dot (40711082435231673) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_on (5700440798609574589) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_locked (593175803181701830) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_off (657219998449174808) -->
- <skip />
- <!-- no translation found for spoken_description_mode_symbol (7183343879909747642) -->
- <skip />
- <!-- no translation found for spoken_description_mode_alpha (3528307674390156956) -->
- <skip />
- <!-- no translation found for spoken_description_mode_phone (6520207943132026264) -->
- <skip />
- <!-- no translation found for spoken_description_mode_phone_shift (5499629753962641227) -->
- <skip />
<!-- no translation found for voice_input (3583258583521397548) -->
<skip />
- <!-- no translation found for voice_input_modes_main_keyboard (3360660341121083174) -->
- <skip />
- <!-- no translation found for voice_input_modes_symbols_keyboard (7203213240786084067) -->
- <skip />
- <!-- no translation found for voice_input_modes_off (3745699748218082014) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_main_keyboard (6586544292900314339) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_symbols_keyboard (5233725927281932391) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_off (63875609591897607) -->
- <skip />
<!-- no translation found for configure_input_method (373356270290742459) -->
<skip />
<!-- no translation found for language_selection_title (1651299598555326750) -->
diff --git a/java/res/values-land/config.xml b/java/res/values-land/config.xml
index 7d93cc2ff..43ae068f2 100644
--- a/java/res/values-land/config.xml
+++ b/java/res/values-land/config.xml
@@ -18,6 +18,59 @@
*/
-->
+<!-- Configuration values for Small Phone Landscape. -->
<resources>
<bool name="config_use_fullscreen_mode">true</bool>
+
+ <!-- Preferable keyboard height in absolute scale: 1.100in -->
+ <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
+ <dimen name="config_default_keyboard_height">176.0dp</dimen>
+ <fraction name="config_min_keyboard_height">45%p</fraction>
+
+ <!-- key_height + key_bottom_gap = config_more_keys_keyboard_key_height -->
+ <dimen name="config_more_keys_keyboard_key_height">44.8dp</dimen>
+ <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+ <!-- config_more_keys_keyboard_key_height x 1.2 -->
+ <dimen name="config_more_keys_keyboard_slide_allowance">53.76dp</dimen>
+
+ <fraction name="config_keyboard_top_padding_holo">2.727%p</fraction>
+ <fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction>
+ <fraction name="config_key_vertical_gap_holo">5.368%p</fraction>
+ <fraction name="config_key_horizontal_gap_holo">1.020%p</fraction>
+ <!-- config_more_keys_keyboard_key_height x -0.5 -->
+ <dimen name="config_more_keys_keyboard_vertical_correction_holo">-22.4dp</dimen>
+ <dimen name="config_key_preview_offset_holo">1.6dp</dimen>
+
+ <fraction name="config_key_preview_text_ratio">90%</fraction>
+ <fraction name="config_key_letter_ratio">65%</fraction>
+ <fraction name="config_key_large_letter_ratio">74%</fraction>
+ <fraction name="config_key_label_ratio">40%</fraction>
+ <fraction name="config_key_hint_letter_ratio">30%</fraction>
+ <fraction name="config_key_hint_label_ratio">52%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio">40%</fraction>
+ <fraction name="config_language_on_spacebar_text_ratio">40.000%</fraction>
+ <!-- left or right padding of label alignment -->
+ <dimen name="config_key_label_horizontal_padding">8dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
+ <fraction name="config_key_letter_ratio_5row">78%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio_5row">48%</fraction>
+
+ <dimen name="config_suggestions_strip_height">36dp</dimen>
+ <dimen name="config_more_suggestions_row_height">36dp</dimen>
+ <integer name="config_max_more_suggestions_row">2</integer>
+ <fraction name="config_min_more_suggestions_width">60%</fraction>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="config_gesture_floating_preview_text_size">23dp</dimen>
+ <dimen name="config_gesture_floating_preview_text_offset">54dp</dimen>
+ <dimen name="config_gesture_floating_preview_horizontal_padding">23dp</dimen>
+ <dimen name="config_gesture_floating_preview_vertical_padding">15dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="config_emoji_keyboard_key_width">10%p</fraction>
+ <fraction name="config_emoji_keyboard_row_height">50%p</fraction>
+ <fraction name="config_emoji_keyboard_key_letter_size">54%p</fraction>
+ <integer name="config_emoji_keyboard_max_page_key_count">20</integer>
</resources>
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
deleted file mode 100644
index c97e68f11..000000000
--- a/java/res/values-land/dimens.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
- <!-- Preferable keyboard height in absolute scale: 1.100in -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">176.0dp</dimen>
- <fraction name="minKeyboardHeight">45%p</fraction>
- <!-- key_height + key_bottom_gap = popup_key_height -->
- <dimen name="popup_key_height">44.8dp</dimen>
-
- <fraction name="keyboard_top_padding_gb">1.818%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
- <fraction name="key_bottom_gap_gb">5.941%p</fraction>
- <fraction name="key_horizontal_gap_gb">0.997%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">2.727%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
- <fraction name="key_bottom_gap_holo">5.368%p</fraction>
- <fraction name="key_horizontal_gap_holo">1.020%p</fraction>
-
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_padding">8dp</dimen>
-
- <fraction name="key_letter_ratio">65%</fraction>
- <fraction name="key_large_letter_ratio">74%</fraction>
- <fraction name="key_label_ratio">40%</fraction>
- <fraction name="key_hint_letter_ratio">30%</fraction>
- <fraction name="key_hint_label_ratio">52%</fraction>
- <fraction name="key_uppercase_letter_ratio">40%</fraction>
- <fraction name="key_preview_text_ratio">90%</fraction>
- <fraction name="spacebar_text_ratio">40.000%</fraction>
- <dimen name="key_preview_offset_gb">0.0dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">3.20%p</fraction>
- <fraction name="key_letter_ratio_5row">78%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">48%</fraction>
-
- <dimen name="key_preview_offset_holo">1.6dp</dimen>
- <!-- popup_key_height x -0.5 -->
- <dimen name="more_keys_keyboard_vertical_correction_holo">-22.4dp</dimen>
-
- <dimen name="suggestions_strip_height">36dp</dimen>
- <dimen name="more_suggestions_row_height">36dp</dimen>
- <integer name="max_more_suggestions_row">2</integer>
- <fraction name="min_more_suggestions_width">60%</fraction>
- <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- popup_key_height x 1.2 -->
- <dimen name="more_keys_keyboard_slide_allowance">53.76dp</dimen>
- <!-- popup_key_height x -1.0 -->
- <dimen name="more_keys_keyboard_vertical_correction_gb">-44.8dp</dimen>
-
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">23dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">54dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">23dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">15dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">10%p</fraction>
- <fraction name="emoji_keyboard_row_height">50%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">54%p</fraction>
- <integer name="emoji_keyboard_max_key_count">20</integer>
-
-</resources>
diff --git a/java/res/values-land/keyboard-heights.xml b/java/res/values-land/keyboard-heights.xml
index 670be3329..d57f96be3 100644
--- a/java/res/values-land/keyboard-heights.xml
+++ b/java/res/values-land/keyboard-heights.xml
@@ -33,7 +33,5 @@
<!-- Preferable keyboard height in absolute scale: 45.0mm -->
<!-- Xoom -->
<item>HARDWARE=stingray,265.4378</item>
- <!-- Default value for unknown device: empty string -->
- <item>,</item>
</string-array>
</resources>
diff --git a/java/res/values-land/setup-dimens-small-phone-land.xml b/java/res/values-land/setup-dimens-small-phone-land.xml
index 088e6562a..de93eee08 100644
--- a/java/res/values-land/setup-dimens-small-phone-land.xml
+++ b/java/res/values-land/setup-dimens-small-phone-land.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">18sp</dimen>
<dimen name="setup_step_bullet_text_size">18sp</dimen>
<dimen name="setup_step_triangle_indicator_height">18dp</dimen>
- <dimen name="setup_step_indicator_height">18dp</dimen>
<dimen name="setup_step_title_text_size">18sp</dimen>
<dimen name="setup_step_instruction_text_size">14sp</dimen>
<dimen name="setup_step_action_text_size">16sp</dimen>
diff --git a/java/res/values-lo-rLA/donottranslate.xml b/java/res/values-lo-rLA/donottranslate-config-spacing-and-punctuations.xml
index a9893feec..a9893feec 100644
--- a/java/res/values-lo-rLA/donottranslate.xml
+++ b/java/res/values-lo-rLA/donottranslate-config-spacing-and-punctuations.xml
diff --git a/java/res/values-lo-rLA/strings-config-important-notice.xml b/java/res/values-lo-rLA/strings-config-important-notice.xml
new file mode 100644
index 000000000..7880ad158
--- /dev/null
+++ b/java/res/values-lo-rLA/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-lo-rLA/strings-talkback-descriptions.xml b/java/res/values-lo-rLA/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..681a21370
--- /dev/null
+++ b/java/res/values-lo-rLA/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"ສຽບ​ສາຍຫູຟັງ ເພື່ອ​ຟັງສຽງ​ລະຫັດຜ່ານ​ທີ່ຈະຖືກ​ເວົ້າອອກມາ."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"ຂໍ້ຄວາມ​ປັດຈຸບັນ​ແມ່ນ %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"ບໍ່ມີ​ການໃສ່​ຂໍ້ຄວາມ"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> ແກ້​ໄຂ​ <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> ເປັນ <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> ດຳ​ເນີນ​ການ​ແກ້​ໄຂ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"ລະຫັດ​ກະແຈ %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift ເປີດ​ນຳໃຊ້ຢູ່ (ກົດ​ເພື່ອ​ປິດນຳໃຊ້)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock ເປີດຢູ່ (ກົດ​ເພື່ອ​ປິດນຳໃຊ້)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"ລຶບ"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"ສັນຍາລັກ"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"ໂຕອັກ​ສອນ"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"ໂຕເລກ"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"​ການ​ຕັ້ງ​ຄ່າ"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"ແຖບ"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"ຍະຫວ່າງ"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"ການປ້ອນ​ຂໍ້ມູນ​ດ້ວຍສຽງ"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"ອີໂມຈິ"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"ກັບຄືນ"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"ຊອກຫາ"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"ຈ້ຳ"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"ສະລັບ​ພາສາ"</string>
+ <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">"Shift ເປີດ​ນຳໃຊ້ຢູ່"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock ເປີດນຳໃຊ້ຢູ່"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift ປິດ​ນຳໃຊ້ຢູ່"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"ໂຫມດ​ສັນຍາລັກ"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"ໂຫມດ​ໂຕອັກ​ສອນ"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"ໂຫມດ​ໂທລະສັບ"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"ໂຫມດ​ສັນຍາລັກ​ໂທລະສັບ"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"ເຊື່ອງ​ແປ້ນພິມ​ໄວ້​ແລ້ວ"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"ກຳ​ລັງ​ສະ​ແດງແປ້ນ​ພິມ <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"ວັນທີ"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"ວັນ​ທີ​ແລະ​ເວ​ລາ"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"ອີ​ເມວ"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"ຂໍ້ຄວາມ"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"ໂຕເລກ"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"ທຳມະຊາດ"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"ສະຖານທີ່"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"ສັນຍາລັກ"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"​ອີ​ໂມ​ຕິ​ຄອນ"</string>
+</resources>
diff --git a/java/res/values-lo-rLA/strings.xml b/java/res/values-lo-rLA/strings.xml
index a4dbc2de2..76fe5e042 100644
--- a/java/res/values-lo-rLA/strings.xml
+++ b/java/res/values-lo-rLA/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"ຄ່າເລີ່ມຕົ້ນຂອງລະບົບ"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"ແນະນຳລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"ໃຊ້ຊື່ຈາກລາຍຊື່ຜູ່ຕິດຕໍ່ສຳລັບການແນະນຳ ແລະ ການຊ່ວຍແກ້ຄຳ"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"ຄຳແນະນຳຕາມການນຳໃຊ້ຂອງທ່ານ"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"ຍະຫວ່າງສອງເທື່ອເພື່ອໃສ່ຈ້ຳເມັດ"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"ກົດທີ່ປຸ່ມຍະຫວ່າງສອງເທື່ອເພື່ອໃສ່ຈ້ຳເມັດແລ້ວຕາມດ້ວຍການຍະຫວ່າງ"</string>
<string name="auto_cap" msgid="1719746674854628252">"ເຮັດໂຕພິມໃຫຍ່ອັດຕະໂນມັດ"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"ສະແດງຫາງຂອງ Gesture"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"ມີຄຳຕົວຢ່າງລອຍຂຶ້ນມາ"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"ເບິ່ງຄຳທີ່ຖືກແນະນຳໃນເວລາທີ່ກຳລັງຊີ້"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : ບັນທຶກແລ້ວ"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"ສຽບສາຍຫູຟັງເພື່ອຟັງລະຫັດຜ່ານ."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"ຂໍ້ຄວາມປະຈຸບັນແມ່ນ %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"ບໍ່ມີການໃສ່ຂໍ້ຄວາມ"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> ແກ້ໄຂ <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> ເປັນ <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> ປະຕິບັດການແປງຄຳຜິດອັດຕະໂນມັດ"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"ລະຫັດກະແຈ %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift ເປີດນຳໃຊ້ຢູ່ (ກົດເພື່ອປິດນຳໃຊ້)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock ເປີດຢູ່ (ກົດເພື່ອປິດນຳໃຊ້)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"ລຶບ"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"ສັນຍາລັກ"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"ໂຕອັກ​ສອນ"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"ໂຕເລກ"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"ການຕັ້ງຄ່າ"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"ແທັບ"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"ຍະຫວ່າງ"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"ການປ້ອນຂໍ້ມູນດ້ວຍສຽງ"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"ຮອຍຍິ້ມ"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"ກັບຄືນ"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"ຊອກຫາ"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"ຈ້ຳ"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"ສະລັບພາສາ"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"ຕໍ່ໄປ"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"ກ່ອນໜ້າ"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift ເປີດນຳໃຊ້ຢູ່"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock ເປີດນຳໃຊ້ຢູ່"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift ປິດນຳໃຊ້ຢູ່"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"ໂຫມດສັນຍາລັກ"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"ໂຫມດ​ໂຕອັກ​ສອນ"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"ໂຫມດໂທລະສັບ"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"ໂຫມດສັນຍາລັກໂທລະສັບ"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"ແປ້ນ​ພິມ​ເຊື່ອງ​ໄວ້"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"ກຳລັງສະແດງແປ້ນພິມ <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"ວັນທີ"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"ວັນ​ທີ​ແລະ​ເວ​ລາ"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"email"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"ຂໍ້ຄວາມ"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"ໂຕເລກ"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"ໂທລະສັບ"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"ຂໍ້ຄວາມ"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"ເວລາ"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"ການສະແດງທ່າທາງດ້ວຍປະໂຫຍກ"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"ໃສ່ຍະຫວ່າງເຂົ້າໄປໃນຂະນະທີ່ສະແດງທ່າທາງ ໂດຍການເລື່ອນໄປທີ່ປຸ່ມຍະຫວ່າງ"</string>
<string name="voice_input" msgid="3583258583521397548">"ປຸ່ມປ້ອນຂໍ້ມູນດ້ວຍສຽງ"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"ແປ້ນພິມຫຼັກ"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"ໃນແປ້ນພິມສັນຍາລັກ"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"ປິດ"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"ໄມໃນແປ້ນພິມຫຼັກ"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"ໄມໃນແປ້ນພິມສັນຍາລັກ"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"ການປ້ອນຂໍ້ມູນດ້ວຍສຽງປິດນຳໃຊ້ຢູ່"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"ບໍ່ມີວິທີການປ້ອນສຽງເປີດນໍາໃຊ້. ໃຫ້ກວດເບິ່ງການຕັ້ງຄ່າໃນເມນູ ພາສາ &amp; ການປ້ອນຂໍ້ມູນ."</string>
<string name="configure_input_method" msgid="373356270290742459">"ຕັ້ງຄ່າຮູບແບບການປ້ອນຂໍ້ມູນ"</string>
<string name="language_selection_title" msgid="1651299598555326750">"ພາສາການປ້ອນຂໍ້ມູນ"</string>
<string name="send_feedback" msgid="1780431884109392046">"ສົ່ງຄຳຕິຊົມ"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"ອັງກິດ (ສະຫະລາດຊະອານາຈັກ)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"ອັງກິດ (ສະຫະລັດຯ)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"ສະເປນ (ອາເມລິກາ)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"ພາສາອັງກິດ (ອັງກິດ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"ອັງກິດ (ອາເມລິກາ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"ແອສປາໂຍນ (ສະ​ຫະ​ລັດ​) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (ດັ້ງເດີມ)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"ອັງ​ກິດ (ສະ​ຫະ​ລາດ​ຊະ​ອາ​ນາ​ຈັກ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"ອັງ​ກິດ (ສະ​ຫະ​ລັດຯ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"ສະ​ແປນ​ນິດ (ສະ​ຫະ​ລັດຯ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ດັ້ງ​ເດີມ)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ຊິ​ຣິວ​ລິກ)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ລາ​ຕິນ)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"ບໍ່ມີພາສາ (ໂຕອັກສອນ)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"ໂຕອັກສອນ (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"ໂຕອັກສອນ (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"ອ່ານໄຟລ໌ວັດຈະນານຸກົມພາຍນອກ"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"ບໍ່ມີໄຟລ໌ວັດຈະນານຸກົມໃນໂຟນເດີຂອງການດາວໂຫລດ"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"ເລືອກໄຟລ໌ວັດຈະນານຸກົມເພື່ອຕິດຕັ້ງ"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"ຕິດຕັ້ງໄຟລ໌ນີ້ສຳລັບ <xliff:g id="LOCALE_NAME">%s</xliff:g> ແທ້ບໍ່?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"ຕິດ​ຕັ້ງ​ໄຟ​ລ໌​ນີ້​ສຳ​ລັບ <xliff:g id="LANGUAGE_NAME">%s</xliff:g> ແທ້ບໍ່??"</string>
<string name="error" msgid="8940763624668513648">"ມີຂໍ້ຜິດພາດເກີດຂຶ້ນ"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"​​ດຶງ​ຂໍ້​ມູນ​ວັດ​ຈະ​ນາ​ນຸ​ກົມ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"ເທຂໍ້ມູນວັດຈະນານຸກົມສ່ວນໂຕ"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"ເທຂໍ້ມູນວັດຈະນານຸກົມປະຫວັດຜູ່ໃຊ້"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"ເທຂໍ້ມູນວັດຈະນານຸກົມຄວາມເປັນໂຕຕົນ"</string>
<string name="button_default" msgid="3988017840431881491">"ຄ່າເລີ່ມຕົ້ນ"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"ຍິນ​ດີ​ຕ້ອນ​ຮັບສູ່ <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"ດ້ວຍການພິມແບບ Gesture"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"ດຶງຂໍ້ມູນໃຫມ່"</string>
<string name="last_update" msgid="730467549913588780">"ອັບເດດຫຼ້າສຸດ"</string>
<string name="message_updating" msgid="4457761393932375219">"ກຳລັງກວດການອັບເດດ"</string>
- <string name="message_loading" msgid="8689096636874758814">"ກຳລັງໂຫລດ..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"ກຳລັງໂຫຼດ..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"ວັດຈະນານຸກົມຫຼັກ"</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="delete_dict" msgid="756853268088330054">"ລຶບ"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"ພາສາທີ່ທ່ານເລືອກໃຊ້ໃນອຸປະກອນຂອງທ່ານນັ້ນ ມີວັດຈະນານຸກົມໃຫ້ໃຊ້ພ້ອມ.&lt;br/&gt; ພວກເຮົາແນະນຳໃຫ້ &lt;b&gt;ດາວໂຫລດ&lt;/b&gt; <xliff:g id="LANGUAGE">%1$s</xliff:g> ວັດຈະນານຸກົມດັ່ງກ່າວ ເພື່ອເພີ່ມປະສົບການໃນການພິມຂອງທ່ານ.&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;ພາສາ &amp; ການປ້ອນຂໍ້ມູນ&lt;/b&gt; ຢູ່ໃນເມນູ &lt;b&gt;ການຕັ້ງຄ່າ&lt;/b&gt; ຂອງອຸປະກອນພົກພາຂອງທ່ານ."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"ພາ​ສາ​ທີ່​ເລືອກ​ໃນ​ອຸ​ປະ​ກອນ​ມື​ຖື​ຂອງ​ທ່າ​ນັ້ນ​ມີ​ວັດ​ຈະ​ນາ​ນຸ​ກົມ​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້.&lt;br/&gt; ພວ​ກ​ເຮົາ​ຂໍ​ແນະ​ນຳ​ໃຫ້ &lt;b&gt;ດາວ​ໂຫລດ&lt;/b&gt; ວັດ​ຈ​ະ​ນາ​ນຸ​ກົມ <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> ເພື່ອ​ປັບ​ປຸງ​ປະ​ສົບ​ການ​ໃນ​ການ​ພິມ​ຂອງ​ທ່ານ.&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;ພາ​ສາ &amp; ການ​ປ້ອນ​ຂໍ້​ມູນ&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>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"ດາວ​ໂຫລດຜ່ານ Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"ວັດຈະນານຸກົມສາມາດໃຊ້ໄດ້ກັບ <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"ມີ​ວັດ​ຈະ​ນາ​ນຸ​ກົມ​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້​ກັບ <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"ກົດທີ່ກວດຄືນ ແລະ ດາວໂຫລດ"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"ກຳລັງດາວໂຫລດ: ການແນະນຳສຳລັບ <xliff:g id="LANGUAGE">%1$s</xliff:g> ແລະມັນຈະພ້ອມນຳໃຊ້ໄວໆນີ້"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"ກຳ​ລັງ​ດາວ​ໂຫລດ: ການ​ແນະ​ນຳ​ສຳ​ລັບ <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> ຈະ​ພ້ອມ​ໃນ​ໄວໆ​ນີ້."</string>
<string name="version_text" msgid="2715354215568469385">"ເວີຊັນ <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"ເພີ່ມ"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"ເພີ່ມໄປທີ່ວັດຈະນານຸກົມ"</string>
diff --git a/java/res/values-lt/strings-config-important-notice.xml b/java/res/values-lt/strings-config-important-notice.xml
new file mode 100644
index 000000000..93c66e0e3
--- /dev/null
+++ b/java/res/values-lt/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Mokytis iš ryšių ir įvestų duomenų, siekiant pagerinti pasiūlymus"</string>
+</resources>
diff --git a/java/res/values-lt/strings-talkback-descriptions.xml b/java/res/values-lt/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..07119cb65
--- /dev/null
+++ b/java/res/values-lt/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Prijunkite ausines, kad išgirstumėte sakomus slaptažodžio klavišus."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Dabartinis tekstas yra %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Nėra įvesto teksto"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> pataiso <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> į <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> atlieka automatinį taisymą"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Klavišo kodas %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Klavišas „Shift“"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Klavišas „Shift“ įjungtas (palieskite, kad išjungtumėte)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Įjungtos didžiosios raidės (palieskite, kad išjungtumėte)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Ištrinti"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simbolių klavišas"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Raidžių klavišas"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Skaičių klavišas"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Nustatymai"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tabuliavimo klavišas"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Tarpo klavišas"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Balso įvestis"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Jaustukai"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Grįžti"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Paieška"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Taškas"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Keisti kalbą"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Kitas"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Ankstesnis"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Klavišas „Shift“ įgalintas"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Didžiųjų raidžių klavišas įgalintas"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Klavišas „Shift“ išjungtas"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Simbolių režimas"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Raidžių režimas"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefonų numerių režimas"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefonų numerių simbolių režimas"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Klaviatūra paslėpta"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Klaviatūra rodoma <xliff:g id="KEYBOARD_MODE">%s</xliff:g> režimu"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"datos"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"datos ir laiko"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"el. pašto"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"susirašinėjimo pranešimais"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"skaičių"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefonų numerių"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"teksto"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"laiko"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Naujausi"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Žmonės"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objektai"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Gamta"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Vietos"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simboliai"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Jaustukai"</string>
+</resources>
diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml
index 1f943944c..c049a165e 100644
--- a/java/res/values-lt/strings.xml
+++ b/java/res/values-lt/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Sist. numat. nustat."</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Siūlyti kontaktų vardus"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Siūlant ir taisant naudoti vardus iš „Kontaktų“"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Suasmeninti pasiūlymai"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Tšk. ir tarp. pal. dukart"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Dukart palietus tarpo klavišą įterpiamas taškas ir tarpas."</string>
<string name="auto_cap" msgid="1719746674854628252">"Automatinis didžiųjų raidžių rašymas"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Rodyti gestų kelią"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dinaminė slankioji peržiūra"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Gestikuliuojant peržiūrėti siūlomą žodį"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: išsaugota"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Prijunkite ausines, kad išgirstumėte sakomus slaptažodžio klavišus."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Dabartinis tekstas yra %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Nėra įvesto teksto"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> pataiso „<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>“ į „<xliff:g id="CORRECTED">%3$s</xliff:g>“"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> atlieka automatinį taisymą"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Klavišo kodas %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Antrojo lygio klavišas"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Įjungtas antrasis lygis (palieskite, kad išjungtumėte)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Įjungtos didžiosios raidės (palieskite, kad išjungtumėte)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Ištrinti"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Simboliai"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Raidės"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Skaičiai"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Nustatymai"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Skirtukas"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Tarpas"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Įvestis balsu"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Šypsenėlė"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Grįžti"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Ieškoti"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Taškas"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Keisti kalbą"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Kitas"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Ankstesnis"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Įgalintas antrasis lygis"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Įgalintos didžiosios raidės"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Antrasis lygis išjungtas"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Simbolių režimas"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Raidžių režimas"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Telefono režimas"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Telefono simbolių režimas"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Klaviatūra paslėpta"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Klaviatūra rodoma <xliff:g id="MODE">%s</xliff:g> režimu"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"datos"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"datos ir laiko"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"el. pašto"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"susirašinėjimo pranešimais"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"skaičių"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefonų numerių"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"teksto"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"laiko"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Frazės gestas"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Atlikdami gestus įveskite tarpus perbraukę tarpo klavišą"</string>
<string name="voice_input" msgid="3583258583521397548">"Įvesties balsu klavišas"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Pagr. klaviatūroje"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Simbolių klaviatūr."</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Išjungta"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikrof. pagr. klav."</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikrof. simb. klav."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Balso įv. neleidž."</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nėra jokių įgalintų įvesties balsu metodų. Patikrinkite kalbos ir įvesties nustatymus."</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfigūruoti įvesties metodus"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Įvesties kalbos"</string>
<string name="send_feedback" msgid="1780431884109392046">"Siųsti atsiliepimą"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Anglų k. (JK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Anglų k. (JAV)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Ispanų k. (JAV)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Angliška (JK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Angliška (JAV) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Ispanų k. (JAV) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradicinė)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Anglų (JK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Anglų (JAV) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Ispanų (JAV) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradicinė)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (kirilica)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (lotynų)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Kalbos nėra (abėcėlė)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Abėcėlė (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Abėcėlė (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Skaityti išorinį žodyno failą"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Atsisiuntimų aplanke nėra žodyno failų"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Pasirinkite diegiamą žodyno failą"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Ar tikrai įdiegti šį failą <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Ar tikrai įdiegti šį failą <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Įvyko klaida"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Sudaryti kontaktų žodyną"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Iškelti asmeninį žodyną"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Iškelti naudotojo istorijos žodyną"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Iškelti suasmeninimo žodyną"</string>
<string name="button_default" msgid="3988017840431881491">"Numatytieji"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Sveiki! Tai „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"naudojant įvestį gestais"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Atnaujinti"</string>
<string name="last_update" msgid="730467549913588780">"Paskutinį kartą atnaujinta"</string>
<string name="message_updating" msgid="4457761393932375219">"Ieškoma naujinių"</string>
- <string name="message_loading" msgid="8689096636874758814">"Įkeliama..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Įkeliama…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Pagrindinis žodynas"</string>
<string name="cancel" msgid="6830980399865683324">"Atšaukti"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Nustatymai"</string>
<string name="install_dict" msgid="180852772562189365">"Įdiegti"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Atšaukti"</string>
<string name="delete_dict" msgid="756853268088330054">"Ištrinti"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Galimas mobiliajame įrenginyje pasirinktos kalbos žodynas.&lt;br/&gt; Rekomenduojame &lt;b&gt;atsisiųsti&lt;/b&gt; <xliff:g id="LANGUAGE">%1$s</xliff:g> žodyną, kad būtų patogiau įvesti tekstą.&lt;br/&gt; &lt;br/&gt; Atsisiuntimas per 3G turėtų trukti 1–2 min. Jei neturite &lt;b&gt;neribotų duomenų plano&lt;/b&gt;, galite būti apmokestinti.&lt;br/&gt; Jei nežinote, kokį planą turite, rekomenduojame rasti „Wi-Fi“ ryšį, kad atsisiuntimas prasidėtų automatiškai.&lt;br/&gt; &lt;br/&gt; Patarimas: galite atsisiųsti ir pašalinti žodynus mobiliojo įrenginio meniu &lt;b&gt;Nustatymai&lt;/b&gt; skiltyje &lt;b&gt;Kalba ir įvestis&lt;/b&gt;."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Galimas jūsų mobiliajame įrenginyje pasirinktos kalbos žodynas.&lt;br/&gt; Rekomenduojame &lt;b&gt;atsisiųsti&lt;/b&gt; <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> žodyną, kad patobulintumėte teksto įvedimą.&lt;br/&gt; &lt;br/&gt; Naudojant 3G ryšį atsisiuntimas užtruks vieną ar dvi minutes. Jei naudojate ne &lt;b&gt;neribotų duomenų planą&lt;/b&gt;, gali būti taikomi mokesčiai.&lt;br/&gt; Jei nesate tikri, kurį duomenų planą naudojate, rekomenduojame rasti „Wi-Fi“ ryšį, kad atsisiuntimas būtų pradėtas automatiškai.&lt;br/&gt; &lt;br/&gt; Patarimas: žodynus galite atsisiųsti ir pašalinti apsilankę mobiliojo įrenginio skiltyje &lt;b&gt;Kalba ir įvestis&lt;/b&gt;, esančioje meniu &lt;b&gt;Nustatymai&lt;/b&gt;."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Atsisiųsti dabar (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Atsisiųsti per „Wi-Fi“"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Galimas <xliff:g id="LANGUAGE">%1$s</xliff:g> žodynas"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Galimas <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> žodynas"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Paspauskite, kad peržiūrėtumėte ir atsisiųstumėte"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Atsisiunčiama. Netrukus bus galimi <xliff:g id="LANGUAGE">%1$s</xliff:g> pasiūlymai."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Atsisiunčiama. Netrukus bus galimi <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> pasiūlymai."</string>
<string name="version_text" msgid="2715354215568469385">"<xliff:g id="VERSION_NUMBER">%1$s</xliff:g> versija"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Pridėti"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Pridėti prie žodyno"</string>
diff --git a/java/res/values-lv/strings-config-important-notice.xml b/java/res/values-lv/strings-config-important-notice.xml
new file mode 100644
index 000000000..15dc4b3a1
--- /dev/null
+++ b/java/res/values-lv/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Izmantojiet saziņu un ievadītos datus, lai uzlabotu ieteikumus."</string>
+</resources>
diff --git a/java/res/values-lv/strings-talkback-descriptions.xml b/java/res/values-lv/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..eb32e9dcc
--- /dev/null
+++ b/java/res/values-lv/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Pievienojiet austiņas, lai dzirdētu paroles rakstzīmes."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Pašreizējais teksts ir %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Teksts nav ievadīts"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"Nospiežot taustiņu <xliff:g id="KEY_NAME">%1$s</xliff:g>, “<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>” tiek labots uz “<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>”."</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Taustiņam <xliff:g id="KEY_NAME">%1$s</xliff:g> ir automātiskas labošanas funkcija."</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Taustiņu kods %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Pārslēgšanas taustiņš"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Pārslēgšanas režīms ir iespējots (pieskarieties, lai atspējotu)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Burtslēgs ir iespējots (pieskarieties, lai atspējotu)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Dzēšanas taustiņš"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simboli"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Burti"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Cipari"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Iestatījumi"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tabulēšanas taustiņš"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Atstarpēšanas taustiņš"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Balss ievade"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emocijzīmes"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Ievadīšanas taustiņš"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Meklēšanas taustiņš"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Punkta aizzīme"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Valodas mainīšana"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Tālāk"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Atpakaļ"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Pārslēgšanas režīms ir iespējots"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Burtslēgs ir iespējots"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Pārslēgšanas režīms ir atspējots"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Simbolu režīms"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Burtu režīms"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Tālruņa režīms"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Tālruņa simbolu režīms"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Tastatūra ir paslēpta"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Tiek rādīts tastatūras režīms: <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"datums"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"datums un laiks"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-pasts"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"ziņojumapmaiņa"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"cipari"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"tālrunis"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"teksts"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"laiks"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Pēdējie"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Cilvēki"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objekti"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Daba"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Vietas"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simboli"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emocijzīmes"</string>
+</resources>
diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml
index 8ea24edb7..901c3486f 100644
--- a/java/res/values-lv/strings.xml
+++ b/java/res/values-lv/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Sistēmas noklusējums"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Ieteikt kontaktp. vārdus"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Izmantot kontaktpersonu vārdus kā ieteikumus un labojumus"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Personalizēti ieteikumi"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Dubultpiesk. = punkts"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Divreiz pieskaroties atst. taustiņam, ievada punktu un atstarpi."</string>
<string name="auto_cap" msgid="1719746674854628252">"Automātiska lielo burtu lietošana"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Rādīt žesta pēdas"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dinamisk. peldošais priekšsk."</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Skatiet ieteikto vārdu, veicot žestu."</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: saglabāts"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Pievienojiet austiņas, lai dzirdētu paroles rakstzīmes."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Pašreizējais teksts ir %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Nav ievadīts teksts"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"Nospiežot taustiņu <xliff:g id="KEY">%1$s</xliff:g>, “<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>” tiek labots uz “<xliff:g id="CORRECTED">%3$s</xliff:g>”."</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"Taustiņam <xliff:g id="KEY">%1$s</xliff:g> ir automātiskas labošanas funkcija."</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Taustiņu kods %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Pārslēgšanas taustiņš"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Pārslēgšanas taustiņš iespējots (pieskarieties, lai atspējotu)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Burtslēgs iespējots (pieskarieties, lai atspējotu)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Dzēšanas taustiņš"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Simboli"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Burti"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Skaitļi"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Iestatījumi"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabulēšanas taustiņš"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Atstarpes taustiņš"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Balss ievade"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smaidoša seja"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Ievadīšanas taustiņš"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Meklēt"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Punkts"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Mainīt valodu"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Nākamā"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Iepriekšējā"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Pārslēgšanas režīms iespējots"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Burtslēgs iespējots"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Pārslēgšanas režīms atspējots"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Simbolu režīms"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Burtu režīms"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Tālruņa režīms"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Tālruņa simbolu režīms"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Tastatūra ir paslēpta"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Tiek rādīts tastatūras režīms <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"datums"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"datums un laiks"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-pasts"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"ziņojumapmaiņa"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"cipari"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"tālrunis"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"teksts"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"laiks"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Frāzes žests"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Lai ievietotu atstarpi, velciet uz atstarpes taustiņu."</string>
<string name="voice_input" msgid="3583258583521397548">"Balss ievades atslēga"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Uz galv. tastatūras"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Uz simbolu tastat."</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Izslēgts"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikr.uz galv.tastat."</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikr.uz simb.tastat."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Balss iev. atspējota"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nav iespējota neviena balss ievades metode. Pārbaudiet valodas un ievades iestatījumus."</string>
<string name="configure_input_method" msgid="373356270290742459">"Ievades metožu konfigurēšana"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Ievades valodas"</string>
<string name="send_feedback" msgid="1780431884109392046">"Sūtīt atsauksmes"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Angļu valoda (Lielbritānija)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Angļu valoda (ASV)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spāņu (ASV)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Angļu (Lielbritānija) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Angļu (ASV) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spāņu (ASV) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradicionālā)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Angļu (Lielbritānija) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Angļu (ASV) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spāņu (ASV) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradicionālā)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (kirilica)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latīņu)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Nav valodas (alfabēts)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabēts (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabēts (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Ārējās vārdnīcas faila nolasīšana"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Mapē Lejupielādes nav neviena vārdnīcas faila."</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Instalējamā vārdnīcas faila atlasīšana"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Vai instalēt šo failu šādai valodai: <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Vai tiešām instalēt šo failu šādai valodai: <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Radās kļūda"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Kontaktpersonu vārdnīcas izmete"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Personiskās vārdnīcas izmete"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Lietotāja vēstures vārdnīcas izmete"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Personalizētās vārdnīcas izmete"</string>
<string name="button_default" msgid="3988017840431881491">"Noklusējums"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Laipni lūdzam pakalpojumā <xliff:g id="APPLICATION_NAME">%s</xliff:g>,"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"kurā varat izmantot ievadi ar žestiem"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Atsvaidzināt"</string>
<string name="last_update" msgid="730467549913588780">"Pēdējo reizi atjaunināts"</string>
<string name="message_updating" msgid="4457761393932375219">"Notiek pārbaude, vai ir pieejami atjauninājumi."</string>
- <string name="message_loading" msgid="8689096636874758814">"Notiek ielāde..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Notiek ielāde…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Galvenā vārdnīca"</string>
<string name="cancel" msgid="6830980399865683324">"Atcelt"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Iestatījumi"</string>
<string name="install_dict" msgid="180852772562189365">"Instalēt"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Atcelt"</string>
<string name="delete_dict" msgid="756853268088330054">"Dzēst"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Mobilajā ierīcē atlasītajai valodai ir pieejama vārdnīca.&lt;br/&gt;Ieteicams &lt;b&gt;lejupielādēt&lt;/b&gt; vārdnīcu (<xliff:g id="LANGUAGE">%1$s</xliff:g>), lai uzlabotu rakstīšanas iespējas.&lt;br/&gt;&lt;br/&gt;Lejupielāde, izmantojot 3G tīklu, ilgs dažas minūtes. Ja nelietojat &lt;b&gt;neierobežotu datu plānu&lt;/b&gt;, var tikt piemērota maksa.&lt;br/&gt;Ja nezināt, kādu datu plānu lietojat, ieteicams atrast Wi-Fi savienojumu, lai automātiski sāktu lejupielādi.&lt;br/&gt;&lt;br/&gt;Padoms. Vārdnīcas var lejupielādēt un noņemt mobilās ierīces izvēlnes &lt;b&gt;Iestatījumi&lt;/b&gt; sadaļā &lt;b&gt;Valoda un ievade&lt;/b&gt;."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Mobilajā ierīcē atlasītajai valodai ir pieejama vārdnīca.&lt;br/&gt; Ieteicams &lt;b&gt;lejupielādēt&lt;/b&gt; šo vārdnīcu (<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>), lai uzlabotu rakstīšanas iespējas.&lt;br/&gt; &lt;br/&gt; Lejupielāde, izmantojot 3G tīklu, ilgs tikai dažas minūtes. Ja nelietojat &lt;b&gt;neierobežotu datu plānu&lt;/b&gt;, var tikt piemērota maksa.&lt;br/&gt; Ja nezināt, kādu datu plānu lietojat, ieteicams atrast Wi-Fi savienojumu, lai automātiski sāktu lejupielādi.&lt;br/&gt; &lt;br/&gt; Padoms: vārdnīcas var lejupielādēt un noņemt sadaļā &lt;b&gt;Valoda un ievade&lt;/b&gt;, kas atrodas mobilās ierīces izvēlnē &lt;b&gt;Iestatījumi&lt;/b&gt;."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Lejupielādēt tūlīt (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Lejupielādēt, izmantojot Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Ir pieejama vārdnīca šādai valodai: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Ir pieejama vārdnīca šādai valodai: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Nospiediet, lai pārskatītu un lejupielādētu"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Notiek lejupielāde. Drīz būs pieejami ieteikumi šādai valodai: <xliff:g id="LANGUAGE">%1$s</xliff:g>."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Notiek lejupielāde. Drīz būs pieejami ieteikumi šādai valodai: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>."</string>
<string name="version_text" msgid="2715354215568469385">"Versija <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Pievienot"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Pievienot vārdnīcai"</string>
diff --git a/java/res/values-mk/strings-talkback-descriptions.xml b/java/res/values-mk/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..05b816ab7
--- /dev/null
+++ b/java/res/values-mk/strings-talkback-descriptions.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- no translation found for spoken_use_headphones (896961781287283493) -->
+ <skip />
+ <!-- no translation found for spoken_current_text_is (2485723011272583845) -->
+ <skip />
+ <!-- no translation found for spoken_no_text_entered (7479685225597344496) -->
+ <skip />
+ <!-- no translation found for spoken_auto_correct (8005997889020109763) -->
+ <skip />
+ <!-- no translation found for spoken_auto_correct_obscured (6276420476908833791) -->
+ <skip />
+ <!-- no translation found for spoken_description_unknown (3197434010402179157) -->
+ <skip />
+ <!-- no translation found for spoken_description_shift (244197883292549308) -->
+ <skip />
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
+ <!-- no translation found for spoken_description_delete (8740376944276199801) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_symbol (5486340107500448969) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_alpha (23129338819771807) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_numeric (591752092685161732) -->
+ <skip />
+ <!-- no translation found for spoken_description_settings (4627462689603838099) -->
+ <skip />
+ <!-- no translation found for spoken_description_tab (2667716002663482248) -->
+ <skip />
+ <!-- no translation found for spoken_description_space (2582521050049860859) -->
+ <skip />
+ <!-- no translation found for spoken_description_mic (615536748882611950) -->
+ <skip />
+ <!-- no translation found for spoken_description_smiley (2256309826200113918) -->
+ <skip />
+ <!-- no translation found for spoken_description_return (8178083177238315647) -->
+ <skip />
+ <!-- no translation found for spoken_description_search (1247236163755920808) -->
+ <skip />
+ <!-- no translation found for spoken_description_dot (40711082435231673) -->
+ <skip />
+ <!-- no translation found for spoken_description_language_switch (5507091328222331316) -->
+ <skip />
+ <!-- no translation found for spoken_description_action_next (8636078276664150324) -->
+ <skip />
+ <!-- no translation found for spoken_description_action_previous (800872415009336208) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_on (5700440798609574589) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_locked (593175803181701830) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_off (657219998449174808) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_symbol (7183343879909747642) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_alpha (3528307674390156956) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_phone (6520207943132026264) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_phone_shift (5499629753962641227) -->
+ <skip />
+ <!-- no translation found for announce_keyboard_hidden (8718927835531429807) -->
+ <skip />
+ <!-- no translation found for announce_keyboard_mode (4729081055438508321) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_date (3137520166817128102) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_date_time (339593358488851072) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_email (6216248078128294262) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_im (1137405089766557048) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_number (7991623440699957069) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_phone (6851627527401433229) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_text (6479436687899701619) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_time (4381856885582143277) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_url (1519819835514911218) -->
+ <skip />
+</resources>
diff --git a/java/res/values-mk/strings.xml b/java/res/values-mk/strings.xml
index 6f685d395..1588534c9 100644
--- a/java/res/values-mk/strings.xml
+++ b/java/res/values-mk/strings.xml
@@ -126,106 +126,8 @@
<skip />
<!-- no translation found for gesture_floating_preview_text_summary (4472696213996203533) -->
<skip />
- <!-- no translation found for added_word (8993883354622484372) -->
- <skip />
- <!-- no translation found for spoken_use_headphones (896961781287283493) -->
- <skip />
- <!-- no translation found for spoken_current_text_is (2485723011272583845) -->
- <skip />
- <!-- no translation found for spoken_no_text_entered (7479685225597344496) -->
- <skip />
- <!-- no translation found for spoken_auto_correct (8005997889020109763) -->
- <skip />
- <!-- no translation found for spoken_auto_correct_obscured (6276420476908833791) -->
- <skip />
- <!-- no translation found for spoken_description_unknown (3197434010402179157) -->
- <skip />
- <!-- no translation found for spoken_description_shift (244197883292549308) -->
- <skip />
- <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
- <skip />
- <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
- <skip />
- <!-- no translation found for spoken_description_delete (8740376944276199801) -->
- <skip />
- <!-- no translation found for spoken_description_to_symbol (5486340107500448969) -->
- <skip />
- <!-- no translation found for spoken_description_to_alpha (23129338819771807) -->
- <skip />
- <!-- no translation found for spoken_description_to_numeric (591752092685161732) -->
- <skip />
- <!-- no translation found for spoken_description_settings (4627462689603838099) -->
- <skip />
- <!-- no translation found for spoken_description_tab (2667716002663482248) -->
- <skip />
- <!-- no translation found for spoken_description_space (2582521050049860859) -->
- <skip />
- <!-- no translation found for spoken_description_mic (615536748882611950) -->
- <skip />
- <!-- no translation found for spoken_description_smiley (2256309826200113918) -->
- <skip />
- <!-- no translation found for spoken_description_return (8178083177238315647) -->
- <skip />
- <!-- no translation found for spoken_description_search (1247236163755920808) -->
- <skip />
- <!-- no translation found for spoken_description_dot (40711082435231673) -->
- <skip />
- <!-- no translation found for spoken_description_language_switch (5507091328222331316) -->
- <skip />
- <!-- no translation found for spoken_description_action_next (8636078276664150324) -->
- <skip />
- <!-- no translation found for spoken_description_action_previous (800872415009336208) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_on (5700440798609574589) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_locked (593175803181701830) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_off (657219998449174808) -->
- <skip />
- <!-- no translation found for spoken_description_mode_symbol (7183343879909747642) -->
- <skip />
- <!-- no translation found for spoken_description_mode_alpha (3528307674390156956) -->
- <skip />
- <!-- no translation found for spoken_description_mode_phone (6520207943132026264) -->
- <skip />
- <!-- no translation found for spoken_description_mode_phone_shift (5499629753962641227) -->
- <skip />
- <!-- no translation found for announce_keyboard_hidden (8718927835531429807) -->
- <skip />
- <!-- no translation found for announce_keyboard_mode (4729081055438508321) -->
- <skip />
- <!-- no translation found for keyboard_mode_date (3137520166817128102) -->
- <skip />
- <!-- no translation found for keyboard_mode_date_time (339593358488851072) -->
- <skip />
- <!-- no translation found for keyboard_mode_email (6216248078128294262) -->
- <skip />
- <!-- no translation found for keyboard_mode_im (1137405089766557048) -->
- <skip />
- <!-- no translation found for keyboard_mode_number (7991623440699957069) -->
- <skip />
- <!-- no translation found for keyboard_mode_phone (6851627527401433229) -->
- <skip />
- <!-- no translation found for keyboard_mode_text (6479436687899701619) -->
- <skip />
- <!-- no translation found for keyboard_mode_time (4381856885582143277) -->
- <skip />
- <!-- no translation found for keyboard_mode_url (1519819835514911218) -->
- <skip />
<!-- no translation found for voice_input (3583258583521397548) -->
<skip />
- <!-- no translation found for voice_input_modes_main_keyboard (3360660341121083174) -->
- <skip />
- <!-- no translation found for voice_input_modes_symbols_keyboard (7203213240786084067) -->
- <skip />
- <!-- no translation found for voice_input_modes_off (3745699748218082014) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_main_keyboard (6586544292900314339) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_symbols_keyboard (5233725927281932391) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_off (63875609591897607) -->
- <skip />
<!-- no translation found for configure_input_method (373356270290742459) -->
<skip />
<!-- no translation found for language_selection_title (1651299598555326750) -->
diff --git a/java/res/values-mn-rMN/strings-config-important-notice.xml b/java/res/values-mn-rMN/strings-config-important-notice.xml
new file mode 100644
index 000000000..386d2e789
--- /dev/null
+++ b/java/res/values-mn-rMN/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-mn-rMN/strings-talkback-descriptions.xml b/java/res/values-mn-rMN/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..7eb316775
--- /dev/null
+++ b/java/res/values-mn-rMN/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Нууц үгний дуудлагыг сонсох бол чихэвчийг залгана уу."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Одоогийн текст %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Текст оруулаагүй"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> нь <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>-г <xliff:g id="CORRECTED_WORD">%3$s</xliff:g> руу залруулна"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> авто-залруулалт хийдэг"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Товчийн код %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Шифт"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Сэлгэхийг идэвхжүүлсэн (товшиж идэвхгүйжүүлнэ үү)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Томоор бичихийг асаасан (товшиж идэвхгүйжүүлнэ үү)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Устгах"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Симбол"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Үсэгнүүд"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Тоонууд"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Тохиргоо"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Таб"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Хоосон зай"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Дуугаар оруулах"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Эможи"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Оруулах"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Хайх"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Цэг"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Хэл солих"</string>
+ <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_off" msgid="5039126122829961331">"Сэлгэхийг идэвхжүүлээгүй"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Симбол төлөв"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Үсэгнүүд төлөв"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Утасны төлөв"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Утасны символ төлөв"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Гарыг нуусан"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"<xliff:g id="KEYBOARD_MODE">%s</xliff:g> гар харуулж байна"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"огноо"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"огноо болон цаг"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"имэйл"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"зурвас"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"тоо"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Байгалийн"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Газар"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Симбол"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Эмотикон"</string>
+</resources>
diff --git a/java/res/values-mn-rMN/strings.xml b/java/res/values-mn-rMN/strings.xml
index d4175899f..4c64b3354 100644
--- a/java/res/values-mn-rMN/strings.xml
+++ b/java/res/values-mn-rMN/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Системийн үндсэн утга"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Харилцагчдын нэрс санал болгох"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Санал болгох, залруулахда Харилцагчдын нэрсээс ашиглах"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Хувийн тохиргоотой зөвлөмжүүд"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Давхар зайтай цэг"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Ардаа зайтай цэг оруулахын тулд Зай авах дээр давхар товшино уу"</string>
<string name="auto_cap" msgid="1719746674854628252">"Автоматаар томруулах"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Зангасан мөрийг харуулах"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Динамик хөвөгчөөр урьдчилан харах"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Зангах явцад санал болгож буй үгийг харах"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Хадгалагдсан"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Нууц үгний товчнуудыг чангаар уншихыг сонсохын тулд чихэвчээ залгана уу."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Одоогийн текст %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Текст оруулаагүй"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>-г <xliff:g id="CORRECTED">%3$s</xliff:g> руу залруулна"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> автоматаар залруулна"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Товчийн код %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Сэлгэх"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Сэлгэхийг идэвхжүүлсэн (товшиж идэвхгүйжүүлнэ үү)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Томоор бичихийг асаасан (товшиж идэвхгүйжүүлнэ үү)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Устгах"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Симбол"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Үсэгнүүд"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Тоонууд"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Тохиргоо"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Таб"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Хоосон зай"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Дуугаар оруулах"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Инээсэн царай"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Буцах"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Хайх"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Цэг"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Хэл солих"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Дараах"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Өмнөх"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Сэлгэхийг идэвхжүүлсэн"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Томоор бичихийг идэвхжүүлсэн"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Сэлгэхийг идэвхжүүлээгүй"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Симбол төлөв"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Үсэгнүүд төлөв"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Утасны төлөв"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Утасны символ төлөв"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Гарыг нуусан"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"<xliff:g id="MODE">%s</xliff:g> гарыг харуулж байна"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"огноо"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"огноо болон цаг"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"и"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"зурвас"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"дугаар"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"утас"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"текст"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"цаг"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Хэллэгийн зангалт"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Зангалтын явцад зай авах товчин дээр гулсуулах замаар зай оруулах"</string>
<string name="voice_input" msgid="3583258583521397548">"Дуун оруулгын товч"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Үндсэн гар дээр"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Симбол гар дээр"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Идэвхгүй"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Мик үндсэн гар дээр"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Мик симбол гар дээр"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Дуун оруулах идэвхгүйжсэн"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Ямар ч дуу оруулах хэрэглүүр идэвхжээгүй байна. Хэл болон оруулалтын тохиргоог шалгана уу."</string>
<string name="configure_input_method" msgid="373356270290742459">"Оруулах аргуудын тохиргоо"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Оруулах хэл"</string>
<string name="send_feedback" msgid="1780431884109392046">"Санал хүсэлт илгээх"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Англи (ИБ)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Англи (АНУ)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Испани (АНУ)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Англи (ИБ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Англи (АНУ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Испани (АНУ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Уламжлалт)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Англи (ИБ) ( <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g> )"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Англи (АНУ) ( <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g> )"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Испани (АНУ-ын) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (уламжлалт)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Кирилл)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Латин)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Хэл байхгүй (Цагаан толгой)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Цагаан толгой (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Цагаан толгой (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Толь бичгийн гадны файлыг унших"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Татаж авсан фолдерт толь бичгийн файл байхгүй байна"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Суулгах толь бичгийн файлыг сонгоно уу"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"<xliff:g id="LOCALE_NAME">%s</xliff:g>-д зориулсан энэ файлыг үнэхээр суулгах уу?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>-д зориулсан энэ файлыг үнэхээр суулгах уу?"</string>
<string name="error" msgid="8940763624668513648">"Алдаа гарсан"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Харилцагчдын толь бичгийг жагсаах"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Хувийн толь бичгийг хаях"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Хэрэглэгчийн түүхийн толь бичгийг хаях"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Хувийн тохиргоотой толь бичгийг хаях"</string>
<string name="button_default" msgid="3988017840431881491">"Үндсэн"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Та <xliff:g id="APPLICATION_NAME">%s</xliff:g>-д тавтай морилно уу"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"Зангаагаар бичихээр"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Дахин шинэчлэх"</string>
<string name="last_update" msgid="730467549913588780">"Сүүлд шинэчлэгдсэн"</string>
<string name="message_updating" msgid="4457761393932375219">"Шинэчлэлтийг шалгаж байна"</string>
- <string name="message_loading" msgid="8689096636874758814">"Ачаалж байна..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Ачаалж байна..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"Үндсэн толь бичиг"</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="delete_dict" msgid="756853268088330054">"Устгах"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Таны мобайль төхөөрөмж дээр сонгосон хэлэнд толь бичиг байна.&lt;br/&gt; Тус  <xliff:g id="LANGUAGE">%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;/ б&gt; бичихэд хялбар болгохыг зөвлөж байна. &lt;br/&gt; &lt;br/&gt; Татаж авахад 3G дээр нэг, хоёр минут болж магадгүй. Хэрэв та &lt;b&gt; хязгааргүй дата ашиглах эрхтэй &lt;/ б&gt; биш бол нэмэлт төлбөр гарч болно. Хэрэв та өөрийн дата ашиглалтын эрхийг сайн мэдэхгүй байгаа бол Wi-Fi холболт ашиглан автоматаар татан авахыг эхлүүлэхийг зөвлөж байна.&lt;br/&gt; &lt;br/&gt; &lt;br/&gt; Зөвлөмж: Та өөрийн мобайл төхөөрөмжийн &lt;b&gt; тохиргоо &lt;/ б&gt; цэсэнд &lt;/ б&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="6514288591959117288">"<xliff:g id="LANGUAGE">%1$s</xliff:g> хэлний толь бичигтэй"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> хэлний толь ашиглах боломжтой"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Шалгах болон татаж авахын тулд дарна уу"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Татаж байна: <xliff:g id="LANGUAGE">%1$s</xliff:g> хэлний санал болгох үгс удахгүй бэлэн болно."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>-д зориулсан татан авалтын санал болголтууд удахгүй бэлэн болно."</string>
<string name="version_text" msgid="2715354215568469385">"Хувилбар <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Нэмэх"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Толь бичигт нэмэх"</string>
diff --git a/java/res/values-ms-rMY/strings-config-important-notice.xml b/java/res/values-ms-rMY/strings-config-important-notice.xml
new file mode 100644
index 000000000..705d34ec3
--- /dev/null
+++ b/java/res/values-ms-rMY/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Perbaik cadangan berdasarkan komunikasi anda dan data yang ditaip"</string>
+</resources>
diff --git a/java/res/values-ms-rMY/strings-talkback-descriptions.xml b/java/res/values-ms-rMY/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..29c5fd86a
--- /dev/null
+++ b/java/res/values-ms-rMY/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Pasangkan set kepala untuk mendengar kekunci kata laluan disebut dengan kuat."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Teks semasa adalah %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Tiada teks dimasukkan"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> membetulkan <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> menjadi <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> melakukan auto pembetulan"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Kod kunci %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Kunci anjak dihidupkan (ketik untuk melumpuhkan)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Kunci huruf besar dihidupkan (ketik untuk melumpuhkan)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Padam"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simbol"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Huruf"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Nombor"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Tetapan"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"{0}&lt;td class=\"shortcuts\"&gt;{/0} Space"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Input suara"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Kembali"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Carian"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Titik"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Tukar bahasa"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Slps"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Sebelumnya"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Kunci anjak didayakan"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Kunci huruf besar didayakan"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Kunci anjak dilumpuhkan"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Mod simbol"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Mod huruf"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Mod telefon"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Mod simbol telefon"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Papan kekunci tersembunyi"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Menunjukkan papan kekunci <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"tarikh"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"tarikh dan masa"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-mel"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"pemesejan"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"nombor"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"teks"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"masa"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Terkini"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Orang"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objek"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Alam Semula Jadi"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Tempat"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simbol"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emotikon"</string>
+</resources>
diff --git a/java/res/values-ms-rMY/strings.xml b/java/res/values-ms-rMY/strings.xml
index c9b4a0359..cea20217e 100644
--- a/java/res/values-ms-rMY/strings.xml
+++ b/java/res/values-ms-rMY/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Tetapan asal sistem"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Cadangkan nama Kenalan"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Menggunakan nama daripada Kenalan untuk cadangan dan pembetulan"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Cadangan diperibadikan"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Titik ruang berganda"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Mengetik 2X pada bar ruang memasukkan titik diikuti dengan ruang"</string>
<string name="auto_cap" msgid="1719746674854628252">"Autopenghurufbesaran"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Tunjukkan jejak gerak isyarat"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Pratonton terapung dinamik"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Lihat perkataan yang dicadangkan semasa membuat gerak isyarat"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Disimpan"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Pasangkan set kepala untuk mendengar kekunci kata laluan disebut dengan kuat."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Teks semasa adalah %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Tiada teks dimasukkan"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> membetulkan <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> menjadi <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> melakukan auto pembetulan"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Kod kunci %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Kunci anjak dihidupkan (ketik untuk melumpuhkan)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Kunci huruf besar dihidupkan (ketik untuk melumpuhkan)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Padam"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Simbol"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Huruf"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Numbers"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Tetapan"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Ruang"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Input suara"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Muka senyum"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Kembali"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Cari"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Titik"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Tukar bahasa"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Seterusnya"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Sebelumnya"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift didayakan"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Kunci huruf besar didayakan"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Kunci anjak dilumpuhkan"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Mod simbol"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Mod huruf"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Mod telefon"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Mod simbol telefon"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Papan kekunci tersembunyi"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Menunjukkan <xliff:g id="MODE">%s</xliff:g> papan kekunci"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"tarikh"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"tarikh dan masa"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-mel"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"pemesejan"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"nombor"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"teks"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"masa"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Gerak isyarat frasa"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Luncur ke kekunci ruang untuk masukkan ruang semasa gerak isyarat"</string>
<string name="voice_input" msgid="3583258583521397548">"Kunci input suara"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Pada papan kekunci utama"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Pada papan kekunci simbol"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Dimati"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikrofon pada papan kekunci utama"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikrofon pada papan kekunci simbol"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Input suara dilmphkn"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Tiada kaedah input suara didayakan. Semak Bahasa &amp; tetapan input."</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfigurasikan kaedah input"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Bahasa input"</string>
<string name="send_feedback" msgid="1780431884109392046">"Hantar maklum balas"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Bahasa Inggeris (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Bahasa Inggeris (Australia)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Bahasa Sepanyol (AS)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Bahasa Inggeris (UK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Bahasa Inggeris (AS) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Bahasa Sepanyol (AS) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Tradisional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Bahasa Inggeris (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Bahasa Inggeris (AS) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Bahasa Sepanyol (AS) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Tradisional)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Cyril)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Tiada bahasa (Abjad)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Abjad (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Abjad (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Baca fail kamus luaran"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Tiada fail kamus dalam folder Muat Turun"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Pilih fail kamus untuk dipasang"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Betul-betul pasang fail ini untuk <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Betul-betul pasang fail ini untuk <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Berlaku ralat"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Longgokan kamus kenalan"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Longgokan kamus peribadi"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Longgokan kamus sejarah pengguna"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Longgokan kamus pemperibadian"</string>
<string name="button_default" msgid="3988017840431881491">"Lalai"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Selamat datang ke <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"dengan Taipan Gerak Isyarat"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Muatkan semula"</string>
<string name="last_update" msgid="730467549913588780">"Kali terakhir dikemas kini"</string>
<string name="message_updating" msgid="4457761393932375219">"Menyemak kemas kini"</string>
- <string name="message_loading" msgid="8689096636874758814">"Memuatkan..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Memuatkan…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Kamus utama"</string>
<string name="cancel" msgid="6830980399865683324">"Batal"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Tetapan"</string>
<string name="install_dict" msgid="180852772562189365">"Pasang"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Batal"</string>
<string name="delete_dict" msgid="756853268088330054">"Padam"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Bahasa pilihan pada peranti mudah alih anda mempunyai kamus tersedia.&lt;br/&gt; Kami mengesyorkan &lt;b&gt;memuat turun&lt;/b&gt; kamus <xliff:g id="LANGUAGE">%1$s</xliff:g> untuk memperbaik pengalaman menaip anda.&lt;br/&gt; &lt;br/&gt; Muat turun boleh mengambil masa seminit atau dua melalui 3G. Caj mungkin dikenakan jika anda tidak mempunyai &lt;b&gt;pelan data tanpa had&lt;/b&gt;.&lt;br/&gt; Jika anda tidak pasti jenis pelan data yang anda miliki, kami mengesyorkan agar anda mencari sambungan Wi-Fi untuk mula memuat turun secara automatik.&lt;br/&gt; &lt;br/&gt; Petua: Anda boleh memuat turun dan mengalih keluar kamus dengan pergi ke menu &lt;b&gt;Bahasa &amp; input&lt;/b&gt; dalam &lt;b&gt;Tetapan&lt;/b&gt; peranti mudah alih anda."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Bahasa pilihan pada peranti mudah alih anda sudah mempunyai kamus yang tersedia.&lt;br/&gt; Kami mengesyorkan &lt;b&gt;memuat turun&lt;/b&gt; kamus <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> untuk memperbaik pengalaman menaip anda.&lt;br/&gt; &lt;br/&gt; Muat turun boleh mengambil masa satu atau dua minit melalui 3G. Caj mungkin dikenakan jika anda tidak mempunyai &lt;b&gt;pelan data tanpa had&lt;/b&gt;.&lt;br/&gt; Jika anda tidak pasti jenis pelan data yang anda gunakan, kami mengesyorkan agar anda mencari sambungan Wi-Fi untuk mula memuat turun secara automatik.&lt;br/&gt; &lt;br/&gt; Petua: Anda boleh memuat turun dan mengalih keluar kamus dengan pergi ke menu &lt;b&gt;Bahasa&amp; input&lt;/b&gt; dalam &lt;b&gt;Tetapan&lt;/b&gt; peranti mudah alih anda."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Muat turun sekarang (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Muat turun melalui Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Kamus tersedia untuk <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Kamus tersedia untuk <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Tekan untuk mengulas dan memuat turun"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Memuat turun: cadangan untuk <xliff:g id="LANGUAGE">%1$s</xliff:g> akan sedia tidak lama lagi."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Memuat turun: cadangan untuk <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> akan sedia tidak lama lagi."</string>
<string name="version_text" msgid="2715354215568469385">"Versi <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"tambah"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Tambah ke kamus"</string>
diff --git a/java/res/values-nb/strings-config-important-notice.xml b/java/res/values-nb/strings-config-important-notice.xml
new file mode 100644
index 000000000..01a774c7e
--- /dev/null
+++ b/java/res/values-nb/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Bruk kommunikasjonen og inndataene dine for å få bedre forslag"</string>
+</resources>
diff --git a/java/res/values-nb/strings-talkback-descriptions.xml b/java/res/values-nb/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..96edf38c8
--- /dev/null
+++ b/java/res/values-nb/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Koble til hodetelefoner for å høre opplesing av tegnene i passordet."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Gjeldende tekst er %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Ingen tekst er skrevet inn"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> retter <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> til <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> utfører automatisk retting"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Tastaturkode %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift er på (trykk for å deaktivere)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps Lock er på (trykk for å deaktivere)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Slett"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symboler"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Bokstaver"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Tall"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Innstillinger"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Mellomromstasten"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Stemmedata"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Søk"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Prikk"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Bytt språk"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Neste"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Forrige"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift er aktivert"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock er aktivert"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift er deaktivert"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbolmodus"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Bokstavmodus"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Ringemodus"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Ringemodus med symboler"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Tastaturet er skjult"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Viser <xliff:g id="KEYBOARD_MODE">%s</xliff:g>-tastatur"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"dato"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"dato og klokkeslett"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-post"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"tekstmeldinger"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"tall"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"tekst"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"klokkeslett"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"nettadresse"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Nylige"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Personer"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objekter"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natur"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Steder"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symboler"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Smilefjes"</string>
+</resources>
diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml
index 00aa10da7..e4f16032c 100644
--- a/java/res/values-nb/strings.xml
+++ b/java/res/values-nb/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Systemstandard"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Foreslå kontaktnavn"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Bruk navn fra Kontakter til forslag og korrigeringer"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Spesialtilpassede forslag"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Punktum ved doble mellomrom"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Dobbeltrykk på mellomromstasten for punktum etterfulgt av mellomrom"</string>
<string name="auto_cap" msgid="1719746674854628252">"Stor forbokstav"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Vis bevegelsesspor"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamisk flytende forhåndsvsn."</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Se det foreslåtte ordet mens du utfører bevegelser"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Lagret"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Koble til hodetelefoner for å høre opplesing av bokstavene i passordet."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Gjeldende tekst er %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Ingen tekst er skrevet inn"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> retter <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> til <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> utfører automatisk retting"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Tastaturkode %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift er på (trykk for å deaktivere)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock er på (trykk for å deaktivere)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Slett"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symboler"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Bokstaver"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Tall"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Innstillinger"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabulator"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Mellomrom"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Taleinndata"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smilefjes"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Søk"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Prikk"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Bytt språk"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Neste"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Forrige"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift er aktivert"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps Lock er aktivert"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift er deaktivert"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Symbolmodus"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Bokstavmodus"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Ringemodus"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Ringemodus med symboler"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Tastaturet er skjult"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Viser <xliff:g id="MODE">%s</xliff:g>-tastatur"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"dato"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"dato og klokkeslett"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-post"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"tekstmeldinger"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"tall"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"tekst"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"tid"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"Nettadresse"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Frasebevegelse"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Sett inn mellomrom ved å dra fingeren til mellomromstasten"</string>
<string name="voice_input" msgid="3583258583521397548">"Tast for taleinndata"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"På hovedtastatur"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"På talltastatur"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Av"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikrofon på hovedtast."</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikrofon på talltastatur"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Taleinndata er deaktiv."</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Ingen taleinndatametoder er aktivert. Sjekk Språk og inndata-innstillingene."</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfigurer inndatametoder"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Inndataspråk"</string>
<string name="send_feedback" msgid="1780431884109392046">"Send tilbakemelding"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Engelsk (Storbritannia)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engelsk (USA)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spansk (USA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Engelsk (Storbritannia) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Engelsk (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spansk (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradisjonell)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Engelsk (Storbritannia) (<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_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradisjonelt)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (kyrillisk)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Ingen språk (alfabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabet (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Bruk en ekstern ordlistefil"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Det ligger ingen ordboksfiler i Nedlastinger-mappen"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Velg ordboksfilen du vil installere"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Vil du virkelig installere denne filen for <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Vil du virkelig installere denne filen for <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Det oppsto en feil"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Generer ordliste for kontakter"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Tøm den personlige ordlisten"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Tøm brukerlogg-ordlisten"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Tøm tilpasningsordlisten"</string>
<string name="button_default" msgid="3988017840431881491">"Standard"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Velkommen til <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"med Ordføring"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Last inn på nytt"</string>
<string name="last_update" msgid="730467549913588780">"Sist oppdatert"</string>
<string name="message_updating" msgid="4457761393932375219">"Ser etter oppdateringer ..."</string>
- <string name="message_loading" msgid="8689096636874758814">"Laster inn …"</string>
+ <string name="message_loading" msgid="5638680861387748936">"Laster inn …"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Hovedordliste"</string>
<string name="cancel" msgid="6830980399865683324">"Avbryt"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Innstillinger"</string>
<string name="install_dict" msgid="180852772562189365">"Installer"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Avbryt"</string>
<string name="delete_dict" msgid="756853268088330054">"Slett"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Det valgte språket på mobilenheten din har en tilgjengelig ordliste.&lt;br/&gt; Vi anbefaler å &lt;b&gt;laste ned&lt;/b&gt; ordlisten for <xliff:g id="LANGUAGE">%1$s</xliff:g>. Dette forbedrer skriveopplevelsen din.&lt;br/&gt; &lt;br/&gt; Nedlastingen kan ta fra ett til to minutter via 3G. Belastninger kan påløpe hvis du ikke har et abonnement med &lt;b&gt;ubegrenset databruk&lt;/b&gt;.&lt;br/&gt; Hvis du er usikker på hvilken abonnementstype du har, anbefaler vi deg å finne en Wi-Fi-tilkobling for å starte nedlastingen automatisk.&lt;br/&gt; &lt;br/&gt; Tips: Du kan laste ned og fjerne ordlister ved å gå til &lt;b&gt;Språk og inndata&lt;/b&gt; i menyen for &lt;b&gt;Innstillinger&lt;/b&gt; på mobilenheten din."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Det valgte språket på mobilenheten din har en tilgjengelig ordliste.&lt;br/&gt; Vi anbefaler å &lt;b&gt;laste ned&lt;/b&gt; ordlisten for <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>. Dette forbedrer skriveopplevelsen din.&lt;br/&gt; &lt;br/&gt; Nedlastingen kan ta fra ett til to minutter via 3G. Belastninger kan påløpe hvis du ikke har et abonnement med &lt;b&gt;ubegrenset databruk&lt;/b&gt;.&lt;br/&gt; Hvis du er usikker på hvilken abonnementstype du har, anbefaler vi deg å finne en Wi-Fi-tilkobling for å starte nedlastingen automatisk.&lt;br/&gt; &lt;br/&gt; Tips: Du kan laste ned og fjerne ordlister ved å gå til &lt;b&gt;Språk og inndata&lt;/b&gt; i menyen for &lt;b&gt;Innstillinger&lt;/b&gt; på mobilenheten din."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Last ned nå (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Last ned via Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"En ordliste er tilgjengelig for <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"En ordliste er tilgjengelig for <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Trykk for å se gjennom og laste ned"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Laster ned: Forslag blir snart tilgjengelige for <xliff:g id="LANGUAGE">%1$s</xliff:g>."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Laster ned: forslag til <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> er snart klare"</string>
<string name="version_text" msgid="2715354215568469385">"Versjon <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Legg til"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Legg til i ordlisten"</string>
diff --git a/java/res/values-ne-rNP/strings-action-keys.xml b/java/res/values-ne-rNP/strings-action-keys.xml
new file mode 100644
index 000000000..34b0a14a7
--- /dev/null
+++ b/java/res/values-ne-rNP/strings-action-keys.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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_previous_key" msgid="1421141755779895275">"पहिलो"</string>
+ <string name="label_done_key" msgid="7564866296502630852">"भयो"</string>
+ <string name="label_send_key" msgid="482252074224462163">"पठाउनुहोस्"</string>
+ <string name="label_pause_key" msgid="2225922926459730642">"रोक्नुहोस्"</string>
+ <string name="label_wait_key" msgid="5891247853595466039">"पर्खनुहोस्"</string>
+</resources>
diff --git a/java/res/values-ne-rNP/strings-appname.xml b/java/res/values-ne-rNP/strings-appname.xml
new file mode 100644
index 000000000..8b967e8d7
--- /dev/null
+++ b/java/res/values-ne-rNP/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="english_ime_name" msgid="5940510615957428904">"एन्ड्रोइड किबोर्ड (AOSP)"</string>
+ <string name="spell_checker_service_name" msgid="1254221805440242662">"एन्ड्रोइड हिज्जे जाँचकी (AOSP)"</string>
+ <string name="english_ime_settings" msgid="5760361067176802794">"एन्ड्रोइड किबोर्ड सेटिङ्हरू (AOSP)"</string>
+ <string name="android_spell_checker_settings" msgid="6123949487832861885">"एन्ड्रोइड हिज्जे परीक्षक सेटिङ्हरू(AOSP)"</string>
+</resources>
diff --git a/java/res/values-ne-rNP/strings-config-important-notice.xml b/java/res/values-ne-rNP/strings-config-important-notice.xml
new file mode 100644
index 000000000..8816da773
--- /dev/null
+++ b/java/res/values-ne-rNP/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-ne-rNP/strings-talkback-descriptions.xml b/java/res/values-ne-rNP/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..cffed33db
--- /dev/null
+++ b/java/res/values-ne-rNP/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"पासवर्ड कुञ्जीहरू ठूलो स्वरमा बोलेको आवाज सुन्नका लागि हेडसेट जोड्नुहोस्।"</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"वर्तमान पाठ %s हो"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"कुनै पाठ प्रविष्टि गरिएको छैन"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> ले <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> लाई <xliff:g id="CORRECTED_WORD">%3$s</xliff:g> मा सच्याउँछ"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> ले स्वतः सच्याउने गर्छ"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"कुञ्जी कोड %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"सिफ्ट"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"सिफ्ट सक्रिय छ (असक्षम पार्न ट्याप गर्नुहोस्)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"क्याप्स लक सकृय छ (असक्षम पार्न ट्याप गर्नुहोस्)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"मेटाउनुहोस्"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"प्रतिकहरू"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"अक्षरहरू"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"नम्बरहरू"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"सेटिङ्हरू"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"ट्याब"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"स्पेस"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"आवाज निवेश"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"इमोजी"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"फर्कनुहोस्"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"खोजी गर्नुहोस्"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"डट्"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"भाषा स्विच गर्नुहोस्"</string>
+ <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_off" msgid="5039126122829961331">"सिफ्ट असक्षम पारिएको छ"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"प्रतिक ढाँचा"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"अक्षर ढाँचा"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"फोन ढाँचा"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"फोन प्रतिक मोड"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"किबोर्ड लुकाइएको छ"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"<xliff:g id="KEYBOARD_MODE">%s</xliff:g> किबोर्ड देखाउँदै"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"मिति"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"मिति र समय"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"इमेल"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"सन्देश पठाइदै"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"सङ्ख्या"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"प्रकृति"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"स्थानहरू"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"प्रतिकहरू"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"ईमोटिकन्स"</string>
+</resources>
diff --git a/java/res/values-ne-rNP/strings.xml b/java/res/values-ne-rNP/strings.xml
new file mode 100644
index 000000000..f467443b3
--- /dev/null
+++ b/java/res/values-ne-rNP/strings.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="english_ime_input_options" msgid="3909945612939668554">"इनपुट विकल्पहरू"</string>
+ <string name="english_ime_research_log" msgid="8492602295696577851">"लग निर्देशनहरू शोध गर्नुहोस्"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"सम्पर्क नामहरू हेर्नुहोस्"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"तपाईँको सम्पर्क सूचीबाट हिज्जे परीक्षकले प्रविष्टिहरूको प्रयोग गर्छ"</string>
+ <string name="vibrate_on_keypress" msgid="5258079494276955460">"कुञ्जी थिच्दा भाइब्रेट"</string>
+ <string name="sound_on_keypress" msgid="6093592297198243644">"कुञ्जी थिच्दा आवाज"</string>
+ <string name="popup_on_keypress" msgid="123894815723512944">"कुञ्जी दबाउँदा पपअप"</string>
+ <string name="general_category" msgid="1859088467017573195">"सामान्य"</string>
+ <string name="correction_category" msgid="2236750915056607613">"पाठ सुधार"</string>
+ <string name="gesture_typing_category" msgid="497263612130532630">"इशारा टाइप गर्ने"</string>
+ <string name="misc_category" msgid="6894192814868233453">"अन्य विकल्पहरू"</string>
+ <string name="advanced_settings" msgid="362895144495591463">"जटिल सेटिङहरू"</string>
+ <string name="advanced_settings_summary" msgid="4487980456152830271">"विज्ञहरूका लागि विकल्पहरू"</string>
+ <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"अन्य इनपुट विधिमा स्विच गर्नुहोस्"</string>
+ <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="sliding_key_input_preview" msgid="6604262359510068370">"स्लाइड सूचक देखाउनुहोस्"</string>
+ <string name="sliding_key_input_preview_summary" msgid="6340524345729093886">"सिफ्ट वा प्रतिक कुञ्जीमा स्लाइड गर्ने बेला दृश्य सङ्केत देखाउनुहोस्"</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> मिलिसेकेन्ड"</string>
+ <string name="settings_system_default" msgid="6268225104743331821">"प्रणाली पूर्वनिर्धारित"</string>
+ <string name="use_contacts_dict" msgid="4435317977804180815">"सम्पर्क नामहरू सुझाव गर्नुहोस्"</string>
+ <string name="use_contacts_dict_summary" msgid="6599983334507879959">"सुझाव र सुधारका लागि सम्पर्कबाट नामहरू प्रयोग गर्नुहोस्"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"निजीकृत सुझावहरू"</string>
+ <string name="use_double_space_period" msgid="8781529969425082860">"डबल-स्पेस पूर्णविराम"</string>
+ <string name="use_double_space_period_summary" msgid="6532892187247952799">"स्पेसबारमा डबल ट्याप गर्नाले पूर्णविरामपछि स्पेस राख्दछ"</string>
+ <string name="auto_cap" msgid="1719746674854628252">"स्वतः पूँजिकरण"</string>
+ <string name="auto_cap_summary" msgid="7934452761022946874">"प्रत्येक वाक्यको पहिलो शब्द क्यापिटल गर्नुहोस्"</string>
+ <string name="edit_personal_dictionary" msgid="3996910038952940420">"व्यक्तिगत शब्दकोश"</string>
+ <string name="configure_dictionaries_title" msgid="4238652338556902049">"एड-अन शब्दकोश"</string>
+ <string name="main_dictionary" msgid="4798763781818361168">"मुख्य शब्दकोश"</string>
+ <string name="prefs_show_suggestions" msgid="8026799663445531637">"सुधार सुझावहरू देखाउने"</string>
+ <string name="prefs_show_suggestions_summary" msgid="1583132279498502825">"टाइप गर्ने बेलामा सुझाव शब्दहरू देखाउनुहोस्"</string>
+ <string name="prefs_suggestion_visibility_show_name" msgid="3219916594067551303">"सधैँ देखाउने"</string>
+ <string name="prefs_suggestion_visibility_show_only_portrait_name" msgid="3859783767435239118">"चित्र मोडमा देखाउनुहोस्"</string>
+ <string name="prefs_suggestion_visibility_hide_name" msgid="6309143926422234673">"सधैँ लुकाउने"</string>
+ <string name="prefs_block_potentially_offensive_title" msgid="5078480071057408934">"आपत्तिजनक शब्दहरूलाई रोक्नुहोस्"</string>
+ <string name="prefs_block_potentially_offensive_summary" msgid="2371835479734991364">"सम्भावित आपत्तिजनक शब्दहरू सुझाव नगर्नुहोस्"</string>
+ <string name="auto_correction" msgid="7630720885194996950">"स्वतः सुधार"</string>
+ <string name="auto_correction_summary" msgid="5625751551134658006">"गल्ती टाइप भएका शब्दहरूलाई स्पेसबार र पङ्चुएसनले स्वचालित रूपमा सच्याउँछन्।"</string>
+ <string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"बन्द"</string>
+ <string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"सामान्य"</string>
+ <string name="auto_correction_threshold_mode_aggressive" msgid="7319007299148899623">"आक्रामक"</string>
+ <string name="auto_correction_threshold_mode_very_aggressive" msgid="1853309024129480416">"ज्यादै आक्रामक"</string>
+ <string name="bigram_prediction" msgid="1084449187723948550">"अर्को शब्द सुझाव"</string>
+ <string name="bigram_prediction_summary" msgid="3896362682751109677">"सुझावहरू निर्माण गर्न अघिल्लो शब्द प्रयोग गर्नुहोस्"</string>
+ <string name="gesture_input" msgid="826951152254563827">"इशारा टाइप गर्ने सक्षम पार्नुहोस्"</string>
+ <string name="gesture_input_summary" msgid="9180350639305731231">"अक्षर स्लाइड गरी शब्द इनपुट गर्नुहोस्"</string>
+ <string name="gesture_preview_trail" msgid="3802333369335722221">"इशारा ट्रेल देखाउनुहोस्"</string>
+ <string name="gesture_floating_preview_text" msgid="4443240334739381053">"गतिशील फ्लोटिङ पूर्वावलोकन"</string>
+ <string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"इशारा गर्दा सुझाव दिइएको शब्द हेर्नुहोस्"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"वाक्यांश इशारा"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"इशाराको बखतमा स्पेस कुञ्जीमा ग्लाईडिंग द्वारा आगत खाली ठाउँहरू"</string>
+ <string name="voice_input" msgid="3583258583521397548">"आवाज इनपुट कुञ्जी"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"कुनै आवाज इनपुट विधिहरू सक्षम गरिएका छैनन्। भाषा र इनपुट सेटिङहरूको जाँच गर्नुहोस्।"</string>
+ <string name="configure_input_method" msgid="373356270290742459">"इनपुट विधिहरू कन्फिगर गर्नुहोस्"</string>
+ <string name="language_selection_title" msgid="1651299598555326750">"इनपुट भाषाहरू"</string>
+ <string name="send_feedback" msgid="1780431884109392046">"प्रतिक्रिया पठाउनुहोस्"</string>
+ <string name="select_language" msgid="3693815588777926848">"इनपुट भाषाहरू"</string>
+ <string name="hint_add_to_dictionary" msgid="573678656946085380">"बचत गर्न पुनः छुनुहोस्"</string>
+ <string name="has_dictionary" msgid="6071847973466625007">"उपलब्ध शब्दकोश"</string>
+ <string name="prefs_enable_log" msgid="6620424505072963557">"प्रयोगकर्ता प्रतिक्रिया सक्षम पार्नुहोस्"</string>
+ <string name="prefs_description_log" msgid="7525225584555429211">"स्वचालित रूपमा प्रयोग तथ्याङ्कहरू र क्यास रिपोर्टहरू पठाएर यस इनपुट विधि सम्पादकलाई सुधार्न सहयोग गर्नुहोस्।"</string>
+ <string name="keyboard_layout" msgid="8451164783510487501">"किबोर्ड थिम"</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>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"अंग्रेजी (बेलायत) ( <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g> )"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"अंग्रेजी (अमेरिका) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"स्पेनेली (अमेरिका) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (परम्परागत)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (सिरिलिक)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ल्याटिन)"</string>
+ <string name="subtype_no_language" msgid="7137390094240139495">"कुनै भाषा होइन (वर्णमाला)"</string>
+ <string name="subtype_no_language_qwerty" msgid="244337630616742604">"वर्णमाला (QWERTY)"</string>
+ <string name="subtype_no_language_qwertz" msgid="443066912507547976">"वर्णमाला (QWERTZ)"</string>
+ <string name="subtype_no_language_azerty" msgid="8144348527575640087">"वर्णमाला (AZERTY)"</string>
+ <string name="subtype_no_language_dvorak" msgid="1564494667584718094">"वर्णमाला (Dvorak)"</string>
+ <string name="subtype_no_language_colemak" msgid="5837418400010302623">"वर्णमाला (Colemak)"</string>
+ <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"वर्णमाला (PC)"</string>
+ <string name="subtype_emoji" msgid="7483586578074549196">"इमोजी"</string>
+ <string name="keyboard_color_scheme" msgid="9192934113872818070">"रङ योजना"</string>
+ <string name="keyboard_color_scheme_white" msgid="6684064723850265438">"सेतो"</string>
+ <string name="keyboard_color_scheme_blue" msgid="2488527224758177593">"नीलो"</string>
+ <string name="custom_input_styles_title" msgid="8429952441821251512">"अनुकूलन इनपुट शैली"</string>
+ <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="subtype_locale" msgid="8576443440738143764">"भाषा"</string>
+ <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="custom_input_style_already_exists" msgid="8008728952215449707">"यस्तो इनपुट शैली पहिले नै अवस्थित छ: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
+ <string name="prefs_usability_study_mode" msgid="1261130555134595254">"प्रयोग अध्ययन मोड"</string>
+ <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"कुञ्जी लामो थिचाइ ढिलाइ"</string>
+ <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"कुञ्जी थिचाइ भाइब्रेसन अवधि"</string>
+ <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"कुञ्जी थिचाइ आवाज भोल्युम"</string>
+ <string name="prefs_read_external_dictionary" msgid="2588931418575013067">"बाह्य शब्दकोश फाइल पढ्नुहोस्"</string>
+ <string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"डाउनलोड फोल्डरमा कुनै शब्दकोश फाइलहरू छैनन्।"</string>
+ <string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"स्थापना गर्न कुनै शब्दकोश फाइल चयन गर्नुहोस्"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"वास्तवमै <xliff:g id="LANGUAGE_NAME">%s</xliff:g> को लागि यो फाइल स्थापना गर्नुहुन्छ?"</string>
+ <string name="error" msgid="8940763624668513648">"कुनै त्रुटि भयो"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"सम्पर्क शब्दकोश भेला गर्नुहोस्"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"व्यक्तिगत शब्दकोश डम्प गर्नुहोस्"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"प्रयोगकर्ता इतिहास शब्दकोश डम्प गर"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"निजीकरण शब्दकोश डम्प गर्नुहोस्"</string>
+ <string name="button_default" msgid="3988017840431881491">"पूर्वनिर्धारित"</string>
+ <string name="setup_welcome_title" msgid="6112821709832031715">"तपाईँलाई स्वागत छ<xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+ <string name="setup_welcome_additional_description" msgid="8150252008545768953">"इशारा टाइप गर्नेसँग"</string>
+ <string name="setup_start_action" msgid="8936036460897347708">"सुरु गरौं"</string>
+ <string name="setup_next_action" msgid="371821437915144603">"अर्को चरण"</string>
+ <string name="setup_steps_title" msgid="6400373034871816182">"स्थापना गर्दै <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+ <string name="setup_step1_title" msgid="3147967630253462315">"सक्षम पार्नुहोस् <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+ <string name="setup_step1_instruction" msgid="2578631936624637241">"कृपया जाँच गर्नुहोस् \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" तपाईँको भाषा र इनपुट सेटिङमा। यसले तपाईँलाई तपाईँको उपकरणमा सञ्चालन गर्न आधिकारिकता प्रदान गर्छ।"</string>
+ <string name="setup_step1_finished_instruction" msgid="10761482004957994">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> पहिले नै तपाईँको भाषा र इनपुट सेटिङमा सक्षम पारिएको छ, त्यसैले यो कदम सकिसकिएको छ। अर्कोमा जानुहोस्!"</string>
+ <string name="setup_step1_action" msgid="4366513534999901728">"सेटिङहरूमा सक्षम पार्नुहोस्"</string>
+ <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_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>
+ <string name="show_setup_wizard_icon" msgid="5008028590593710830">"अनुप्रयोग आइकन देखाउनुहोस्"</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>
+ <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>
+ <string name="user_dictionaries" msgid="3582332055892252845">"प्रयोगकर्ता शब्दकोशहरू"</string>
+ <string name="default_user_dict_pref_name" msgid="1625055720489280530">"प्रयोगकर्ता शब्दकोश"</string>
+ <string name="dictionary_available" msgid="4728975345815214218">"उपलब्ध शब्दकोश"</string>
+ <string name="dictionary_downloading" msgid="2982650524622620983">"हाल डाउनलोड गर्दै"</string>
+ <string name="dictionary_installed" msgid="8081558343559342962">"स्थापित"</string>
+ <string name="dictionary_disabled" msgid="8950383219564621762">"स्थापित, असक्षम पारिएको"</string>
+ <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="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="go_to_settings" msgid="3876892339342569259">"सेटिङ्हरू"</string>
+ <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; सिफारिस गर्दछौँ। यो डाउनलोड गर्न 3G मा एक वा दुई मिनेट लिन सक्छ। तपाईँ एक &lt;b&gt; तपाईँको असीमित डेटा योजना &lt;/b&gt; छैन भने शुल्क लागू हुन सक्छ। तपाईँसँग कुन डेटा योजना छ भन्ने निश्चित छैन भने Wi-Fi जडान गरेर स्वचालित डाउनलोड गर्न हामी सिफारिस गर्दछौँ। युक्ति: तपाईँ आफ्नो मोबाइल उपकरणको &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> MB)"</string>
+ <string name="do_not_download_over_metered" msgid="2176209579313941583">"वाइ-फाइको माध्ययमद्वार डाउनलोड गर्नुहोस्"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>को लागि एउटा शब्दकोश उपलब्ध छ"</string>
+ <string name="dict_available_notification_description" msgid="1075194169443163487">"समीक्षा गर्न थिच्नुहोस् र डाउनलोड गर्नुहोस्"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"डाउनलोड गर्दै: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>को लागि सुझावहरू चाँडै नै तयार हुने छ।"</string>
+ <string name="version_text" msgid="2715354215568469385">"संस्करण <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
+ <string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"थप्नुहोस्"</string>
+ <string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"शब्दकोशमा थप्नुहोस्"</string>
+ <string name="user_dict_settings_add_screen_title" msgid="5818914331629278758">"पदावली"</string>
+ <string name="user_dict_settings_add_dialog_more_options" msgid="5671682004887093112">"थप विकल्पहरू"</string>
+ <string name="user_dict_settings_add_dialog_less_options" msgid="2716586567241724126">"कम विकल्पहरू"</string>
+ <string name="user_dict_settings_add_dialog_confirm" msgid="4703129507388332950">"ठीक छ"</string>
+ <string name="user_dict_settings_add_word_option_name" msgid="6665558053408962865">"शब्द:"</string>
+ <string name="user_dict_settings_add_shortcut_option_name" msgid="3094731590655523777">"सर्टकट:"</string>
+ <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_context_menu_delete_title" msgid="8142932447689461181">"मेट्नुहोस्"</string>
+ <string name="user_dict_settings_empty_text" msgid="558499587532668203">"तपाईँसँग प्रयोगकर्ता शब्दकोशमा कुनै शब्द छैन।\"थप्नुहोस्\"(+) बटनमा छोएर एउटा शब्द थप्नुहोस्।"</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_fast_scroll_alphabet" msgid="5431919401558285473">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
+</resources>
diff --git a/java/res/values-nl/strings-config-important-notice.xml b/java/res/values-nl/strings-config-important-notice.xml
new file mode 100644
index 000000000..a340c99f9
--- /dev/null
+++ b/java/res/values-nl/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-nl/strings-talkback-descriptions.xml b/java/res/values-nl/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..8dcd5748d
--- /dev/null
+++ b/java/res/values-nl/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Sluit een headset aan om wachtwoordtoetsen hardop te laten voorlezen."</string>
+ <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_description_unknown" msgid="2382510329910793539">"Toetscode %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift aan (tik om uit te schakelen)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps Lock aan (tik om uit te schakelen)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Verwijderen"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symbolen"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Letters"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Cijfers"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Instellingen"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Spatiebalk"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Spraakinvoer"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Return"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Zoeken"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Punt"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Taal wijzigen"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Volgende"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Vorige"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift ingeschakeld"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock ingeschakeld"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift uitgeschakeld"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbolen"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Alfanumeriek toetsenbord"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Toetsenbord telefoon"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefoonsymbolen"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Toetsenbord verborgen"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Toetsenbord voor <xliff:g id="KEYBOARD_MODE">%s</xliff:g> wordt weergegeven"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"datum"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"datum en tijd"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-mail"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"berichten"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"nummer"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefoon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"tekst"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"tijd"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Recent"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Mensen"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objecten"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natuur"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Plaatsen"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symbolen"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticons"</string>
+</resources>
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index dcbf2c09c..342464fc8 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Systeemstandaard"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Contactnamen suggereren"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Namen uit Contacten gebruiken voor suggesties en correcties"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Gepersonaliseerde suggesties"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Dubbeltik is punt, spatie"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Dubbeltik op spatiebalk voor een punt gevolgd door een spatie"</string>
<string name="auto_cap" msgid="1719746674854628252">"Auto-hoofdlettergebruik"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Gebarenspoor weergeven"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamisch zwevend voorbeeld"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Het voorgestelde woord weergeven tijdens het tekenen"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: opgeslagen"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Sluit een headset aan om wachtwoordtoetsen hardop te laten voorlezen."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Huidige tekst is %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Geen tekst ingevoerd"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"Met <xliff:g id="KEY">%1$s</xliff:g> wordt <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> gecorrigeerd naar <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"Met <xliff:g id="KEY">%1$s</xliff:g> voert u automatische correctie uit"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Toetscode %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift aan (tik om uit te schakelen)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock aan (tik om uit te schakelen)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Verwijderen"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symbolen"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Letters"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Cijfers"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Instellingen"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Spatie"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Spraakinvoer"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smiley-gezichtje"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Zoeken"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Stip"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Taal wijzigen"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Volgende"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Vorige"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift ingeschakeld"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps Lock ingeschakeld"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift uitgeschakeld"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Symbolen"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Alfanumeriek toetsenbord"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Toetsenbord telefoon"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Telefoonsymbolen"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Toetsenbord verborgen"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"<xliff:g id="MODE">%s</xliff:g> toetsenbord wordt weergegeven"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"datum"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"datum en tijd"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-mail"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"berichten"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"nummer"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefoon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"tekst"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"tijd"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Gebaar voor woordgroep"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Spaties invoeren bij gebaren door naar de spatietoets te bewegen"</string>
<string name="voice_input" msgid="3583258583521397548">"Toets voor spraakinvoer"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Op hoofdtoetsenbord"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Op symbooltoetsenb."</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Uitgeschakeld"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Microfoon op hoofdtoetsenbord"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mic op symb.toetsb."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Spraakinvoer is uit"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Geen spraakinvoermethoden ingeschakeld. Ga naar \'Instellingen voor taal en invoer\'."</string>
<string name="configure_input_method" msgid="373356270290742459">"Invoermethoden configureren"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Invoertalen"</string>
<string name="send_feedback" msgid="1780431884109392046">"Feedback verzenden"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Engels (GB)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engels (VS)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spaans (VS)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Engels (VK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Engels (VS) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spaans (VS) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (traditioneel)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Engels (VK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Engels (VS) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spaans (VS) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (traditioneel)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Cyrillisch)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latijns)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Geen taal (alfabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabet (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Extern woordenboekbestand lezen"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Geen woordenboekbestanden in de map \'Downloads\'"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Selecteer een woordenboekbestand om te installeren"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Wilt u dit bestand voor <xliff:g id="LOCALE_NAME">%s</xliff:g> echt installeren?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Wilt u dit bestand voor het <xliff:g id="LANGUAGE_NAME">%s</xliff:g> echt installeren?"</string>
<string name="error" msgid="8940763624668513648">"Er is een fout opgetreden"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Contactenwoordenboek dumpen"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Persoonlijk woordenboek dumpen"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Woordenb. gebruikersgesch. dumpen"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Personalisatiewoordenboek dumpen"</string>
<string name="button_default" msgid="3988017840431881491">"Standaard"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Welkom bij <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"met Invoer met bewegingen"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Vernieuwen"</string>
<string name="last_update" msgid="730467549913588780">"Laatst bijgewerkt"</string>
<string name="message_updating" msgid="4457761393932375219">"Controleren op updates"</string>
- <string name="message_loading" msgid="8689096636874758814">"Wordt geladen…"</string>
+ <string name="message_loading" msgid="5638680861387748936">"Laden…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Algemeen woordenboek"</string>
<string name="cancel" msgid="6830980399865683324">"Annuleren"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Instellingen"</string>
<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="2878629598667658845">"Er is een woordenboek voor de geselecteerde taal beschikbaar op uw mobiele apparaat.&lt;br/&gt; We raden u aan het woordenboek voor het <xliff:g id="LANGUAGE">%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 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="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="6514288591959117288">"Er is een woordenboek beschikbaar voor het <xliff:g id="LANGUAGE">%1$s</xliff:g>"</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>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Druk om te controleren en te downloaden"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Downloaden: suggesties voor het <xliff:g id="LANGUAGE">%1$s</xliff:g> zijn straks beschikbaar."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Downloaden: suggesties voor het <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> zijn straks beschikbaar."</string>
<string name="version_text" msgid="2715354215568469385">"Versie <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Toevoegen"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Toevoegen aan woordenboek"</string>
diff --git a/java/res/values-pl/strings-config-important-notice.xml b/java/res/values-pl/strings-config-important-notice.xml
new file mode 100644
index 000000000..315a61bc2
--- /dev/null
+++ b/java/res/values-pl/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Analizuj wiadomości i wpisywane dane, by ulepszać podpowiedzi"</string>
+</resources>
diff --git a/java/res/values-pl/strings-talkback-descriptions.xml b/java/res/values-pl/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..567bb3b23
--- /dev/null
+++ b/java/res/values-pl/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Podłącz zestaw słuchawkowy, by usłyszeć znaki hasła wypowiadane na głos."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Aktualny tekst: %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Nie wpisano tekstu"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> poprawia <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> na <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> wykonuje autokorektę"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Kod klawisza: %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift włączony (kliknij, by wyłączyć)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps Lock włączony (kliknij, by wyłączyć)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Usuń"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symbole"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Litery"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Liczby"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Ustawienia"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Karta"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Spacja"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Rozpoznawanie mowy"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emotikony"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Szukaj"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Kropka"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Przełącz język"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Dalej"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Wstecz"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift włączony"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock włączony"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift wyłączony"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Tryb symboli"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Tryb liter"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Tryb telefonu"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Tryb symboli telefonu"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Klawiatura ukryta"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Pokazuję klawiaturę w trybie <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"data"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"data i godzina"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-mail"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"SMS"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"liczba"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"tekst"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"godzina"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"adres URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Niedawne"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Osoby"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Obiekty"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Przyroda"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Miejsca"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symbole"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emotikony"</string>
+</resources>
diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml
index c78674a9b..c4261c60e 100644
--- a/java/res/values-pl/strings.xml
+++ b/java/res/values-pl/strings.xml
@@ -33,7 +33,7 @@
<string name="misc_category" msgid="6894192814868233453">"Inne opcje"</string>
<string name="advanced_settings" msgid="362895144495591463">"Ustawienia zaawansowane"</string>
<string name="advanced_settings_summary" msgid="4487980456152830271">"Opcje dla ekspertów"</string>
- <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Włącz inne metody wprowadzania"</string>
+ <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Inne metody wprowadzania"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Klawisz zmiany języka obejmuje też inne metody wprowadzania"</string>
<string name="show_language_switch_key" msgid="5915478828318774384">"Klawisz zmiany języka"</string>
<string name="show_language_switch_key_summary" msgid="7343403647474265713">"Pokaż, gdy włączonych jest kilka języków wprowadzania"</string>
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Ustawienie domyślne"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Proponuj osoby z kontaktów"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"W propozycjach i poprawkach użyj nazwisk z kontaktów"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Spersonalizowane sugestie"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Szybka kropka ze spacją"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Dwukrotne kliknięcie spacji wstawia kropkę ze spacją"</string>
<string name="auto_cap" msgid="1719746674854628252">"Wstawiaj wielkie litery"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Pokazuj ślad gestu"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamiczny podgląd słowa"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Podczas gestykulacji będzie widoczne podpowiadane słowo"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Zapisano"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Podłącz zestaw słuchawkowy, aby usłyszeć znaki hasła wypowiadane na głos."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Aktualny tekst: %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Nie wprowadzono tekstu"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> poprawia <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> na <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> wykonuje autokorektę"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Kod klawisza: %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift włączony (kliknij, by wyłączyć)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock włączony (kliknij, by wyłączyć)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Usuń"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symbole"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Litery"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Liczby"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Ustawienia"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Spacja"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Rozpoznawanie mowy"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Uśmiechnięta buźka"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Szukaj"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Punkt"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Przełącz język"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Dalej"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Wstecz"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift włączony"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock włączony"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift wyłączony"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Tryb symboli"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Tryb liter"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Tryb telefonu"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Tryb symboli telefonu"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Klawiatura ukryta"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Pokazuję klawiaturę w trybie <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"data"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"data i godzina"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-mail"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"SMS"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"liczba"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"tekst"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"godzina"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Gest wyrażenia"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Wpisuj spacje podczas gestów, przesuwając palec do klawisza spacji"</string>
<string name="voice_input" msgid="3583258583521397548">"Klawisz rozpoznawania mowy"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Na klawiaturze głównej"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Na klawiaturze z symbolami"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Wyłącz"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikrofon na klawiaturze głównej"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikrofon na klawiaturze z symbolami"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Rozpoznawanie mowy jest wyłączone"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nie włączono żadnych metod wprowadzania głosowego. Sprawdź ustawienia języka i wprowadzania."</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfiguruj metody wprowadzania"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Języki wprowadzania"</string>
<string name="send_feedback" msgid="1780431884109392046">"Prześlij opinię"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"angielski (Wielka Brytania)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"angielski (Stany Zjednoczone)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"hiszpański (USA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"angielski (UK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"angielski (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"hiszpański (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradycyjny)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Angielski (Wielka Brytania) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Angielski (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Hiszpański (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradycyjny)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cyrylica)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (alfabet łaciński)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Bez języka (alfabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabet (QWERTZ)"</string>
@@ -162,14 +119,18 @@
<string name="not_now" msgid="6172462888202790482">"Nie teraz"</string>
<string name="custom_input_style_already_exists" msgid="8008728952215449707">"Taki styl wprowadzania już istnieje: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Tryb badania przydatności"</string>
- <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"Opóźn. przy przytrzym. przycisku"</string>
- <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"Czas wibr. przy naciśn. przycisku"</string>
- <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"Głośność przy naciśn. przycisku"</string>
+ <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"Opóźnienie przy długim naciśnięciu"</string>
+ <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"Wibracja przy naciśniętym klawiszu"</string>
+ <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"Głośność przy naciśniętym klawiszu"</string>
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Odczyt zewnętrznego pliku słownika"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Brak plików słownika w folderze Pobrane pliki"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Wybierz plik słownika do zainstalowania"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Czy na pewno zainstalować ten plik dla języka: <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Czy na pewno zainstalować ten plik dla języka: <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Wystąpił błąd"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Wyciąg ze słownika kontaktów"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Wyciąg ze słownika osobistego"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Wyciąg ze słownika historii użytk."</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Wyciąg ze słownika personalizacji"</string>
<string name="button_default" msgid="3988017840431881491">"Domyślne"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Witamy w aplikacji <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"z pisaniem gestami"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Odśwież"</string>
<string name="last_update" msgid="730467549913588780">"Ostatnia aktualizacja"</string>
<string name="message_updating" msgid="4457761393932375219">"Sprawdzanie dostępności aktualizacji"</string>
- <string name="message_loading" msgid="8689096636874758814">"Wczytuję..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Wczytuję…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Słownik główny"</string>
<string name="cancel" msgid="6830980399865683324">"Anuluj"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Ustawienia"</string>
<string name="install_dict" msgid="180852772562189365">"Zainstaluj"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Anuluj"</string>
<string name="delete_dict" msgid="756853268088330054">"Usuń"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Dla języka, którego używasz na swoim urządzeniu przenośnym, jest dostępny słownik.&lt;br/&gt; Warto &lt;b&gt;pobrać&lt;/b&gt; ten słownik <xliff:g id="LANGUAGE">%1$s</xliff:g>, by ułatwić sobie pisanie.&lt;br/&gt; &lt;br/&gt; Pobieranie trwa do dwóch minut (przez 3G). Jeśli nie masz &lt;b&gt;abonamentu z nieograniczoną transmisją danych&lt;/b&gt;, operator może naliczyć opłatę.&lt;br/&gt; Jeśli nie wiesz, jaki masz abonament, połącz się z Wi-Fi, by automatycznie rozpocząć pobieranie.&lt;br/&gt; &lt;br/&gt; Wskazówka: słowniki możesz pobierać i usuwać na urządzeniu w sekcji &lt;b&gt;Język, klawiatura, głos&lt;/b&gt; w menu &lt;b&gt;Ustawienia&lt;/b&gt;."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Do języka, którego używasz na swoim urządzeniu przenośnym, jest dostępny słownik.&lt;br/&gt; Warto &lt;b&gt;pobrać&lt;/b&gt; ten słownik <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>, by ułatwić sobie pisanie.&lt;br/&gt; &lt;br/&gt; Pobieranie trwa do dwóch minut (przez 3G). Jeśli nie masz &lt;b&gt;abonamentu z nieograniczoną transmisją danych&lt;/b&gt;, operator może naliczyć opłatę.&lt;br/&gt; Jeśli nie wiesz, jaki masz abonament, połącz się z Wi-Fi, by automatycznie rozpocząć pobieranie.&lt;br/&gt; &lt;br/&gt; Wskazówka: słowniki możesz pobierać i usuwać w sekcji &lt;b&gt;Język, klawiatura, głos&lt;/b&gt; w menu &lt;b&gt;Ustawienia&lt;/b&gt; na urządzeniu."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Pobierz teraz (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Pobierz przez Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Dostępny jest słownik <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Dostępny jest słownik <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Naciśnij, by sprawdzić i pobrać"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Pobieranie – wkrótce będą dostępne sugestie w tym języku: <xliff:g id="LANGUAGE">%1$s</xliff:g>."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Pobieranie – wkrótce będą dostępne sugestie w tym języku: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>."</string>
<string name="version_text" msgid="2715354215568469385">"Wersja <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Dodaj"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Dodaj do słownika"</string>
diff --git a/java/res/values-port/setup-dimens-small-phone-port.xml b/java/res/values-port/setup-dimens-small-phone-port.xml
index 8ac72ea7c..cf2751f1b 100644
--- a/java/res/values-port/setup-dimens-small-phone-port.xml
+++ b/java/res/values-port/setup-dimens-small-phone-port.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">20sp</dimen>
<dimen name="setup_step_bullet_text_size">18sp</dimen>
<dimen name="setup_step_triangle_indicator_height">18dp</dimen>
- <dimen name="setup_step_indicator_height">18dp</dimen>
<dimen name="setup_step_title_text_size">18sp</dimen>
<dimen name="setup_step_instruction_text_size">14sp</dimen>
<dimen name="setup_step_action_text_size">16sp</dimen>
diff --git a/java/res/values-pt-rPT/strings-config-important-notice.xml b/java/res/values-pt-rPT/strings-config-important-notice.xml
new file mode 100644
index 000000000..38e2499d4
--- /dev/null
+++ b/java/res/values-pt-rPT/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Aprender com comunicações e dados introd. para melhorar sugestões"</string>
+</resources>
diff --git a/java/res/values-pt-rPT/strings-talkback-descriptions.xml b/java/res/values-pt-rPT/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..bf51caa78
--- /dev/null
+++ b/java/res/values-pt-rPT/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Ligar auscultadores com microfone integrado para ouvir as teclas da palavra-passe."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"O texto atual é %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Nenhum texto digitado"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corrige <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> para <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> executa a correção automática"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Código da tecla %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift ativado (tocar para desativar)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock ativado (tocar para desativar)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Eliminar"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Símbolos"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Letras"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Números"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Definições"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Separador"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Espaço"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Entrada de voz"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Voltar"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Pesquisar"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Ponto"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Mudar de idioma"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Seguinte"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Anterior"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift ativado"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock ativado"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift desativado"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modo de símbolos"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modo de letras"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modo de telemóvel"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modo de símbolos de telemóvel"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Teclado oculto"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"A mostrar o teclado de <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"data"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"data e hora"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"email"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"mensagens"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"números"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telemóvel"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"texto"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"hora"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Recentes"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Pessoas"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objetos"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natureza"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Locais"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Símbolos"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Ícones expressivos"</string>
+</resources>
diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml
index c27758116..8b75dd0dd 100644
--- a/java/res/values-pt-rPT/strings.xml
+++ b/java/res/values-pt-rPT/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Predef. do sistema"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Sugerir nomes de Contactos"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Utilizar nomes dos Contactos para sugestões e correções"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Sugestões personalizadas"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Ponto de espaço duplo"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Tocar duas vezes na barra espaço insere ponto seguido de espaço"</string>
<string name="auto_cap" msgid="1719746674854628252">"Letras maiúsculas automáticas"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Mostrar percurso do gesto"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Pré-visual. flutuante dinâmica"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Ver palavra sugerida enquanto toca"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Ligar auscultadores com microfone integrado para ouvir as teclas da palavra-passe."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"O texto atual é %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Nenhum texto digitado"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> corrige <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> para <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> executa correção automática"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Código da tecla %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift ativado (tocar para desativar)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock ativado (tocar para desativar)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Símbolos"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Letras"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Números"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Definições"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Espaço"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Entrada de voz"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Cara sorridente"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Pesquisar"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Ponto"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Mudar de idioma"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Seguinte"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Anterior"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift ativado"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock ativado"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift desativado"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Modo de símbolos"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Modo de letras"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Modo de telemóvel"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Modo de símbolos de telemóvel"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Teclado oculto"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"A mostrar teclado de <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"data"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"data e hora"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"email"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"mensagens"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"números"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telemóvel"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"texto"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"hora"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URLs"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Toque de expressão"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Deslize p/ a tecla de espaço p/ introduzir espaços durante toques"</string>
<string name="voice_input" msgid="3583258583521397548">"Chave de entrada de voz"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"No teclado principal"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"No teclado símbolos"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Desligar"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mic. tecl. principal"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mic. tecl. símbolos"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Entr. voz desact."</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nenhum método de entrada de texto por voz ativado. Verifique as definições de Idioma e introdução."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configurar métodos de introdução"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Idiomas de entrada"</string>
<string name="send_feedback" msgid="1780431884109392046">"Enviar comentários"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Inglês (RU)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Inglês (EUA)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Espanhol (EUA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Inglês (RU) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Inglês (EUA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Espanhol (EUA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Tradicional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Inglês (RU) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Inglês (EUA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Espanhol (EUA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradicional)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Cirílico)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latim)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Sem idioma (alfabeto)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabeto (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabeto (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Ler ficheiro de dicionário externo"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Não há ficheiros de dicionário na pasta Transferências"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Selecione um ficheiro de dicionário para instalar"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Instalar mesmo este ficheiro para <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Instalar mesmo este ficheiro para <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Ocorreu um erro"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Transferir dicionário de contactos"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Descarregar dicionário pessoal"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Desc. dicion. do hist. do utiliz."</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Descarregar dicionário de personal."</string>
<string name="button_default" msgid="3988017840431881491">"Predefinido"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Bem-vindo(a) a <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"com a Escrita com Gestos"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Atualizar"</string>
<string name="last_update" msgid="730467549913588780">"Última atualização"</string>
<string name="message_updating" msgid="4457761393932375219">"A verificar existência de atualizações"</string>
- <string name="message_loading" msgid="8689096636874758814">"A carregar..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"A carregar…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Dicionário principal"</string>
<string name="cancel" msgid="6830980399865683324">"Cancelar"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Definições"</string>
<string name="install_dict" msgid="180852772562189365">"Instalar"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Cancelar"</string>
<string name="delete_dict" msgid="756853268088330054">"Eliminar"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"O idioma selecionado no dispositivo móvel tem um dicionário disponível.&lt;br/&gt; Recomendamos que &lt;b&gt;transfira&lt;/b&gt; o dicionário de <xliff:g id="LANGUAGE">%1$s</xliff:g> para melhorar a sua experiência de introdução de texto.&lt;br/&gt; &lt;br/&gt; A transferência pode demorar um ou dois minutos acima de 3G. Poderão ser aplicadas taxas se não tiver um &lt;b&gt;plano de dados ilimitado&lt;/b&gt;.&lt;br/&gt; Se não tiver a certeza do plano de dados que tem, recomendamos que localize uma ligação Wi-Fi para começar a transferência automaticamente.&lt;br/&gt; &lt;br/&gt; Sugestão: pode transferir e remover dicionários acedendo a &lt;b&gt;Idioma e introdução&lt;/b&gt; no menu &lt;b&gt;Definições&lt;/b&gt; do disp. móvel."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"O idioma selecionado no disp. móvel tem um dicionário disponível.&lt;br/&gt; Recomendamos que &lt;b&gt;transfira&lt;/b&gt; o dicionário de <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> para melhorar a sua experiência de introdução de texto.&lt;br/&gt; &lt;br/&gt; A transferência pode demorar um ou dois minutos através de 3G. Poderão ser aplicadas taxas se não tiver um &lt;b&gt;plano de dados ilimitado&lt;/b&gt;.&lt;br/&gt; Se não tiver a certeza do plano de dados que tem, recomendamos que procure uma ligação Wi-Fi para começar a transferência automaticamente.&lt;br/&gt; &lt;br/&gt; Sugestão: Pode transferir e remover dicionários acedendo a &lt;b&gt;Idioma e introdução&lt;/b&gt; no menu &lt;b&gt;Definições&lt;/b&gt; do disp. móvel."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Transferir agora (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Transferir via Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Está disponível um dicionário para <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Está disponível um dicionário de <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Prima para consultar e transferir"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"A transferir: as sugestões para <xliff:g id="LANGUAGE">%1$s</xliff:g> estarão prontas em breve."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"A transferir: as sugestões para <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> estarão prontas em breve"</string>
<string name="version_text" msgid="2715354215568469385">"Versão <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Adicionar"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Adicionar ao dicionário"</string>
diff --git a/java/res/values-pt/strings-config-important-notice.xml b/java/res/values-pt/strings-config-important-notice.xml
new file mode 100644
index 000000000..86af5ff6d
--- /dev/null
+++ b/java/res/values-pt/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Aprender com mensagens e dados digitados para melhorar sugestões"</string>
+</resources>
diff --git a/java/res/values-pt/strings-talkback-descriptions.xml b/java/res/values-pt/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..01aac3931
--- /dev/null
+++ b/java/res/values-pt/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Conecte um fone de ouvido para ouvir as chaves de senha."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"O texto atual é %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Nenhum texto digitado"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corrige <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> para <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> realiza correção automática"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Código de tecla %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift ativado (toque para desativar)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps Lock ativado (toque para desativar)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Excluir"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Símbolos"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Letras"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Números"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Configurações"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Espaço"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Entrada de texto por voz"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emojis"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Pesquisar"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Ponto"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Alterar idioma"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Próximo"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Anterior"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift ativado"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock ativado"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift desativado"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modo de símbolos"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modo de letras"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modo de telefone"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modo de símbolos do telefone"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Teclado oculto"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Mostrando teclado <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"data"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"data e hora"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-mail"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"mensagens"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"número"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefone"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"texto"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"hora"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Recentes"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Pessoas"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Objetos"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natureza"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Lugares"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Símbolos"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticons"</string>
+</resources>
diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
index f98ef8cd6..afee26d25 100644
--- a/java/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
@@ -39,25 +39,26 @@
<string name="show_language_switch_key_summary" msgid="7343403647474265713">"Mostrar quando vários idiomas de entrada estiverem ativados"</string>
<string name="sliding_key_input_preview" msgid="6604262359510068370">"Mostrar indicador de deslize"</string>
<string name="sliding_key_input_preview_summary" msgid="6340524345729093886">"Mostrar indicação visual ao deslizar teclas Shift ou de símbolos"</string>
- <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Dispens. atraso chave princ."</string>
+ <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Duração de popup da tecla"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Sem atraso"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Padrão"</string>
<string name="abbreviation_unit_milliseconds" msgid="8700286094028323363">"<xliff:g id="MILLISECONDS">%s</xliff:g> ms"</string>
<string name="settings_system_default" msgid="6268225104743331821">"Padrão do sistema"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Sugerir nomes de contato"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Usar nomes dos Contatos para sugestões e correções"</string>
- <string name="use_double_space_period" msgid="8781529969425082860">"Duplo espaço p/ ponto"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Sugestões personalizadas"</string>
+ <string name="use_double_space_period" msgid="8781529969425082860">"Duplo espaço para ponto"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Toque duplo na barra de espaço insere um ponto seguido de espaço"</string>
- <string name="auto_cap" msgid="1719746674854628252">"Capitaliz. automática"</string>
+ <string name="auto_cap" msgid="1719746674854628252">"Capitalização automática"</string>
<string name="auto_cap_summary" msgid="7934452761022946874">"Iniciar a primeira palavra de cada frase com letra maiúscula"</string>
<string name="edit_personal_dictionary" msgid="3996910038952940420">"Dicionário pessoal"</string>
<string name="configure_dictionaries_title" msgid="4238652338556902049">"Dicionários complementares"</string>
<string name="main_dictionary" msgid="4798763781818361168">"Dicionário principal"</string>
- <string name="prefs_show_suggestions" msgid="8026799663445531637">"Exibir sugestões de correção"</string>
+ <string name="prefs_show_suggestions" msgid="8026799663445531637">"Mostrar sugestões de correção"</string>
<string name="prefs_show_suggestions_summary" msgid="1583132279498502825">"Exibir sugestões de palavras durante a digitação"</string>
<string name="prefs_suggestion_visibility_show_name" msgid="3219916594067551303">"Mostrar sempre"</string>
<string name="prefs_suggestion_visibility_show_only_portrait_name" msgid="3859783767435239118">"Mostrar em modo retrato"</string>
- <string name="prefs_suggestion_visibility_hide_name" msgid="6309143926422234673">"Sempre ocultar"</string>
+ <string name="prefs_suggestion_visibility_hide_name" msgid="6309143926422234673">"Não mostrar"</string>
<string name="prefs_block_potentially_offensive_title" msgid="5078480071057408934">"Bloquear palavras ofensivas"</string>
<string name="prefs_block_potentially_offensive_summary" msgid="2371835479734991364">"Não sugerir palavras potencialmente ofensivas"</string>
<string name="auto_correction" msgid="7630720885194996950">"Correção automática"</string>
@@ -66,63 +67,17 @@
<string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Moderado"</string>
<string name="auto_correction_threshold_mode_aggressive" msgid="7319007299148899623">"Agressivo"</string>
<string name="auto_correction_threshold_mode_very_aggressive" msgid="1853309024129480416">"Muito agressivo"</string>
- <string name="bigram_prediction" msgid="1084449187723948550">"Sugestões para a palavra seguinte"</string>
+ <string name="bigram_prediction" msgid="1084449187723948550">"Sugerir palavra seguinte"</string>
<string name="bigram_prediction_summary" msgid="3896362682751109677">"Usar a palavra anterior ao fazer sugestões"</string>
<string name="gesture_input" msgid="826951152254563827">"Ativar a escrita com gestos"</string>
<string name="gesture_input_summary" msgid="9180350639305731231">"Inserir uma palavra deslizando os dedos pelas letras"</string>
<string name="gesture_preview_trail" msgid="3802333369335722221">"Mostrar percurso do gesto"</string>
- <string name="gesture_floating_preview_text" msgid="4443240334739381053">"Visualizaç. dinâmica flutuante"</string>
+ <string name="gesture_floating_preview_text" msgid="4443240334739381053">"Previsão dinâmica flutuante"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Ver a palavra sugerida ao usar gestos"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Salvo"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Conecte um fone de ouvido para ouvir as chaves de senha em voz alta."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"O texto atual é %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Nenhum texto digitado"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> corrige <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> para <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> realiza correção automática"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Código de tecla %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift ativado (toque para desativar)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock ativado (toque para desativar)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Excluir"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Símbolos"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Letras"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Números"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Configurações"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Espaço"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Entrada de voz"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Carinha sorridente"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Voltar"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Pesquisar"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Ponto"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Alterar idioma"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Próximo"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Anterior"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift ativado"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock ativado"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift desativado"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Modo de símbolos"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Modo de cartas"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Modo de telefone"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Modo de símbolos de telefone"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Teclado oculto"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Mostrando teclado <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"data"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"data e hora"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-mail"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"mensagens"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"número"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefone"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"texto"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"hora"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
- <string name="voice_input" msgid="3583258583521397548">"Chave de entrada de texto por voz"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"No teclado principal"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"No teclado de símb."</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Desativado"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mic. no teclado"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mic. no teclado"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Texto por voz desat."</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Gesto de frase"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Inserir espaços durante gestos deslizando até a tecla de espaço"</string>
+ <string name="voice_input" msgid="3583258583521397548">"Tecla p/ inserir texto por voz"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nenhum método de entrada de texto por voz ativado. Verifique as configurações \"Idioma e entrada\"."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configurar métodos de entrada"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Idiomas de entrada"</string>
<string name="send_feedback" msgid="1780431884109392046">"Enviar comentários"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"inglês (Reino Unido)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"inglês (EUA)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"espanhol (EUA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Inglês (Reino Unido) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Inglês (EUA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"espanhol (EUA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradicional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Inglês (Reino Unido) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Inglês (EUA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Espanhol (EUA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradicional)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cirílico)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latino)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Nenhum idioma (alfabeto)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabeto (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabeto (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Ler arquivo de dicionário externo"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Nenhum arquivo de dicionário na pasta Downloads"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Selecione um arquivo de dicionário para instalar"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Deseja instalar este arquivo para <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Deseja instalar este arquivo para <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Ocorreu um erro"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Listar dicionário de contatos"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Despejar dicionário pessoal"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Despejar dicio. de hist. do usuário"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Despejar dicion. de personalização"</string>
<string name="button_default" msgid="3988017840431881491">"Padrão"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Bem-vindo ao <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"com entrada por gestos"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Atualizar"</string>
<string name="last_update" msgid="730467549913588780">"Última atualização"</string>
<string name="message_updating" msgid="4457761393932375219">"Verificando atualizações"</string>
- <string name="message_loading" msgid="8689096636874758814">"Carregando..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Carregando…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Dicionário principal"</string>
<string name="cancel" msgid="6830980399865683324">"Cancelar"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Configurações"</string>
<string name="install_dict" msgid="180852772562189365">"Instalar"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Cancelar"</string>
<string name="delete_dict" msgid="756853268088330054">"Excluir"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"O idioma selecionado em seu dispositivo móvel tem um dicionário disponível.&lt;br/&gt; Recomendamos &lt;b&gt;fazer o download&lt;/b&gt; do dicionário de <xliff:g id="LANGUAGE">%1$s</xliff:g> para melhorar sua experiência de digitação.&lt;br/&gt; O download pode levar um ou dois minutos por conexão 3G. Tarifas podem ser aplicáveis caso você não tenha um &lt;b&gt;plano de dados ilimitado&lt;/b&gt;.&lt;br/&gt; Se você não tem certeza quanto a seu plano de dados, recomendamos encontrar uma conexão Wi-Fi para iniciar o download automaticamente.&lt;br/&gt; Dica: você pode fazer o download de dicionários e removê-los acessando &lt;b&gt;Idioma e entrada&lt;/b&gt; no menu &lt;b&gt;Configurações&lt;/b&gt; de seu dispositivo móvel."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"O idioma selecionado em seu dispositivo móvel tem um dicionário disponível.&lt;br/&gt; Recomendamos &lt;b&gt;fazer o download&lt;/b&gt; do dicionário de <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> para melhorar sua experiência de digitação.&lt;br/&gt; O download pode levar um ou dois minutos por conexão 3G. Tarifas podem ser aplicáveis caso você não tenha um &lt;b&gt;plano de dados ilimitado&lt;/b&gt;.&lt;br/&gt; Se você não tem certeza quanto a seu plano de dados, recomendamos encontrar uma conexão Wi-Fi para iniciar o download automaticamente.&lt;br/&gt; Dica: você pode fazer o download de dicionários e removê-los acessando &lt;b&gt;Idioma e entrada&lt;/b&gt; no menu &lt;b&gt;Configurações&lt;/b&gt; do dispositivo móvel."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Fazer o download agora (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Fazer o download por Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Há um dicionário disponível para <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Há um dicionário disponível para <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Pressione para consultar e fazer o download"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Download em andamento: as sugestões para <xliff:g id="LANGUAGE">%1$s</xliff:g> estarão prontas em breve."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Download em andamento: as sugestões para <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> estarão disponíveis em breve."</string>
<string name="version_text" msgid="2715354215568469385">"Versão <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Adicionar"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Adicionar ao dicionário"</string>
diff --git a/java/res/values-rm/strings-talkback-descriptions.xml b/java/res/values-rm/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..05b816ab7
--- /dev/null
+++ b/java/res/values-rm/strings-talkback-descriptions.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- no translation found for spoken_use_headphones (896961781287283493) -->
+ <skip />
+ <!-- no translation found for spoken_current_text_is (2485723011272583845) -->
+ <skip />
+ <!-- no translation found for spoken_no_text_entered (7479685225597344496) -->
+ <skip />
+ <!-- no translation found for spoken_auto_correct (8005997889020109763) -->
+ <skip />
+ <!-- no translation found for spoken_auto_correct_obscured (6276420476908833791) -->
+ <skip />
+ <!-- no translation found for spoken_description_unknown (3197434010402179157) -->
+ <skip />
+ <!-- no translation found for spoken_description_shift (244197883292549308) -->
+ <skip />
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
+ <!-- no translation found for spoken_description_delete (8740376944276199801) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_symbol (5486340107500448969) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_alpha (23129338819771807) -->
+ <skip />
+ <!-- no translation found for spoken_description_to_numeric (591752092685161732) -->
+ <skip />
+ <!-- no translation found for spoken_description_settings (4627462689603838099) -->
+ <skip />
+ <!-- no translation found for spoken_description_tab (2667716002663482248) -->
+ <skip />
+ <!-- no translation found for spoken_description_space (2582521050049860859) -->
+ <skip />
+ <!-- no translation found for spoken_description_mic (615536748882611950) -->
+ <skip />
+ <!-- no translation found for spoken_description_smiley (2256309826200113918) -->
+ <skip />
+ <!-- no translation found for spoken_description_return (8178083177238315647) -->
+ <skip />
+ <!-- no translation found for spoken_description_search (1247236163755920808) -->
+ <skip />
+ <!-- no translation found for spoken_description_dot (40711082435231673) -->
+ <skip />
+ <!-- no translation found for spoken_description_language_switch (5507091328222331316) -->
+ <skip />
+ <!-- no translation found for spoken_description_action_next (8636078276664150324) -->
+ <skip />
+ <!-- no translation found for spoken_description_action_previous (800872415009336208) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_on (5700440798609574589) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_locked (593175803181701830) -->
+ <skip />
+ <!-- no translation found for spoken_description_shiftmode_off (657219998449174808) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_symbol (7183343879909747642) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_alpha (3528307674390156956) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_phone (6520207943132026264) -->
+ <skip />
+ <!-- no translation found for spoken_description_mode_phone_shift (5499629753962641227) -->
+ <skip />
+ <!-- no translation found for announce_keyboard_hidden (8718927835531429807) -->
+ <skip />
+ <!-- no translation found for announce_keyboard_mode (4729081055438508321) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_date (3137520166817128102) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_date_time (339593358488851072) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_email (6216248078128294262) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_im (1137405089766557048) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_number (7991623440699957069) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_phone (6851627527401433229) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_text (6479436687899701619) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_time (4381856885582143277) -->
+ <skip />
+ <!-- no translation found for keyboard_mode_url (1519819835514911218) -->
+ <skip />
+</resources>
diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml
index 3f0bab963..2ea98cf53 100644
--- a/java/res/values-rm/strings.xml
+++ b/java/res/values-rm/strings.xml
@@ -122,105 +122,8 @@
<skip />
<!-- no translation found for gesture_floating_preview_text_summary (4472696213996203533) -->
<skip />
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Memorisà"</string>
- <!-- no translation found for spoken_use_headphones (896961781287283493) -->
- <skip />
- <!-- no translation found for spoken_current_text_is (2485723011272583845) -->
- <skip />
- <!-- no translation found for spoken_no_text_entered (7479685225597344496) -->
- <skip />
- <!-- no translation found for spoken_auto_correct (8005997889020109763) -->
- <skip />
- <!-- no translation found for spoken_auto_correct_obscured (6276420476908833791) -->
- <skip />
- <!-- no translation found for spoken_description_unknown (3197434010402179157) -->
- <skip />
- <!-- no translation found for spoken_description_shift (244197883292549308) -->
- <skip />
- <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
- <skip />
- <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
- <skip />
- <!-- no translation found for spoken_description_delete (8740376944276199801) -->
- <skip />
- <!-- no translation found for spoken_description_to_symbol (5486340107500448969) -->
- <skip />
- <!-- no translation found for spoken_description_to_alpha (23129338819771807) -->
- <skip />
- <!-- no translation found for spoken_description_to_numeric (591752092685161732) -->
- <skip />
- <!-- no translation found for spoken_description_settings (4627462689603838099) -->
- <skip />
- <!-- no translation found for spoken_description_tab (2667716002663482248) -->
- <skip />
- <!-- no translation found for spoken_description_space (2582521050049860859) -->
- <skip />
- <!-- no translation found for spoken_description_mic (615536748882611950) -->
- <skip />
- <!-- no translation found for spoken_description_smiley (2256309826200113918) -->
- <skip />
- <!-- no translation found for spoken_description_return (8178083177238315647) -->
- <skip />
- <!-- no translation found for spoken_description_search (1247236163755920808) -->
- <skip />
- <!-- no translation found for spoken_description_dot (40711082435231673) -->
- <skip />
- <!-- no translation found for spoken_description_language_switch (5507091328222331316) -->
- <skip />
- <!-- no translation found for spoken_description_action_next (8636078276664150324) -->
- <skip />
- <!-- no translation found for spoken_description_action_previous (800872415009336208) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_on (5700440798609574589) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_locked (593175803181701830) -->
- <skip />
- <!-- no translation found for spoken_description_shiftmode_off (657219998449174808) -->
- <skip />
- <!-- no translation found for spoken_description_mode_symbol (7183343879909747642) -->
- <skip />
- <!-- no translation found for spoken_description_mode_alpha (3528307674390156956) -->
- <skip />
- <!-- no translation found for spoken_description_mode_phone (6520207943132026264) -->
- <skip />
- <!-- no translation found for spoken_description_mode_phone_shift (5499629753962641227) -->
- <skip />
- <!-- no translation found for announce_keyboard_hidden (8718927835531429807) -->
- <skip />
- <!-- no translation found for announce_keyboard_mode (4729081055438508321) -->
- <skip />
- <!-- no translation found for keyboard_mode_date (3137520166817128102) -->
- <skip />
- <!-- no translation found for keyboard_mode_date_time (339593358488851072) -->
- <skip />
- <!-- no translation found for keyboard_mode_email (6216248078128294262) -->
- <skip />
- <!-- no translation found for keyboard_mode_im (1137405089766557048) -->
- <skip />
- <!-- no translation found for keyboard_mode_number (7991623440699957069) -->
- <skip />
- <!-- no translation found for keyboard_mode_phone (6851627527401433229) -->
- <skip />
- <!-- no translation found for keyboard_mode_text (6479436687899701619) -->
- <skip />
- <!-- no translation found for keyboard_mode_time (4381856885582143277) -->
- <skip />
- <!-- no translation found for keyboard_mode_url (1519819835514911218) -->
- <skip />
<!-- no translation found for voice_input (3583258583521397548) -->
<skip />
- <!-- no translation found for voice_input_modes_main_keyboard (3360660341121083174) -->
- <skip />
- <!-- no translation found for voice_input_modes_symbols_keyboard (7203213240786084067) -->
- <skip />
- <!-- no translation found for voice_input_modes_off (3745699748218082014) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_main_keyboard (6586544292900314339) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_symbols_keyboard (5233725927281932391) -->
- <skip />
- <!-- no translation found for voice_input_modes_summary_off (63875609591897607) -->
- <skip />
<!-- no translation found for configure_input_method (373356270290742459) -->
<skip />
<string name="language_selection_title" msgid="1651299598555326750">"Linguas da cumonds vocals"</string>
diff --git a/java/res/values-ro/strings-config-important-notice.xml b/java/res/values-ro/strings-config-important-notice.xml
new file mode 100644
index 000000000..f481e8972
--- /dev/null
+++ b/java/res/values-ro/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Utilizează mesajele și datele introduse pt. a îmbunătăți sugestiile"</string>
+</resources>
diff --git a/java/res/values-ro/strings-talkback-descriptions.xml b/java/res/values-ro/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..2b428eb0b
--- /dev/null
+++ b/java/res/values-ro/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Conectați un set căști-microfon pentru a auzi tastele apăsate când introduceți parola."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Textul curent este %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Nu a fost introdus text"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corectează <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> cu <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> efectuează corectare automată"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Tasta cu codul %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Tasta Shift este activată (apăsați pentru a o dezactiva)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Tasta Caps Lock este activată (apăsați pentru a o dezactiva)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Ștergeți"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simboluri"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Litere"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Cifre"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Setări"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Tasta Space"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Intrare vocală"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoticonuri"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Return"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Căutați"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Bulină"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Schimbați limba"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Înai."</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Înapoi"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Tasta Shift a fost activată"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Tasta Caps Lock este activată"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Tasta Shift a fost dezactivată"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modul Simboluri"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modul Alfanumeric"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modul Telefon"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modul Telefon cu simboluri"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Tastatura este ascunsă"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Se afișează tastatura pentru <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"data"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"date și ore"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"adrese de e-mail"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"mesaje"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"numere"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefoane"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"text"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"ore"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"adrese URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Recente"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Persoane"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Obiecte"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natură"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Locații"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simboluri"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticonuri"</string>
+</resources>
diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml
index 147f83e61..51d3c5901 100644
--- a/java/res/values-ro/strings.xml
+++ b/java/res/values-ro/strings.xml
@@ -46,6 +46,7 @@
<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_personalized_dicts" msgid="5167396352105467626">"Sugestii personalizate"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Inserează punct spațiu"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Dubla atingere a barei de spațiu inserează punct urmat de spațiu"</string>
<string name="auto_cap" msgid="1719746674854628252">"Scriere automată cu majuscule"</string>
@@ -73,56 +74,10 @@
<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="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: salvat"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Conectaţi un set căşti-microfon pentru a auzi tastele apăsate când introduceţi parola."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Textul curent este %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Nu a fost introdus text"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> corectează <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> cu <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> efectuează corectare automată"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Tasta cu codul %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Tasta Shift este activată (apăsaţi pentru a o dezactiva)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Tasta Caps Lock este activată (apăsaţi pentru a o dezactiva)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Simboluri"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Litere"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Cifre"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Setări"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Spaţiu"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Intrare vocală"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Faţă zâmbitoare"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Căutaţi"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Punct"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Schimbaţi limba"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Înainte"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Înapoi"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Tasta Shift a fost activată"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Tasta Caps Lock a fost activată"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Tasta Shift a fost dezactivată"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Modul Simboluri"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Modul Alfanumeric"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Modul Telefon"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Modul Telefon cu simboluri"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Tastatura este ascunsă"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Se afișează tastatura pentru <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"date"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"date și ore"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"adrese de e-mail"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"mesaje"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"numere"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefoane"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"text"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"ore"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"adrese URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Gest expresie"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Introduceți spații în timpul gesturilor, glisând pe tasta spațiu"</string>
<string name="voice_input" msgid="3583258583521397548">"Tastă pentru intrarea vocală"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Pe tastat. princip."</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Pe tastat. simbol."</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Dezactivată"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mic. pe tast. princ."</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Micr. pe tast. simb."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Intr. vocală dezact."</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nicio metodă de intrare vocală activată. Verificați setările pentru limbă și introducere de text."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configuraţi metodele de intrare"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Selectaţi limba"</string>
<string name="send_feedback" msgid="1780431884109392046">"Trimiteți feedback"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"engleză (Regatul Unit)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"engleză (S.U.A.)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"spaniolă (S.U.A.)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Engleză (Regatul Unit) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Engleză (S.U.A.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spaniolă (S.U.A.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradițional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Engleză (Regatul Unit) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Engleză (S.U.A.) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spaniolă (S.U.A.) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradițională)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Chirilică)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latină)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Nicio limbă (alfabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabet (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Citiți fișierul de dicționar extern"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Nu există fișiere dicționar în dosarul Descărcări"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Selectați un fișier dicționar de instalat"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Doriți să instalați acest fișier pentru <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Doriți să instalați acest fișier pentru <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"A apărut o eroare"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Listați dicționar persoane contact"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Listați dicționar personal"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Listați dicționar istoric utilizator"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Listați dicționar personalizare"</string>
<string name="button_default" msgid="3988017840431881491">"Prestabilit"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Bun venit la <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"cu Tastarea gestuală"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Actualizați"</string>
<string name="last_update" msgid="730467549913588780">"Data ultimei modificări"</string>
<string name="message_updating" msgid="4457761393932375219">"Se verifică existența actualizărilor"</string>
- <string name="message_loading" msgid="8689096636874758814">"Se încarcă..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Se încarcă..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"Dicționar principal"</string>
<string name="cancel" msgid="6830980399865683324">"Anulaţi"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Setări"</string>
<string name="install_dict" msgid="180852772562189365">"Instalați"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Anulați"</string>
<string name="delete_dict" msgid="756853268088330054">"Ștergeți"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Limba selectată pe dispozitivul mobil are un dicționar disponibil.&lt;br/&gt; Vă recomandăm să &lt;b&gt;descărcați&lt;/b&gt; dicționarul de <xliff:g id="LANGUAGE">%1$s</xliff:g> pentru a vă îmbunătăți experiența la introducerea textului.&lt;br/&gt; &lt;br/&gt; Descărcarea prin 3G poate dura un minut sau două. Se pot aplica taxe dacă nu aveți un &lt;b&gt;plan de date nelimitat&lt;/b&gt;.&lt;br/&gt; Dacă nu știți sigur ce plan de date aveți, găsiți o conexiune Wi-Fi și descărcați automat.&lt;br/&gt; &lt;br/&gt; Sfat: puteți să descărcați și să eliminați dicționare accesând &lt;b&gt;Limbă și introducere de text&lt;/b&gt; din meniul &lt;b&gt;Setări&lt;/b&gt;, pe dispozitivul mobil."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Pentru limba selectată pe dispozitivul dvs. mobil este disponibil un dicționar.&lt;br/&gt; Vă recomandăm să &lt;b&gt;descărcați&lt;/b&gt; dicționarul de <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> pentru o mai bună experiență a introducerii de text.&lt;br/&gt; &lt;br/&gt; Descărcarea poate dura un minut sau două prin 3G. Dacă nu aveți un &lt;b&gt;plan de date nelimitat&lt;/b&gt;, se pot aplica taxe.&lt;br/&gt; Dacă nu știți sigur ce plan de date aveți, vă recomandăm să căutați o conexiune Wi-Fi pentru a începe automat descărcarea.&lt;br/&gt; &lt;br/&gt; Sfat: puteți să descărcați și să ștergeți dicționare accesând opțiunea &lt;b&gt;Limbă și introducere de text&lt;/b&gt; din meniul &lt;b&gt;Setări&lt;/b&gt; al dispozitivului mobil."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Descărcați acum (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Descărcați prin Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Este disponibil un dicționar pentru <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Este disponibil un dicționar pentru <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Apăsați pentru examinare și descărcare"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Se descarcă: sugestiile pentru <xliff:g id="LANGUAGE">%1$s</xliff:g> vor fi gata în curând."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Se descarcă: sugestiile pentru <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> vor fi gata în curând."</string>
<string name="version_text" msgid="2715354215568469385">"Versiunea <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Adăugați"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Adăugați în dicționar"</string>
diff --git a/java/res/values-ru/strings-config-important-notice.xml b/java/res/values-ru/strings-config-important-notice.xml
new file mode 100644
index 000000000..5e6999c1f
--- /dev/null
+++ b/java/res/values-ru/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-ru/strings-talkback-descriptions.xml b/java/res/values-ru/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..7e64f11b0
--- /dev/null
+++ b/java/res/values-ru/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Подключите гарнитуру, чтобы услышать пароль."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Введенный текст: %s."</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Текст не введен."</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"При нажатии клавиши <xliff:g id="KEY_NAME">%1$s</xliff:g> слово <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> будет исправлено на <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>."</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Клавиша <xliff:g id="KEY_NAME">%1$s</xliff:g> выполняет автоисправление."</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Код клавиши %d."</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Клавиша верхнего регистра."</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Верхний регистр включен. Нажмите, чтобы отключить."</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps Lock включен. Нажмите, чтобы отключить."</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Удалить."</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Символы."</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Буквы."</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Цифры."</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Настройки."</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Клавиша Tab."</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Пробел."</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Голосовой ввод."</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Смайлики."</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Ввод."</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Поиск."</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Маркер списка."</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Сменить язык."</string>
+ <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">"Caps Lock включен."</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Верхний регистр отключен."</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Режим добавления символов."</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Режим ввода текста."</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Режим набора номера."</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Режим телефонных символов."</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Клавиатура скрыта."</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Включен режим <xliff:g id="KEYBOARD_MODE">%s</xliff:g>."</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"ввода даты"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"ввода даты и времени"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"ввода адреса электронной почты"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"ввода сообщения"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"ввода цифр"</string>
+ <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">"ввода URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Природа."</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Места."</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Символы."</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Смайлики."</string>
+</resources>
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index 8bbaead0a..bef248385 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"По умолчанию"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Подсказывать имена"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Подсказывать исправления на основе имен из списка контактов"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Пользовательские словари"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Ставить точки автоматически"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Вводить точку с пробелом двойным нажатием кнопки \"Пробел\"."</string>
<string name="auto_cap" msgid="1719746674854628252">"Заглавные автоматически"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Рисовать линию"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Показывать подсказки"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Показывать подсказки при вводе текста"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: сохранено"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Подключите гарнитуру, чтобы услышать пароль."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Введенный текст: %s."</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Текст не введен"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"При нажатии клавиши \"<xliff:g id="KEY">%1$s</xliff:g>\" слово \"<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>\" будет исправлено на \"<xliff:g id="CORRECTED">%3$s</xliff:g>\""</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"Для клавиши \"<xliff:g id="KEY">%1$s</xliff:g>\" назначена функция автоисправления"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Код клавиши:%d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Клавиша верхнего регистра"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Верхний регистр включен (нажмите, чтобы отключить)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock включен (нажмите, чтобы отключить)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Клавиша удаления"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Клавиша символов"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Буквы"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Цифры"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Настройки"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Клавиша табуляции"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Пробел"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Голосовой ввод"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Смайлик"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Клавиша \"Ввод\""</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Поиск"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Точка"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Сменить язык"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Далее"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Назад"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Верхний регистр включен"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps Lock включен"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Верхний регистр отключен"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Режим добавления символов"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Режим ввода текста"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Режим набора номера"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Режим телефонных символов"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Клавиатура скрыта"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Включен режим <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"ввода даты"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"ввода даты и времени"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"ввода адреса электронной почты"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"ввода сообщения"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"ввода цифр"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"набора номера"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"ввода текста"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"ввода времени"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"ввода URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Непрерывный ввод фраз"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Проводите по клавише пробела после каждого слова"</string>
<string name="voice_input" msgid="3583258583521397548">"Кнопка голосового ввода"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Значок на основной клавиатуре"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Значок на клавиатуре символов"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Выкл."</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Значок на основной клавиатуре"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Значок на клавиатуре символов"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Голосовой ввод откл."</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Голосовой способ ввода не включен. Проверьте раздел настроек \"Язык и ввод\"."</string>
<string name="configure_input_method" msgid="373356270290742459">"Настройка способов ввода"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Языки ввода"</string>
<string name="send_feedback" msgid="1780431884109392046">"Отправить отзыв"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"английский (Великобритания)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"английский (США)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Испанский (США)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Английская (Великобр.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Английская (США) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Испанский (США): <xliff:g id="LAYOUT">%s</xliff:g>"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (традиционный)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Английский (Великобритания, <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Английский (США, <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Испанский (США, <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (классическая)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (кириллица)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (латиница)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Язык не определен (латиница)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Латиница (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Латиница (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Загрузить словарь из файла"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"В папке \"Загрузки\" нет словарей"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Выберите файл словаря"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Установить этот файл для следующего языка: <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Установить этот файл для следующего языка: <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Ошибка"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Выгрузить словарь контактов"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Выгрузить личный словарь"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Выгрузить словарь польз. истории"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Выгрузить словарь персонализации"</string>
<string name="button_default" msgid="3988017840431881491">"По умолчанию"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Представляем приложение \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"с непрерывным вводом"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Обновить"</string>
<string name="last_update" msgid="730467549913588780">"Последнее обновление"</string>
<string name="message_updating" msgid="4457761393932375219">"Проверка обновлений…"</string>
- <string name="message_loading" msgid="8689096636874758814">"Загрузка..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Загрузка…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Основной словарь"</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="delete_dict" msgid="756853268088330054">"Удалить"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Доступен <xliff:g id="LANGUAGE">%1$s</xliff:g> словарь для проверки правописания.&lt;br/&gt;Рекомендуем &lt;b&gt;установить&lt;/b&gt; его, чтобы быстрее вводить текст.&lt;br/&gt;&lt;br/&gt;Если вашим тарифом предусмотрена &lt;b&gt;безлимитная передача данных&lt;/b&gt;, словарь можно загрузить через сеть 3G (это займет всего пару минут).&lt;br/&gt;Если вы не помните подробностей своего тарифного плана, лучше подключитесь к сети Wi-Fi (загрузка начнется автоматически).&lt;br/&gt;&lt;br/&gt;Совет. Чтобы добавить, удалить или настроить словарь, откройте раздел &lt;b&gt;Язык и ввод&lt;/b&gt; в настройках своего устройства."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Доступен словарь для проверки правописания (<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>).&lt;br/&gt;Рекомендуем &lt;b&gt;установить&lt;/b&gt; его, чтобы быстрее вводить текст.&lt;br/&gt;&lt;br/&gt;Если вашим тарифом предусмотрена &lt;b&gt;безлимитная передача данных&lt;/b&gt;, словарь можно загрузить через сеть 3G (это займет всего пару минут).&lt;br/&gt;Если вы не помните подробностей своего тарифного плана, лучше подключитесь к сети Wi-Fi (загрузка начнется автоматически).&lt;br/&gt;&lt;br/&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="6514288591959117288">"Доступен словарь: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Доступен словарь: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Нажмите, чтобы просмотреть и загрузить"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Загрузка словаря: <xliff:g id="LANGUAGE">%1$s</xliff:g>…"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Загрузка словаря (<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>)…"</string>
<string name="version_text" msgid="2715354215568469385">"Версия <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Добавить"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Добавление в словарь"</string>
diff --git a/java/res/values-sk/strings-config-important-notice.xml b/java/res/values-sk/strings-config-important-notice.xml
new file mode 100644
index 000000000..9b15ac992
--- /dev/null
+++ b/java/res/values-sk/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Zlepšovať návrhy na základe komunikácie a zadaných údajov"</string>
+</resources>
diff --git a/java/res/values-sk/strings-talkback-descriptions.xml b/java/res/values-sk/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..605aceb38
--- /dev/null
+++ b/java/res/values-sk/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Ak si chcete pri zadávaní hesla vypočuť nahlas vyslovené klávesy, pripojte náhlavnú súpravu."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Aktuálny text je %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Nie je zadaný žiadny text"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"Klávesom <xliff:g id="KEY_NAME">%1$s</xliff:g> opravíte slovo <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> na <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Klávesom <xliff:g id="KEY_NAME">%1$s</xliff:g> spustíte automatické opravy"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Kód klávesa %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Kláves Shift je zapnutý (zakážete ho klepnutím)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Kláves Caps Lock je zapnutý (zakážete ho klepnutím)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Odstrániť"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symboly"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Písmená"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Čísla"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Nastavenia"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Karta"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Medzerník"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Hlasový vstup"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Hľadať"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Bodka"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Prepnúť jazyk"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Ďalej"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Naspäť"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Kláves Shift je povolený"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Kláves Caps Lock je povolený"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Kláves Shift je zakázaný"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Režim symbolov"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Režim písmen"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Režim telefónu"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Režim telefónnych symbolov"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Klávesnica je skrytá"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Je zobrazená klávesnica <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"dátum"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"dátum a čas"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-mail"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"odosielanie správ"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"číslo"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefón"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"text"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"čas"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"Adresa URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Nedávne"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Ľudia"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Predmety"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Príroda"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Miesta"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symboly"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emotikony"</string>
+</resources>
diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml
index d1f966cea..9a3564782 100644
--- a/java/res/values-sk/strings.xml
+++ b/java/res/values-sk/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Predvolené nastav."</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Navrhnúť mená kontaktov"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Používať mená z Kontaktov na návrhy a opravy"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Prispôsobené návrhy"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Bodka s medzerou"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Dvojitým klepnutím na medzerník vložíte bodku a medzeru."</string>
<string name="auto_cap" msgid="1719746674854628252">"Veľké písmená automaticky"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Zobrazovať stopu gesta"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamická plávajúca ukážka"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Zobrazenie navrhovaného slova pri písaní gestami"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Uložené"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Ak si chcete pri zadávaní hesla vypočuť nahlas vyslovené klávesy, pripojte náhlavnú súpravu."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Aktuálny text je %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Nie je zadaný žiadny text"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"Klávesom <xliff:g id="KEY">%1$s</xliff:g> opravíte slovo <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> na <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"Klávesom <xliff:g id="KEY">%1$s</xliff:g> spustíte automatické opravy"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Kód klávesu %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Kláves Shift je zapnutý (zakážete ho klepnutím)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Kláves Caps Lock je zapnutý (zakážete ho klepnutím)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symboly"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Písmená"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Čísla"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Nastavenia"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Karta"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Medzerník"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Hlasový vstup"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Usmiata tvár"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Hľadať"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Bodka"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Prepnúť jazyk"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Ďalšie"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Predchádzajúce"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Kláves Shift je povolený"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Kláves Caps Lock je povolený"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Kláves Shift je zakázaný"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Režim symbolov"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Režim písmen"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Režim telefónu"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Režim telefónnych symbolov"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Klávesnica je skrytá"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Zobrazenie klávesnice v režime <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"dátum"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"dátum a čas"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-mail"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"odosielanie správ"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"číslo"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefón"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"text"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"čas"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"Adresa URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Frázové gesto"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Medzery medzi gestá vložíte prejdením po klávese medzerníka"</string>
<string name="voice_input" msgid="3583258583521397548">"Kľúč hlasového vstupu"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Na hlavnej klávesnici"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Na klávesnici so symbolmi"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Vypnuté"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mikrofón na hlavnej klávesnici"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mikrofón na klávesnici so symbolmi"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Hlasový vstup je zakázaný"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nie sú povolené žiadne metódy hlasového vstupu. Skontrolujte nastavenia položky Jazyk a vstup."</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfigurovať metódy vstupu"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Jazyky vstupu"</string>
<string name="send_feedback" msgid="1780431884109392046">"Odoslať spätnú väzbu"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Anglická klávesnica (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Anglická klávesnica (US)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"španielčina (USA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"angličtina (UK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"angličtina (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"španielčina (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradičná)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"angličtina (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"angličtina (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"španielčina (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradičná)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cyrilika)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latinka)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Žiadny jazyk (latinka)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Latinka (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Latinka (QWERTZ)"</string>
@@ -166,10 +123,14 @@
<string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"Trvanie vibrov. pri stlač. kl."</string>
<string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"Hlasitosť pri stlačení klávesu"</string>
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Čítať súbor externého slovníka"</string>
- <string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"V priečinku Preberanie nie sú žiadne súbory slovníka"</string>
+ <string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"V priečinku Sťahovanie nie sú žiadne súbory slovníka"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Vyberte súbor slovníka, ktorý chcete nainštalovať"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Chcete nainštalovať tento súbor pre jazyk <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Chcete nainštalovať tento súbor pre jazyk <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Vyskytla sa chyba"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Vypísať slovník kontaktov"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Vypísať osobný slovník"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Vypísať slovník histór. používateľa"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Vypísať slovník prispôsobení"</string>
<string name="button_default" msgid="3988017840431881491">"Predvolené"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Vitajte v aplikácii <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"s funkciou Písanie gestami"</string>
@@ -199,7 +160,7 @@
<string name="user_dictionaries" msgid="3582332055892252845">"Používateľské slovníky"</string>
<string name="default_user_dict_pref_name" msgid="1625055720489280530">"Používateľský slovník"</string>
<string name="dictionary_available" msgid="4728975345815214218">"K dispozícii je slovník"</string>
- <string name="dictionary_downloading" msgid="2982650524622620983">"Aktuálne sa preberá"</string>
+ <string name="dictionary_downloading" msgid="2982650524622620983">"Aktuálne sa sťahuje"</string>
<string name="dictionary_installed" msgid="8081558343559342962">"Nainštalované"</string>
<string name="dictionary_disabled" msgid="8950383219564621762">"Nainštalovaný, zakázaný"</string>
<string name="cannot_connect_to_dict_service" msgid="9216933695765732398">"Probl. s prip. k sl."</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Obnoviť"</string>
<string name="last_update" msgid="730467549913588780">"Posledná aktualizácia"</string>
<string name="message_updating" msgid="4457761393932375219">"Prebieha kontrola aktualizácií"</string>
- <string name="message_loading" msgid="8689096636874758814">"Načítava sa..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Prebieha načítavanie..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"Hlavný slovník"</string>
<string name="cancel" msgid="6830980399865683324">"Zrušiť"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Nastavenia"</string>
<string name="install_dict" msgid="180852772562189365">"Inštalovať"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Zrušiť"</string>
<string name="delete_dict" msgid="756853268088330054">"Odstrániť"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Pre vybratý jazyk mobilného zariadenia je k dispozícii slovník.&lt;br/&gt; Slovník jazyka <xliff:g id="LANGUAGE">%1$s</xliff:g> vám odporúčame &lt;b&gt;prevziať&lt;/b&gt;. Pomôže vám pri zadávaní textu.&lt;br/&gt; &lt;br/&gt; V sieti 3G môže preberanie chvíľu trvať. Ak nemáte &lt;b&gt;neobmedzený dátový program&lt;/b&gt;, môžu sa účtovať poplatky.&lt;br/&gt; Ak s určitosťou neviete aký dátový program používate, vyhľadajte pripojenie k sieti Wi-Fi a preberanie sa spustí automaticky.&lt;br/&gt; &lt;br/&gt; Tip: Slovníky môžete v mobilnom zariadení preberať a odstraňovať v časti &lt;b&gt;Jazyk a vstup&lt;/b&gt; ponuky &lt;b&gt;Nastavenia&lt;/b&gt;."</string>
- <string name="download_over_metered" msgid="1643065851159409546">"Prevziať (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
- <string name="do_not_download_over_metered" msgid="2176209579313941583">"Prevziať cez sieť Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"K dispozícii je slovník pre jazyk <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Pre vybratý jazyk mobilného zariadenia je k dispozícii slovník.&lt;br/&gt; Slovník jazyka <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> vám odporúčame &lt;b&gt;stiahnuť&lt;/b&gt;. Pomôže vám pri zadávaní textu.&lt;br/&gt; &lt;br/&gt; V sieti 3G môže sťahovanie trvať jednu až dve minúty. Ak nemáte &lt;b&gt;neobmedzený dátový program&lt;/b&gt;, môžu sa účtovať poplatky.&lt;br/&gt; Ak s určitosťou neviete aký dátový program používate, vyhľadajte pripojenie k sieti Wi-Fi a sťahovanie sa spustí automaticky.&lt;br/&gt; &lt;br/&gt; Tip: Slovníky môžete v mobilnom zariadení sťahovať a odstraňovať v časti &lt;b&gt;Jazyk a vstup&lt;/b&gt; ponuky &lt;b&gt;Nastavenia&lt;/b&gt;."</string>
+ <string name="download_over_metered" msgid="1643065851159409546">"Stiahnuť (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
+ <string name="do_not_download_over_metered" msgid="2176209579313941583">"Stiahnuť cez sieť Wi-Fi"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"K dispozícii je slovník pre jazyk <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Stlačením skontrolujete a prevezmete"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Preberanie: návrhy pre jazyk <xliff:g id="LANGUAGE">%1$s</xliff:g> budú čoskoro k dispozícii."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Sťahovanie: návrhy pre jazyk <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> budú čoskoro k dispozícii."</string>
<string name="version_text" msgid="2715354215568469385">"Verzia <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Pridať"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Pridať do slovníka"</string>
diff --git a/java/res/values-sl/strings-config-important-notice.xml b/java/res/values-sl/strings-config-important-notice.xml
new file mode 100644
index 000000000..d5bed6fd8
--- /dev/null
+++ b/java/res/values-sl/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Vaša sporočila in vnesene podatke uporabi za boljše predloge"</string>
+</resources>
diff --git a/java/res/values-sl/strings-talkback-descriptions.xml b/java/res/values-sl/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..280393a70
--- /dev/null
+++ b/java/res/values-sl/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Priključite slušalke, če želite slišati izgovorjene tipke gesla."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Trenutno besedilo je %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Ni vnesenega besedila"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"Tipka <xliff:g id="KEY_NAME">%1$s</xliff:g> popravi <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> v <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Tipka <xliff:g id="KEY_NAME">%1$s</xliff:g> izvede samopopravek"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Koda tipke %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Tipka Shift je vklopljena (dotaknite se, da jo onemogočite)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Tipka Caps lock je vklopljena (dotaknite se, da jo onemogočite)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Izbriši"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simboli"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Črke"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Števila"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Nastavitve"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Preslednica"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Glasovni vnos"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Znaki »emoji«"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Return"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Iskanje"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Pika"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Preklop jezika"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Naprej"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Nazaj"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Način »Shift« je omogočen"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Funkcija »Caps Lock« je omogočena"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Način »Shift« je onemogočen"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Način simbolov"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Način črk"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Način telefona"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Način simbolov telefona"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Tipkovnica je skrita"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Prikaz tipkovnice <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"datum"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"datum in ura"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-pošta"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"sporočila"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"števila"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"besedilo"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"ura"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Nedavni"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Osebe"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Predmeti"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Narava"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Mesta"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simboli"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Čustveni simboli"</string>
+</resources>
diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml
index a0f83c12f..2594aaec4 100644
--- a/java/res/values-sl/strings.xml
+++ b/java/res/values-sl/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Privzeto v sistemu"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Predlagaj imena stikov"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Uporaba imen iz stikov za predloge in popravke"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Prilagojeni predlogi"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Dva presl. za vnos pike"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Z dvojnim dotikom preslednice vstavite piko in za njo presledek"</string>
<string name="auto_cap" msgid="1719746674854628252">"Samod. velike začetnice"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Prikaži pot poteze"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dinamični plavajoči predogled"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Prikaz predlagane besede med vnosom s prstom"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: shranjeno"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Priključite slušalke, če želite slišati izgovorjene tipke gesla."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Trenutno besedilo je %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Ni vnesenega besedila"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"Tipka <xliff:g id="KEY">%1$s</xliff:g> popravi <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> v <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"Tipka <xliff:g id="KEY">%1$s</xliff:g> izvede samodejno popravljanje"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Koda tipke %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift je vklopljen (dotaknite se, da onemogočite)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock je vklopljen (dotaknite se, da onemogočite)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Simboli"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Pisma"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Številke"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Nastavitve"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabulator"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Presledek"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Glasovni vnos"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smeško"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Vračalka"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Iskanje"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Pika"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Preklop jezika"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Naprej"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Nazaj"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Način »Shift« je omogočen"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Način »Caps Lock« je omogočen"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Način »Shift« je onemogočen"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Način simbolov"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Način črk"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Način telefona"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Način simbolov telefona"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Tipkovnica je skrita"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Prikaz tipkovnice: <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"datum"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"datum in ura"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-pošta"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"sporočila"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"števila"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"besedilo"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"ura"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Vnos besed s potezami"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Vnos presledkov pri vnašanju s potezami z drsenjem po preslednici"</string>
<string name="voice_input" msgid="3583258583521397548">"Tipka za glasovni vnos"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Na glavni tipkovnici"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Na tipk. s simboli"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Izklopljeno"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mik. na glavni tipk."</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mik. na tipk. s sim."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Glas. vnos je onem."</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Ni omogočenih glasovnih načinov vnosa. Preverite nastavitve v razdelku »Jezik in vnos«."</string>
<string name="configure_input_method" msgid="373356270290742459">"Nastavitev načinov vnosa"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Jeziki vnosa"</string>
<string name="send_feedback" msgid="1780431884109392046">"Pošljite povratne informacije"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"angleščina (Združeno kraljestvo)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"angleščina (ZDA)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"španščina (ZDA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Angleška (Zdr. kralj.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Angleška (ZDA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"španščina (ZDA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (tradicionalna)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"angleščina (VB) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"angleščina (ZDA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"španščina (ZDA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradicionalna)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cirilica)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latinica)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Brez jezika (latinice)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Latinica (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Latinica (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Branje zunanje datoteke slovarja"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"V mapi »Prenosi« ni nobene datoteke slovarja"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Izberite datoteko slovarja, ki jo želite namestiti"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Zares želite namestiti to datoteko za jezik <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Zares želite namestiti to datoteko za ta jezik: <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Prišlo je do napake"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Izpis slovarja stikov"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Izvoz osebnega slovarja"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Izvoz slovarja zgodovine uporabnika"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Izvoz slovarja za prilagajanje"</string>
<string name="button_default" msgid="3988017840431881491">"Privzeto"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Pozdravljeni v aplikaciji <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"s pisanjem s kretnjami"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Osveži"</string>
<string name="last_update" msgid="730467549913588780">"Nazadnje posodobljeno"</string>
<string name="message_updating" msgid="4457761393932375219">"Iskanje posodobitev"</string>
- <string name="message_loading" msgid="8689096636874758814">"Nalaganje ..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Nalaganje …"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Glavni slovar"</string>
<string name="cancel" msgid="6830980399865683324">"Prekliči"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Nastavitve"</string>
<string name="install_dict" msgid="180852772562189365">"Namesti"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Prekliči"</string>
<string name="delete_dict" msgid="756853268088330054">"Izbriši"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Za izbrani jezik v mobilni napravi je na voljo slovar.&lt;br/&gt; Za izboljšano izkušnjo tipkanja priporočamo, da &lt;b&gt;prenesete&lt;/b&gt; slovar za ta jezik: <xliff:g id="LANGUAGE">%1$s</xliff:g>.&lt;br/&gt; &lt;br/&gt; Prenos prek povezave 3G lahko traja minuto ali dve. Če nimate &lt;b&gt;neomejenega podatkovnega paketa&lt;/b&gt;.&lt;br/&gt;, boste morda morali plačati prenos podatkov. Če ne veste, kateri podatkovni paket imate, priporočamo, da poiščete omrežje Wi-Fi in prenos začnete samodejno.&lt;br/&gt; &lt;br/&gt; Nasvet: Slovarje lahko prenesete in odstranite tako, da v meniju &lt;b&gt;Nastavitve&lt;/b&gt; v mobilni napravi odprete &lt;b&gt;Jezik in vnos&lt;/b&gt;."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Za izbrani jezik v mobilni napravi je na voljo slovar.&lt;br/&gt; Za izboljšano izkušnjo tipkanja priporočamo, da &lt;b&gt;prenesete&lt;/b&gt; slovar za ta jezik: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>.&lt;br/&gt; &lt;br/&gt; Prenos prek povezave 3G lahko traja minuto ali dve. Če nimate &lt;b&gt;neomejenega podatkovnega paketa&lt;/b&gt;.&lt;br/&gt;, boste morda morali plačati prenos podatkov. Če ne veste, kateri podatkovni paket imate, priporočamo, da poiščete omrežje Wi-Fi in prenos začnete samodejno.&lt;br/&gt; &lt;br/&gt; Nasvet: slovarje lahko prenesete in odstranite tako, da v meniju &lt;b&gt;Nastavitve&lt;/b&gt; v mobilni napravi odprete &lt;b&gt;Jezik in vnos&lt;/b&gt;."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Prenesi zdaj (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Prenos prek povezave Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Slovar je na voljo za jezik <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Na voljo je slovar za ta jezik: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Pritisnite za pregled in prenos"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Predlogi za prenos za jezik <xliff:g id="LANGUAGE">%1$s</xliff:g> bodo kmalu pripravljeni."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Prenos: predlogi za jezik <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> bodo kmalu na voljo."</string>
<string name="version_text" msgid="2715354215568469385">"Različica <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Dodaj"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Dodaj v slovar"</string>
diff --git a/java/res/values-sr/strings-config-important-notice.xml b/java/res/values-sr/strings-config-important-notice.xml
new file mode 100644
index 000000000..943135cfd
--- /dev/null
+++ b/java/res/values-sr/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-sr/strings-talkback-descriptions.xml b/java/res/values-sr/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..402d45b91
--- /dev/null
+++ b/java/res/values-sr/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Укључите слушалице да бисте чули наглас изговорене тастере за лозинку."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Тренутни текст је %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Текст није унет"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> исправља <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> у <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> обавља аутоматско исправљање"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Кôд тастера %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift је укључен (додирните да бисте га онемогућили)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock је укључен (додирните да бисте га онемогућили)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Избриши"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Симболи"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Слова"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Бројеви"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Подешавања"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Картица"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Размак"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Гласовни унос"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Емоџи"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Return"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Претражи"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Тачка"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Пребаци језик"</string>
+ <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">"Shift је омогућен"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock је омогућен"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift је онемогућен"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Режим симбола"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Режим слова"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Режим телефона"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Режим симбола телефона"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Тастатура је сакривена"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Приказујемо тастатуру у режиму <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"датум"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"датум и време"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"имејл"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"размена порука"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"број"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Природа"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Места"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Симболи"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Емотикони"</string>
+</resources>
diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml
index ce4978ff5..7bd7f67e5 100644
--- a/java/res/values-sr/strings.xml
+++ b/java/res/values-sr/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Подразумевано"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Предложи имена контаката"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Користи имена из Контаката за предлоге и исправке"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Персонализовани предлози"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Тачка и размак"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Двоструким додиром размака умеће се тачка праћена размаком"</string>
<string name="auto_cap" msgid="1719746674854628252">"Аутоматски унос великих слова"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Прикажи траг покрета"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Динамички плутајући преглед"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Приказује предложену реч при уносу покретом"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Сачувано"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Укључите слушалице да бисте чули наглас изговорене тастере за лозинку."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Тренутни текст је %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Текст није унет"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> исправља <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> у <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> обавља функцију аутоматског исправљања"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Кôд тастера %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift је укључен (додирните да бисте га онемогућили)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock је укључен (додирните да бисте га онемогућили)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Симболи"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Слова"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Бројеви"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Подешавања"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Размак"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Гласовни унос"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Смајли"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Претражи"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Тачка"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Пребаци језик"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Следеће"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Претходно"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift је омогућен"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock је омогућен"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift је онемогућен"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Режим симбола"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Режим слова"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Режим телефона"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Режим симбола телефона"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Тастатура је сакривена"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Приказује се тастатура у режиму <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"датум"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"датум и време"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"адреса е-поште"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"размена порука"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"број"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"телефон"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"текст"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"време"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Покрет за фразе"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Уносите размаке током покрета преласком до тастера за размак"</string>
<string name="voice_input" msgid="3583258583521397548">"Тастер за гласовни унос"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"На главној тастатури"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"На тастатури са симболима"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Искључи"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Микрофон на главној тастатури"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Микрофон на тастатури са симболима"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Гласовни унос је онемогућен"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Ниједан метод гласовног уноса није омогућен. Проверите Подешавања језика и уноса."</string>
<string name="configure_input_method" msgid="373356270290742459">"Конфигурисање метода уноса"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Језици за унос"</string>
<string name="send_feedback" msgid="1780431884109392046">"Пошаљи повратне информације"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"енглески (УК)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"енглески (САД)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"шпански (САД)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"енглески (УК) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"енглески (САД) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"шпански (САД) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (традиционални)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"енглески (УК) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"енглески (САД) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"шпански (САД) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (традиционални)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ћирилица)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (латиница)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Нема језика (абецеда)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Абецеда (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Абецеда (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Читање датотеке спољног речника"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"У директоријуму Преузимања нема датотека речника"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Избор датотеке речника за инсталирање"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Желите ли стварно да инсталирате ову датотеку за <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Желите ли стварно да инсталирате ову датотеку за <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Дошло је до грешке"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Направи сирову копију речника контаката"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Направи сирову копију личног речника"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Направи сирову копију речника историје корисника"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Направи сирову копију персонализованог речника"</string>
<string name="button_default" msgid="3988017840431881491">"Подразумевано"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Добро дошли у <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"помоћу Куцања покретима"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Освежи"</string>
<string name="last_update" msgid="730467549913588780">"Последње ажурирање"</string>
<string name="message_updating" msgid="4457761393932375219">"Тражење ажурирања"</string>
- <string name="message_loading" msgid="8689096636874758814">"Учитавање..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Учитавање…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Главни речник"</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="delete_dict" msgid="756853268088330054">"Избриши"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Доступан је речник за изабрани језик на мобилном уређају.&lt;br/&gt; Препоручујемо да &lt;b&gt;преузмете &lt;/b&gt; речник за <xliff:g id="LANGUAGE">%1$s</xliff:g> да бисте побољшали доживљај куцања.&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; Препоручујемо вам да &lt;b&gt;преузмете&lt;/b&gt; речник за <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> да бисте побољшали доживљај куцања.&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> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Преузми преко Wi-Fi-ја"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Речник је доступан за <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Доступан је речник за <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Притисните за преглед и преузимање"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Преузимање: Предлози за <xliff:g id="LANGUAGE">%1$s</xliff:g> ће ускоро бити спремни."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Преузимање: Предлози за <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> ће ускоро бити спремни."</string>
<string name="version_text" msgid="2715354215568469385">"Верзија <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Додај"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Додавање у речник"</string>
diff --git a/java/res/values-sv/strings-config-important-notice.xml b/java/res/values-sv/strings-config-important-notice.xml
new file mode 100644
index 000000000..9b9b92e46
--- /dev/null
+++ b/java/res/values-sv/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Få bättre förslag genom att använda tidigare angiven data och annan kommunikation"</string>
+</resources>
diff --git a/java/res/values-sv/strings-talkback-descriptions.xml b/java/res/values-sv/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..140202d99
--- /dev/null
+++ b/java/res/values-sv/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Anslut hörlurar om du vill att lösenordet ska läsas upp."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Nuvarande text är %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Ingen text har angetts"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"Om du trycker på <xliff:g id="KEY_NAME">%1$s</xliff:g> rättas <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> till <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Om du trycker på <xliff:g id="KEY_NAME">%1$s</xliff:g> utförs autokorrigering"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Nyckelkod %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Skift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Skift är aktiverat (tryck för att inaktivera)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps Lock på (tryck för att inaktivera)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Ta bort"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symboler"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Bokstäver"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Siffror"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Inställningar"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tabb"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Blanksteg"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Röstindata"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Retur"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Sökning"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Punkt"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Byt språk"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Nästa"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Föregående"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Skift aktiverat"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock är aktiverat"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Skift är inaktiverat"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbolläge"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Bokstavsläge"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefonläge"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefonsymbolläge"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Tangentbordet är dolt"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Tangentbord för <xliff:g id="KEYBOARD_MODE">%s</xliff:g> visas"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"datum"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"datum och tid"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-post"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"sms/mms"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"siffror"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefonnummer"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"text"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"klockslag"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"webbadresser"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Senaste"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Personer"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Föremål"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natur"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Platser"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Symboler"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Uttryckssymboler"</string>
+</resources>
diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
index afe349afd..7092e6876 100644
--- a/java/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Standardinställning"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Föreslå kontaktnamn"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Använd namn från Kontakter för förslag och korrigeringar"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Anpassade förslag"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Dubbelt blanksteg = punkt"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Dubbelt blanksteg ger en punkt följt av mellanslag"</string>
<string name="auto_cap" msgid="1719746674854628252">"Automatiska versaler"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Visa spår efter rörelse"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Visa ordförslag vid svepskrivning"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Ordförslaget visas i rörelsen medan du skriver"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: sparat"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Anslut hörlurar om du vill att lösenordet ska läsas upp."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Nuvarande text är %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Ingen text har angetts"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"Om du trycker på <xliff:g id="KEY">%1$s</xliff:g> rättas <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> till <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"Om du trycker på <xliff:g id="KEY">%1$s</xliff:g> utförs autokorrigering"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Nyckelkod %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Skift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Skift på (knacka lätt för att inaktivera)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock på (knacka lätt för att inaktivera)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symboler"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Bokstäver"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Siffror"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Inställningar"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tabb"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Blanksteg"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Röstinmatning"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Uttryckssymbol"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Retur"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Sök"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Punkt"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Byt språk"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Nästa"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Föregående"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Skift är aktiverat"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps Lock är aktiverat"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Skift är inaktiverat"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Symbolläge"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Bokstavsläge"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Telefonläge"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Telefonsymbolläge"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Tangentbordet är dolt"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Tangentbord för <xliff:g id="MODE">%s</xliff:g> visas"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"datum"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"datum och tid"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-post"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"sms"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"siffror"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefonnummer"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"text"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"klockslag"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"webbadresser"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Frasrörelse"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Infoga blanksteg genom att dra fingret över blankstegstangenten"</string>
<string name="voice_input" msgid="3583258583521397548">"Röstinmatningsknapp"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"På huvudtangentbord"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"På symboltangentbord"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Av"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mick huvudtangentbord"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mick bland symboler"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Röstinmatning inaktiv"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Ingen röstinmatningsmetod har aktiverats. Kontrollera språk- och inmatningsinställningarna."</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfigurera inmatningsmetoder"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Inmatningsspråk"</string>
<string name="send_feedback" msgid="1780431884109392046">"Skicka feedback"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Engelskt (brittiskt)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engelskt (amerikanskt)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"spanska (USA)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Engelskt (brittiskt) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Engelskt (amerikanskt) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"spanska (USA (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (traditionell)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Engelska (Storbritannien) <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Engelska (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spanska (USA (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (traditionell)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (kyrillisk)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (latinsk)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Inget språk (alfabet)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabet (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabet (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Läs extern ordboksfil"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Inga ordboksfiler i mappen Hämtningar"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Välj en ordboksfil att installera"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Vill du verkligen installera filen för <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Vill du verkligen installera filen för <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Ett fel uppstod"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Ta fram ordlista för kontakter"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Dumpa personlig ordlista"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Dumpa ordlista för användarhistorik"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Dumpa anpassad ordlista"</string>
<string name="button_default" msgid="3988017840431881491">"Standard"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Välkommen till <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"med svepskrivning"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Uppdatera"</string>
<string name="last_update" msgid="730467549913588780">"Informationen uppdaterades senast"</string>
<string name="message_updating" msgid="4457761393932375219">"Söker efter uppdateringar"</string>
- <string name="message_loading" msgid="8689096636874758814">"Läser in ..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Läser in …"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Huvudordlista"</string>
<string name="cancel" msgid="6830980399865683324">"Avbryt"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Inställningar"</string>
<string name="install_dict" msgid="180852772562189365">"Installera"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Avbryt"</string>
<string name="delete_dict" msgid="756853268088330054">"Ta bort"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Det finns en ordlista för språket du har valt i din mobila enhet.&lt;br/&gt; Vi rekommenderar att du &lt;b&gt;hämtar&lt;/b&gt; ordlistan för <xliff:g id="LANGUAGE">%1$s</xliff:g> så att det blir enklare att skriva.&lt;br/&gt; &lt;br/&gt; Det kan ta någon minut att hämta den via 3G. Avgifter kan tillkomma om du inte har ett abonnemang med &lt;b&gt;obegränsad datatrafik&lt;/b&gt;.&lt;br/&gt; Om du är osäker på vilket abonnemang du har rekommenderar vi att du ansluter till ett Wi-Fi-nätverk och hämtar ordlistan automatiskt.&lt;br/&gt; &lt;br/&gt; Tips! Du kan hämta och ta bort ordlistor under &lt;b&gt;Språk och inmatning&lt;/b&gt; i menyn &lt;b&gt;Inställningar&lt;/b&gt; på den mobila enheten."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Det finns en ordbok för språket du har valt på din mobila enhet.&lt;br/&gt; Vi rekommenderar att du &lt;b&gt;hämtar&lt;/b&gt; ordboken på <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>. Då blir det enklare och smidigare att skriva.&lt;br/&gt; &lt;br/&gt; Hämtningen tar en minut eller två om du använder 3G. Avgifter kan tillkomma om du inte har ett &lt;b&gt;abonnemang med obegränsad data&lt;/b&gt;.&lt;br/&gt; Om du inte är säker på vad som ingår i ditt abonnemang rekommenderar vi att du hittar en Wi-Fi-anslutning och påbörjar hämtningen automatiskt.&lt;br/&gt; &lt;br/&gt; Tips: Du kan hämta och ta bort ordböcker via &lt;b&gt;Språk och inmatning&lt;/b&gt; i menyn &lt;b&gt;Inställningar&lt;/b&gt; på din mobila enhet."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Hämta nu (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Hämta via Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"En ordlista är tillgänglig för <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"En ordlista för <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> är tillgänglig"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Tryck om du vill granska och hämta"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Hämtar: förslag för <xliff:g id="LANGUAGE">%1$s</xliff:g> är snart klara."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Hämtar: förslag för <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> är snart klara."</string>
<string name="version_text" msgid="2715354215568469385">"Version <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Lägg till"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Lägg till i ordlista"</string>
diff --git a/java/res/values-sw/strings-config-important-notice.xml b/java/res/values-sw/strings-config-important-notice.xml
new file mode 100644
index 000000000..7b10085b5
--- /dev/null
+++ b/java/res/values-sw/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Jifunze kutoka kwenye mawasiliano yako na data iliyocharazwa ili kuboresha mapendekezo"</string>
+</resources>
diff --git a/java/res/values-sw/strings-talkback-descriptions.xml b/java/res/values-sw/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..e9ca282b9
--- /dev/null
+++ b/java/res/values-sw/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Chomeka kifaa cha sauti ili usikie vitufe vya nenosiri vikitamkwa kwa sauti."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Maandishi ya sasa ni %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Hakuna maandishi yaliyoingizwa"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> hurekebisha <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> kuwa <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> hufanya marekebisho otomatiki"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Msimbo wa kitufe %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift imewashwa (gonga ili kuizima)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock imewashwa (gonga ili kuizima)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Futa"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Alama"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Herufi"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Nambari"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Mipangilio"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Kichupo"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Nafasi"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Kuweka data kwa kutamka"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Rudi"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Utafutaji"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Nukta"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Badilisha lugha"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Linalofuata"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Iililotangulia"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift imewashwa"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock imewashwa"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift imezimwa"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Hali ya alama"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Hali ya herufi"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Hali ya simu"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Hali ya alama za simu"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Kibodi imefichwa"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Inaonyesha kibodi ya <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"tarehe"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"tarehe na wakati"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"barua pepe"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"utumaji ujumbe"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"nambari"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"simu"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"maandishi"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"wakati"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Zilizotumika majuzi"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Watu"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Vitu"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Maumbile"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Maeneo"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Alama"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Vikaragosi"</string>
+</resources>
diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml
index 191ad977c..56312899d 100644
--- a/java/res/values-sw/strings.xml
+++ b/java/res/values-sw/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Chaguo-msingi la mfumo"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Pendekeza majini ya Anwani"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Tumia majina kutoka kwa Anwani kwa mapendekezo na marekebisho"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Mapendekezo yaliyobadilishwa kukufaa"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Kitone baada ya nafasi mbili"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Kugonga mara mbili kwenye upau nafasi kunaingiza kitone kikifuatiwa na nafasi"</string>
<string name="auto_cap" msgid="1719746674854628252">"Uwekaji wa herufi kubwa kiotomatiki"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Onyesha njia ya ishara"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Kihakiki kinachobadilika cha kuelea"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Onyesha neno lililopendekezwa unapoonyesha ishara"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Imehifadhiwa"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Chomeka plagi ya kifaa cha kichwa cha kusikiza ili kusikiliza msimbo wa nenosiri inayozungumwa kwa sauti ya juu."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Maandishi ya sasa ni %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Hakuna maandishi yaliyoingizwa"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> hurekebisha <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> kuwa <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> hurekebisha kiotomatiki"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Msimbo wa kitufe %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Badilisha"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift imewashwa (gonga ili kulemaza)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock imewashwa (gonga ili kulemaza)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Futa"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Alama"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Herufi"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Nambari"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Mipangilio"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Kichupo"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Nafasi"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Kuweka data kwa kutamka"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Uso wenye tabasamu"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Rudi"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Tafuta"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Nukta"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Badili lugha"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Inayofuata"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Iliyotangulia"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift imewezeshwa"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps lock imewezeshwa"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift imelemazwa"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Hali ya alama"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Hali ya barua"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Hali ya simu"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Hali ya alama za simu"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Kibodi imefichwa"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Inaonyesha kibodi <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"tarehe"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"tarehe na wakati"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"barua pepe"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"Utumaji ujumbe"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"nambari"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"simu"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"maandishi"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"wakati"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Ishara ya fungu la maneno"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Weka nafasi wakati wa ishara kwa kuelea katika kitufe cha nafasi"</string>
<string name="voice_input" msgid="3583258583521397548">"Kibao cha kuweka data kwa kutamka"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Kwenye kibodi kuu"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Kwenye kibodi ya ishara"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Zima"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Maikrofoni kwenye kibodi kuu"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Maikrofoni kwenye kibodi ya ishara"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Kipengele cha kuweka data kwa kutamka kimezimwa"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Hakuna mbinu ya kuweka data kwa kutamka iliyowashwa. Angalia Lugha na mipangilio ya kuingiza data."</string>
<string name="configure_input_method" msgid="373356270290742459">"Sanidi mbinu za uingizaji"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Lugha za uingizaji"</string>
<string name="send_feedback" msgid="1780431884109392046">"Tuma maoni"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Kiingereza cha (Uingereza)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Kiingereza cha (Marekani)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Kihispania (Marekani)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Kiingereza (Uingereza) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Kiingereza (Marekani) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Kihispania (Marekani) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Asili)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Kiingereza (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Kiingereza (US) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Kihispania (US) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (cha Jadi)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Kikriliki)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Kilatini)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Hakuna lugha (Alfabeti)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabeti (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabeti (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Soma faili ya kamusi ya nje"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Hakuna faili za kamusi katika folda ya Vilivyopakuliwa"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Chagua faili ya kamusi ya kusakinisha"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Isakinishe faili hii kwa <xliff:g id="LOCALE_NAME">%s</xliff:g> kweli?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Ungependa kusakinisha faili hii ya <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Kulikuwa na hitilafu"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Onyesha orodha ya anwani"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Tupa kamusi ya kibinafsi"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Tupa kamusi ya historia ya mtumiaji"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Tupa kamusi ya kuwekewa mapendeleo"</string>
<string name="button_default" msgid="3988017840431881491">"Chaguo-msingi"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Karibu kwenye <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"kwa Kuandika kwa ishara"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Onyesha upya"</string>
<string name="last_update" msgid="730467549913588780">"Ilibadilishwa mwisho"</string>
<string name="message_updating" msgid="4457761393932375219">"Inatafuta sasisho..."</string>
- <string name="message_loading" msgid="8689096636874758814">"Inapakia..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Inapakia…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Kamusi kuu"</string>
<string name="cancel" msgid="6830980399865683324">"Ghairi"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Mipangilio"</string>
<string name="install_dict" msgid="180852772562189365">"Sakinisha"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Ghairi"</string>
<string name="delete_dict" msgid="756853268088330054">"Futa"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Lugha iliyochaguliwa kwenye kifaa chako cha mkononi ina kamusi inayopatikana.&lt;br/&gt; Tunapendekeza&lt;b&gt;upakuaji wa kamusi&lt;/b&gt; <xliff:g id="LANGUAGE">%1$s</xliff:g> ili kuboresha hali yako ya kucharaza.&lt;br/&gt; &lt;br/&gt; Upakuaji unaweza kuchukua dakika moja au mbili kukamilika kwenye 3G. Unaweza kutozwa pesa ikiwa huna mpango wa data &lt;b&gt;usio na kipimo &lt;/b&gt;.&lt;br/&gt;Ikiwa huna uhakika una mpango gani wa data, tunapendekeza utafute muunganisho wa Wi-Fi ili uanze upakuaji moja kwa moja.&lt;br/&gt; &lt;br/&gt; Kidokezo: Unaweza kupakua na kuondoa kamusi kwa kuenda kwenye&lt;b&gt;Ingizo la &amp; Lugha&lt;/b&gt; katika &lt;b&gt;menyu ya Mipangilio&lt;/b&gt; ya kifaa chako cha mkononi."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Lugha iliyochaguliwa kwenye kifaa chako cha mkononi ina kamusi inayopatikana.&lt;br/&gt; Tunapendekeza&lt;b&gt;upakuaji wa kamusi ya&lt;/b&gt; <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> ili kuboresha hali yako ya kuchapa.&lt;br/&gt; &lt;br/&gt; Upakuaji unaweza kuchukua dakika moja au mbili kukamilika kwenye mtandao wa 3G. Unaweza kutozwa ada ikiwa huna mpango wa data &lt;b&gt;usio na kipimo &lt;/b&gt;.&lt;br/&gt;Ikiwa huna uhakika una mpango gani wa data, tunapendekeza utafute muunganisho wa Wi-Fi ili uanze upakuaji kiotomatiki.&lt;br/&gt; &lt;br/&gt; Kidokezo: Unaweza kupakua na kuondoa kamusi kwa kuenda kwenye&lt;b&gt;Lugha na Zana za Kuingiza Datalt;/b&gt; katika &lt;b&gt;menyu ya Mipangilio&lt;/b&gt; ya kifaa chako cha mkononi."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Pakua sasa (MB<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Pakua kwenye Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Kamusi ya <xliff:g id="LANGUAGE">%1$s</xliff:g> inapatikana"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Kamusi inapatikana ya <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Bonyeza ili kukagua na kupakua"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Inapakua: mapendekezo ya <xliff:g id="LANGUAGE">%1$s</xliff:g> yatakuwa tayari hivi karibuni."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Inapakua: mapendekezo ya <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> yatakuwa tayari hivi karibuni."</string>
<string name="version_text" msgid="2715354215568469385">"Toleo la <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Ongeza"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Ongeza kwenye kamusi"</string>
diff --git a/java/res/values-sw430dp/config-per-form-factor.xml b/java/res/values-sw430dp/config-per-form-factor.xml
new file mode 100644
index 000000000..8868081c3
--- /dev/null
+++ b/java/res/values-sw430dp/config-per-form-factor.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- Configuration values for Large Phone. -->
+<resources>
+ <bool name="config_enable_show_key_preview_popup_option">true</bool>
+ <!-- Whether or not Popup on key press is enabled by default -->
+ <bool name="config_default_key_preview_popup">true</bool>
+ <bool name="config_default_sound_enabled">false</bool>
+ <bool name="config_enable_show_voice_key_option">true</bool>
+ <bool name="config_key_selection_by_dragging_finger">true</bool>
+ <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
+ false -->
+ <bool name="config_show_more_keys_keyboard_at_touched_point">false</bool>
+ <bool name="config_use_fullscreen_mode">false</bool>
+</resources>
diff --git a/java/res/values-sw540dp-land/config.xml b/java/res/values-sw430dp/config-screen-metrics.xml
index b3cd7278d..bc1c964af 100644
--- a/java/res/values-sw540dp-land/config.xml
+++ b/java/res/values-sw430dp/config-screen-metrics.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2011, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -19,5 +19,6 @@
-->
<resources>
- <bool name="config_use_fullscreen_mode">false</bool>
+ <!-- Must be aligned with {@link Constants#SCREEN_METRICS_LARGE_PHONE}. -->
+ <integer name="config_screen_metrics">1</integer>
</resources>
diff --git a/java/res/values-sw540dp-land/dimens.xml b/java/res/values-sw540dp-land/dimens.xml
deleted file mode 100644
index 002493798..000000000
--- a/java/res/values-sw540dp-land/dimens.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
- <!-- Preferable keyboard height in absolute scale: 45.0mm -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">283.5dp</dimen>
- <fraction name="minKeyboardHeight">45%p</fraction>
-
- <fraction name="keyboard_top_padding_gb">2.444%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
- <fraction name="key_bottom_gap_gb">5.200%p</fraction>
- <fraction name="key_horizontal_gap_gb">1.447%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">2.727%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
- <fraction name="key_bottom_gap_holo">4.5%p</fraction>
- <fraction name="key_horizontal_gap_holo">0.9%p</fraction>
-
- <dimen name="popup_key_height">81.9dp</dimen>
-
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_padding">18dp</dimen>
-
- <fraction name="key_letter_ratio">50%</fraction>
- <fraction name="key_large_letter_ratio">48%</fraction>
- <fraction name="key_label_ratio">32%</fraction>
- <fraction name="key_hint_letter_ratio">23%</fraction>
- <fraction name="key_hint_label_ratio">34%</fraction>
- <fraction name="key_uppercase_letter_ratio">29%</fraction>
- <fraction name="spacebar_text_ratio">30.0%</fraction>
- <dimen name="key_uppercase_letter_padding">4dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">3.20%p</fraction>
- <fraction name="key_letter_ratio_5row">62%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">36%</fraction>
-
- <dimen name="suggestions_strip_padding">252.0dp</dimen>
- <integer name="max_more_suggestions_row">5</integer>
- <fraction name="min_more_suggestions_width">50%</fraction>
-
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">26dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">76dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">26dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">17dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">10%p</fraction>
- <fraction name="emoji_keyboard_row_height">33%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">70%p</fraction>
- <integer name="emoji_keyboard_max_key_count">30</integer>
-
-</resources>
diff --git a/java/res/values-sw540dp/dimens.xml b/java/res/values-sw540dp/dimens.xml
deleted file mode 100644
index 801b7acb5..000000000
--- a/java/res/values-sw540dp/dimens.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
- <!-- Preferable keyboard height in absolute scale: 48.0mm -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">302.4dp</dimen>
- <fraction name="maxKeyboardHeight">46%p</fraction>
- <fraction name="minKeyboardHeight">-35.0%p</fraction>
-
- <dimen name="popup_key_height">63.0dp</dimen>
-
- <fraction name="keyboard_top_padding_gb">2.291%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
- <fraction name="key_bottom_gap_gb">4.625%p</fraction>
- <fraction name="key_horizontal_gap_gb">2.113%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">2.335%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">4.0%p</fraction>
- <fraction name="key_bottom_gap_holo">4.5%p</fraction>
- <fraction name="key_horizontal_gap_holo">1.565%p</fraction>
-
- <dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen>
- <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- popup_key_height x 1.2 -->
- <dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen>
- <!-- popup_key_height x -1.0 -->
- <dimen name="more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen>
-
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_padding">6dp</dimen>
- <dimen name="key_hint_letter_padding">3dp</dimen>
- <dimen name="key_uppercase_letter_padding">3dp</dimen>
-
- <fraction name="key_letter_ratio">42%</fraction>
- <fraction name="key_large_letter_ratio">45%</fraction>
- <fraction name="key_label_ratio">25%</fraction>
- <fraction name="key_large_label_ratio">32%</fraction>
- <fraction name="key_hint_letter_ratio">23%</fraction>
- <fraction name="key_hint_label_ratio">28%</fraction>
- <fraction name="key_uppercase_letter_ratio">22%</fraction>
- <fraction name="key_preview_text_ratio">50%</fraction>
- <fraction name="spacebar_text_ratio">28.0%</fraction>
- <dimen name="key_preview_height">94.5dp</dimen>
- <dimen name="key_preview_offset_gb">16.0dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">3.20%p</fraction>
- <fraction name="key_letter_ratio_5row">52%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">27%</fraction>
-
- <dimen name="key_preview_offset_holo">8.0dp</dimen>
- <!-- popup_key_height x -0.5 -->
- <dimen name="more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
-
- <dimen name="suggestions_strip_height">44dp</dimen>
- <dimen name="more_suggestions_row_height">44dp</dimen>
- <integer name="max_more_suggestions_row">6</integer>
- <fraction name="min_more_suggestions_width">90%</fraction>
- <dimen name="suggestions_strip_padding">94.5dp</dimen>
- <dimen name="suggestion_min_width">48.0dp</dimen>
- <dimen name="suggestion_padding">12dp</dimen>
- <dimen name="suggestion_text_size">22dp</dimen>
- <dimen name="more_suggestions_hint_text_size">33dp</dimen>
-
- <!-- Gesture trail parameters -->
- <dimen name="gesture_trail_width">2.5dp</dimen>
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">28dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">87dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">28dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">19dp</dimen>
- <dimen name="gesture_floating_preview_round_radius">3dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">12.5%p</fraction>
- <fraction name="emoji_keyboard_row_height">33%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">60%p</fraction>
- <integer name="emoji_keyboard_max_key_count">24</integer>
-
-</resources>
diff --git a/java/res/values-sw600dp-land/config.xml b/java/res/values-sw600dp-land/config.xml
new file mode 100644
index 000000000..00edde161
--- /dev/null
+++ b/java/res/values-sw600dp-land/config.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- Configuration values for Small Tablet Landscape. -->
+<resources>
+ <!-- Preferable keyboard height in absolute scale: 45.0mm -->
+ <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
+ <dimen name="config_default_keyboard_height">283.5dp</dimen>
+ <fraction name="config_min_keyboard_height">45%p</fraction>
+
+ <dimen name="config_more_keys_keyboard_key_height">81.9dp</dimen>
+
+ <fraction name="config_keyboard_top_padding_holo">2.727%p</fraction>
+ <fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction>
+ <fraction name="config_key_vertical_gap_holo">4.5%p</fraction>
+ <fraction name="config_key_horizontal_gap_holo">0.9%p</fraction>
+
+ <fraction name="config_key_letter_ratio">50%</fraction>
+ <fraction name="config_key_large_letter_ratio">48%</fraction>
+ <fraction name="config_key_label_ratio">32%</fraction>
+ <fraction name="config_key_hint_letter_ratio">23%</fraction>
+ <fraction name="config_key_hint_label_ratio">34%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio">29%</fraction>
+ <fraction name="config_language_on_spacebar_text_ratio">30.0%</fraction>
+ <!-- left or right padding of label alignment -->
+ <dimen name="config_key_label_horizontal_padding">18dp</dimen>
+ <dimen name="config_key_shifted_letter_hint_padding">4dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
+ <fraction name="config_key_letter_ratio_5row">62%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio_5row">36%</fraction>
+
+ <dimen name="config_suggestions_strip_horizontal_padding">252.0dp</dimen>
+ <integer name="config_max_more_suggestions_row">5</integer>
+ <fraction name="config_min_more_suggestions_width">50%</fraction>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="config_gesture_floating_preview_text_size">26dp</dimen>
+ <dimen name="config_gesture_floating_preview_text_offset">76dp</dimen>
+ <dimen name="config_gesture_floating_preview_horizontal_padding">26dp</dimen>
+ <dimen name="config_gesture_floating_preview_vertical_padding">17dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="config_emoji_keyboard_key_width">10%p</fraction>
+ <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
+ <fraction name="config_emoji_keyboard_key_letter_size">70%p</fraction>
+ <integer name="config_emoji_keyboard_max_page_key_count">30</integer>
+</resources>
diff --git a/java/res/values-sw600dp/config-per-form-factor.xml b/java/res/values-sw600dp/config-per-form-factor.xml
new file mode 100644
index 000000000..aa9a05482
--- /dev/null
+++ b/java/res/values-sw600dp/config-per-form-factor.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- Configuration values for Small Tablet. -->
+<resources>
+ <bool name="config_enable_show_key_preview_popup_option">false</bool>
+ <!-- Whether or not Popup on key press is enabled by default -->
+ <bool name="config_default_key_preview_popup">false</bool>
+ <bool name="config_default_sound_enabled">true</bool>
+ <bool name="config_enable_show_voice_key_option">false</bool>
+ <bool name="config_key_selection_by_dragging_finger">false</bool>
+ <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
+ false -->
+ <bool name="config_show_more_keys_keyboard_at_touched_point">false</bool>
+ <bool name="config_use_fullscreen_mode">false</bool>
+</resources>
diff --git a/java/res/drawable/btn_suggestion_gb.xml b/java/res/values-sw600dp/config-screen-metrics.xml
index cde12fe55..d16c9253f 100644
--- a/java/res/drawable/btn_suggestion_gb.xml
+++ b/java/res/values-sw600dp/config-screen-metrics.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2011, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -18,10 +18,7 @@
*/
-->
-<selector
- xmlns:android="http://schemas.android.com/apk/res/android"
->
- <item
- android:state_pressed="true"
- android:drawable="@drawable/btn_suggestion_pressed" />
-</selector>
+<resources>
+ <!-- Must be aligned with {@link Constants#SCREEN_METRICS_SMALL_TABLET}. -->
+ <integer name="config_screen_metrics">3</integer>
+</resources>
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml
index e72e4941e..3bd843928 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2013, The Android Open Source Project
+** Copyright 2011, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -18,6 +18,70 @@
*/
-->
+<!-- Configuration values for Small Tablet Portrait. -->
<resources>
- <bool name="config_enable_show_voice_key_option">false</bool>
+ <dimen name="config_key_hysteresis_distance">40.0dp</dimen>
+
+ <!-- Preferable keyboard height in absolute scale: 48.0mm -->
+ <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
+ <dimen name="config_default_keyboard_height">302.4dp</dimen>
+ <fraction name="config_max_keyboard_height">46%p</fraction>
+ <fraction name="config_min_keyboard_height">-35.0%p</fraction>
+
+ <dimen name="config_more_keys_keyboard_key_height">63.0dp</dimen>
+ <dimen name="config_more_keys_keyboard_key_horizontal_padding">6dp</dimen>
+ <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+ <!-- config_more_keys_keyboard_key_height x 1.2 -->
+ <dimen name="config_more_keys_keyboard_slide_allowance">98.3dp</dimen>
+
+ <fraction name="config_keyboard_top_padding_holo">2.335%p</fraction>
+ <fraction name="config_keyboard_bottom_padding_holo">4.0%p</fraction>
+ <fraction name="config_key_vertical_gap_holo">4.5%p</fraction>
+ <fraction name="config_key_horizontal_gap_holo">1.565%p</fraction>
+ <!-- config_more_keys_keyboard_key_height x -0.5 -->
+ <dimen name="config_more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
+ <dimen name="config_key_preview_offset_holo">8.0dp</dimen>
+
+ <dimen name="config_key_preview_height">94.5dp</dimen>
+ <fraction name="config_key_preview_text_ratio">50%</fraction>
+ <fraction name="config_key_letter_ratio">42%</fraction>
+ <fraction name="config_key_large_letter_ratio">45%</fraction>
+ <fraction name="config_key_label_ratio">25%</fraction>
+ <fraction name="config_key_large_label_ratio">32%</fraction>
+ <fraction name="config_key_hint_letter_ratio">23%</fraction>
+ <fraction name="config_key_hint_label_ratio">28%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio">22%</fraction>
+ <fraction name="config_language_on_spacebar_text_ratio">28.0%</fraction>
+ <!-- left or right padding of label alignment -->
+ <dimen name="config_key_label_horizontal_padding">6dp</dimen>
+ <dimen name="config_key_hint_letter_padding">3dp</dimen>
+ <dimen name="config_key_shifted_letter_hint_padding">3dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
+ <fraction name="config_key_letter_ratio_5row">52%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio_5row">27%</fraction>
+
+ <dimen name="config_suggestions_strip_height">44dp</dimen>
+ <dimen name="config_more_suggestions_row_height">44dp</dimen>
+ <integer name="config_max_more_suggestions_row">6</integer>
+ <fraction name="config_min_more_suggestions_width">90%</fraction>
+ <dimen name="config_suggestions_strip_horizontal_padding">94.5dp</dimen>
+ <dimen name="config_suggestion_min_width">48.0dp</dimen>
+ <dimen name="config_suggestion_text_horizontal_padding">12dp</dimen>
+ <dimen name="config_suggestion_text_size">22dp</dimen>
+ <dimen name="config_more_suggestions_hint_text_size">33dp</dimen>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="config_gesture_floating_preview_text_size">28dp</dimen>
+ <dimen name="config_gesture_floating_preview_text_offset">87dp</dimen>
+ <dimen name="config_gesture_floating_preview_horizontal_padding">28dp</dimen>
+ <dimen name="config_gesture_floating_preview_vertical_padding">19dp</dimen>
+ <dimen name="config_gesture_floating_preview_round_radius">3dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="config_emoji_keyboard_key_width">12.5%p</fraction>
+ <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
+ <fraction name="config_emoji_keyboard_key_letter_size">60%p</fraction>
+ <integer name="config_emoji_keyboard_max_page_key_count">24</integer>
</resources>
diff --git a/java/res/values-sw600dp/donottranslate-config-spacing-and-punctuations.xml b/java/res/values-sw600dp/donottranslate-config-spacing-and-punctuations.xml
new file mode 100644
index 000000000..9cc555fbc
--- /dev/null
+++ b/java/res/values-sw600dp/donottranslate-config-spacing-and-punctuations.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Symbols that are suggested between words -->
+ <string name="suggested_punctuations">:,;,\",(,),\',-,/,@,_</string>
+</resources>
diff --git a/java/res/values-sw540dp/touch-position-correction.xml b/java/res/values-sw600dp/touch-position-correction.xml
index 932b8fc72..6aaa605a6 100644
--- a/java/res/values-sw540dp/touch-position-correction.xml
+++ b/java/res/values-sw600dp/touch-position-correction.xml
@@ -37,17 +37,6 @@
</string-array>
<string-array
- name="touch_position_correction_data_gb"
- translatable="false"
- >
- <!-- The default touch position data (See com.android.inputmethod.keyboard.ProximityInfo)
- correctionX = 0.0f
- correctionY = 0.0f
- correctionR = DEFAULT_TOUCH_POSITION_CORRECTION_RADIUS
- -->
- </string-array>
-
- <string-array
name="touch_position_correction_data_holo"
translatable="false"
>
diff --git a/java/res/values-sw768dp-land/config.xml b/java/res/values-sw768dp-land/config.xml
index b3cd7278d..3878a9e84 100644
--- a/java/res/values-sw768dp-land/config.xml
+++ b/java/res/values-sw768dp-land/config.xml
@@ -18,6 +18,49 @@
*/
-->
+<!-- Configuration values for Large Tablet Landscape. -->
<resources>
- <bool name="config_use_fullscreen_mode">false</bool>
+ <!-- Preferable keyboard height in absolute scale: 58.0mm -->
+ <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
+ <dimen name="config_default_keyboard_height">365.4dp</dimen>
+ <fraction name="config_min_keyboard_height">45%p</fraction>
+
+ <fraction name="config_keyboard_top_padding_holo">1.896%p</fraction>
+ <fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction>
+ <fraction name="config_key_vertical_gap_holo">3.690%p</fraction>
+ <fraction name="config_key_horizontal_gap_holo">1.030%p</fraction>
+ <dimen name="config_key_preview_offset_holo">8.0dp</dimen>
+
+ <dimen name="config_more_keys_keyboard_key_height">81.9dp</dimen>
+
+ <dimen name="config_key_preview_height">107.1dp</dimen>
+ <fraction name="config_key_letter_ratio">43%</fraction>
+ <fraction name="config_key_large_letter_ratio">42%</fraction>
+ <fraction name="config_key_label_ratio">28%</fraction>
+ <fraction name="config_key_hint_letter_ratio">23%</fraction>
+ <fraction name="config_key_hint_label_ratio">28%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio">24%</fraction>
+ <fraction name="config_language_on_spacebar_text_ratio">24.00%</fraction>
+ <!-- left or right padding of label alignment -->
+ <dimen name="config_key_label_horizontal_padding">18dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="config_key_vertical_gap_5row">2.65%p</fraction>
+ <fraction name="config_key_letter_ratio_5row">53%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio_5row">30%</fraction>
+
+ <dimen name="config_suggestions_strip_horizontal_padding">252.0dp</dimen>
+ <fraction name="config_min_more_suggestions_width">50%</fraction>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="config_gesture_floating_preview_text_size">32dp</dimen>
+ <dimen name="config_gesture_floating_preview_text_offset">100dp</dimen>
+ <dimen name="config_gesture_floating_preview_horizontal_padding">32dp</dimen>
+ <dimen name="config_gesture_floating_preview_vertical_padding">21dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="config_emoji_keyboard_key_width">7.69%p</fraction>
+ <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
+ <fraction name="config_emoji_keyboard_key_letter_size">60%p</fraction>
+ <integer name="config_emoji_keyboard_max_page_key_count">39</integer>
</resources>
diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml
deleted file mode 100644
index 653f5e7d5..000000000
--- a/java/res/values-sw768dp-land/dimens.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
- <!-- Preferable keyboard height in absolute scale: 58.0mm -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">365.4dp</dimen>
- <fraction name="minKeyboardHeight">45%p</fraction>
-
- <fraction name="keyboard_top_padding_gb">1.896%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
- <fraction name="key_bottom_gap_gb">3.896%p</fraction>
- <fraction name="key_horizontal_gap_gb">1.195%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">1.896%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
- <fraction name="key_bottom_gap_holo">3.690%p</fraction>
- <fraction name="key_horizontal_gap_holo">1.030%p</fraction>
-
- <dimen name="popup_key_height">81.9dp</dimen>
-
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_padding">18dp</dimen>
-
- <fraction name="key_letter_ratio">43%</fraction>
- <fraction name="key_large_letter_ratio">42%</fraction>
- <fraction name="key_label_ratio">28%</fraction>
- <fraction name="key_hint_letter_ratio">23%</fraction>
- <fraction name="key_hint_label_ratio">28%</fraction>
- <fraction name="key_uppercase_letter_ratio">24%</fraction>
- <fraction name="spacebar_text_ratio">24.00%</fraction>
- <dimen name="key_preview_height">107.1dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">2.65%p</fraction>
- <fraction name="key_letter_ratio_5row">53%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">30%</fraction>
-
- <dimen name="key_preview_offset_holo">8.0dp</dimen>
-
- <dimen name="suggestions_strip_padding">252.0dp</dimen>
- <fraction name="min_more_suggestions_width">50%</fraction>
-
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">32dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">100dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">32dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">21dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">7.69%p</fraction>
- <fraction name="emoji_keyboard_row_height">33%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">60%p</fraction>
- <integer name="emoji_keyboard_max_key_count">39</integer>
-
-</resources>
diff --git a/java/res/values-sw540dp/config.xml b/java/res/values-sw768dp/config-per-form-factor.xml
index 027780ce3..b90fbaea5 100644
--- a/java/res/values-sw540dp/config.xml
+++ b/java/res/values-sw768dp/config-per-form-factor.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2011, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -18,22 +18,16 @@
*/
-->
+<!-- Configuration values for Large Tablet. -->
<resources>
- <bool name="config_enable_show_option_of_key_preview_popup">false</bool>
- <bool name="config_enable_bigram_suggestions_option">false</bool>
+ <bool name="config_enable_show_key_preview_popup_option">false</bool>
<!-- Whether or not Popup on key press is enabled by default -->
<bool name="config_default_key_preview_popup">false</bool>
<bool name="config_default_sound_enabled">true</bool>
- <bool name="config_auto_correction_spacebar_led_enabled">false</bool>
- <!-- The language is never displayed if == 0, always displayed if < 0 -->
- <integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer>
- <integer name="config_max_more_keys_column">5</integer>
- <!--
- Configuration for MainKeyboardView
- -->
- <dimen name="config_key_hysteresis_distance">40.0dp</dimen>
- <bool name="config_sliding_key_input_enabled">false</bool>
+ <bool name="config_enable_show_voice_key_option">false</bool>
+ <bool name="config_key_selection_by_dragging_finger">false</bool>
<!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
false -->
<bool name="config_show_more_keys_keyboard_at_touched_point">true</bool>
+ <bool name="config_use_fullscreen_mode">false</bool>
</resources>
diff --git a/java/res/layout/key_preview_ics.xml b/java/res/values-sw768dp/config-screen-metrics.xml
index 33b6947ef..7769ad80d 100644
--- a/java/res/layout/key_preview_ics.xml
+++ b/java/res/values-sw768dp/config-screen-metrics.xml
@@ -18,10 +18,7 @@
*/
-->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/keyboard_key_feedback_ics"
- android:minWidth="32dp"
- android:gravity="center"
-/>
+<resources>
+ <!-- Must be aligned with {@link Constants#SCREEN_METRICS_LARGE_TABLET}. -->
+ <integer name="config_screen_metrics">2</integer>
+</resources>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index e1c07d6f8..34eec38b8 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -18,28 +18,68 @@
*/
-->
+<!-- Configuration values for Large Tablet Portrait. -->
<resources>
- <bool name="config_enable_show_voice_key_option">false</bool>
- <bool name="config_enable_show_option_of_key_preview_popup">false</bool>
- <bool name="config_enable_bigram_suggestions_option">false</bool>
- <!-- Whether or not Popup on key press is enabled by default -->
- <bool name="config_default_key_preview_popup">false</bool>
- <bool name="config_default_sound_enabled">true</bool>
- <bool name="config_auto_correction_spacebar_led_enabled">false</bool>
- <integer name="config_max_more_keys_column">5</integer>
- <!--
- Configuration for MainKeyboardView
- -->
- <bool name="config_sliding_key_input_enabled">false</bool>
- <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
- false -->
- <bool name="config_show_more_keys_keyboard_at_touched_point">true</bool>
- <!-- Screen metrics for logging.
- 0 = "mdpi phone screen"
- 1 = "hdpi phone screen"
- 2 = "mdpi 11 inch tablet screen"
- 3 = "xhdpi phone screen?"
- 4 = ?
- -->
- <integer name="log_screen_metrics">2</integer>
+ <!-- Preferable keyboard height in absolute scale: 48.0mm -->
+ <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
+ <dimen name="config_default_keyboard_height">302.4dp</dimen>
+ <fraction name="config_max_keyboard_height">46%p</fraction>
+ <fraction name="config_min_keyboard_height">-35.0%p</fraction>
+
+ <fraction name="config_keyboard_top_padding_holo">2.335%p</fraction>
+ <fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction>
+ <fraction name="config_key_vertical_gap_holo">3.312%p</fraction>
+ <fraction name="config_key_horizontal_gap_holo">1.066%p</fraction>
+ <!-- config_more_keys_keyboard_key_height x -0.5 -->
+ <dimen name="config_more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
+ <dimen name="config_key_preview_offset_holo">8.0dp</dimen>
+
+ <dimen name="config_more_keys_keyboard_key_height">63.0dp</dimen>
+ <dimen name="config_more_keys_keyboard_key_horizontal_padding">12dp</dimen>
+ <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+ <!-- config_more_keys_keyboard_key_height x 1.2 -->
+ <dimen name="config_more_keys_keyboard_slide_allowance">98.3dp</dimen>
+
+ <dimen name="config_key_preview_height">94.5dp</dimen>
+ <fraction name="config_key_preview_text_ratio">50%</fraction>
+ <fraction name="config_key_letter_ratio">40%</fraction>
+ <fraction name="config_key_large_letter_ratio">42%</fraction>
+ <fraction name="config_key_label_ratio">28%</fraction>
+ <fraction name="config_key_large_label_ratio">28%</fraction>
+ <fraction name="config_key_hint_letter_ratio">23%</fraction>
+ <fraction name="config_key_hint_label_ratio">28%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio">26%</fraction>
+ <fraction name="config_language_on_spacebar_text_ratio">29.03%</fraction>
+ <!-- left or right padding of label alignment -->
+ <dimen name="config_key_label_horizontal_padding">6dp</dimen>
+ <dimen name="config_key_hint_letter_padding">3dp</dimen>
+ <dimen name="config_key_shifted_letter_hint_padding">3dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="config_key_vertical_gap_5row">2.95%p</fraction>
+ <fraction name="config_key_letter_ratio_5row">51%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio_5row">33%</fraction>
+
+ <dimen name="config_suggestions_strip_height">44dp</dimen>
+ <dimen name="config_more_suggestions_row_height">44dp</dimen>
+ <integer name="config_max_more_suggestions_row">6</integer>
+ <fraction name="config_min_more_suggestions_width">90%</fraction>
+ <dimen name="config_suggestions_strip_horizontal_padding">94.5dp</dimen>
+ <dimen name="config_suggestion_min_width">46dp</dimen>
+ <dimen name="config_suggestion_text_horizontal_padding">8dp</dimen>
+ <dimen name="config_suggestion_text_size">22dp</dimen>
+ <dimen name="config_more_suggestions_hint_text_size">33dp</dimen>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="config_gesture_floating_preview_text_size">26dp</dimen>
+ <dimen name="config_gesture_floating_preview_text_offset">86dp</dimen>
+ <dimen name="config_gesture_floating_preview_horizontal_padding">26dp</dimen>
+ <dimen name="config_gesture_floating_preview_vertical_padding">17dp</dimen>
+ <dimen name="config_gesture_floating_preview_round_radius">3dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="config_emoji_keyboard_key_width">10%p</fraction>
+ <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
+ <fraction name="config_emoji_keyboard_key_letter_size">68%p</fraction>
+ <integer name="config_emoji_keyboard_max_page_key_count">30</integer>
</resources>
diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml
deleted file mode 100644
index 4671aa28b..000000000
--- a/java/res/values-sw768dp/dimens.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
- <!-- Preferable keyboard height in absolute scale: 48.0mm -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">302.4dp</dimen>
- <fraction name="maxKeyboardHeight">46%p</fraction>
- <fraction name="minKeyboardHeight">-35.0%p</fraction>
-
- <fraction name="keyboard_top_padding_gb">2.291%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction>
- <fraction name="key_bottom_gap_gb">4.687%p</fraction>
- <fraction name="key_horizontal_gap_gb">1.272%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">2.335%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>
- <fraction name="key_bottom_gap_holo">3.312%p</fraction>
- <fraction name="key_horizontal_gap_holo">1.066%p</fraction>
-
- <dimen name="popup_key_height">63.0dp</dimen>
-
- <dimen name="more_keys_keyboard_key_horizontal_padding">12dp</dimen>
- <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- popup_key_height x 1.2 -->
- <dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen>
- <!-- popup_key_height x -1.0 -->
- <dimen name="more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen>
-
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_padding">6dp</dimen>
- <dimen name="key_hint_letter_padding">3dp</dimen>
- <dimen name="key_uppercase_letter_padding">3dp</dimen>
-
- <fraction name="key_letter_ratio">40%</fraction>
- <fraction name="key_large_letter_ratio">42%</fraction>
- <fraction name="key_label_ratio">28%</fraction>
- <fraction name="key_large_label_ratio">28%</fraction>
- <fraction name="key_hint_letter_ratio">23%</fraction>
- <fraction name="key_hint_label_ratio">28%</fraction>
- <fraction name="key_uppercase_letter_ratio">26%</fraction>
- <fraction name="key_preview_text_ratio">50%</fraction>
- <fraction name="spacebar_text_ratio">29.03%</fraction>
- <dimen name="key_preview_height">94.5dp</dimen>
- <dimen name="key_preview_offset_gb">16.0dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">2.95%p</fraction>
- <fraction name="key_letter_ratio_5row">51%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">33%</fraction>
-
- <dimen name="key_preview_offset_holo">8.0dp</dimen>
- <!-- popup_key_height x -0.5 -->
- <dimen name="more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
-
- <dimen name="suggestions_strip_height">44dp</dimen>
- <dimen name="more_suggestions_row_height">44dp</dimen>
- <integer name="max_more_suggestions_row">6</integer>
- <fraction name="min_more_suggestions_width">90%</fraction>
- <dimen name="suggestions_strip_padding">94.5dp</dimen>
- <dimen name="suggestion_min_width">46dp</dimen>
- <dimen name="suggestion_padding">8dp</dimen>
- <dimen name="suggestion_text_size">22dp</dimen>
- <dimen name="more_suggestions_hint_text_size">33dp</dimen>
-
- <!-- Gesture trail parameters -->
- <dimen name="gesture_trail_width">2.5dp</dimen>
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">26dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">86dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">26dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">17dp</dimen>
- <dimen name="gesture_floating_preview_round_radius">3dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">10%p</fraction>
- <fraction name="emoji_keyboard_row_height">33%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">68%p</fraction>
- <integer name="emoji_keyboard_max_key_count">30</integer>
-
-</resources>
diff --git a/java/res/values-th/donottranslate.xml b/java/res/values-th/donottranslate-config-spacing-and-punctuations.xml
index a9893feec..a9893feec 100644
--- a/java/res/values-th/donottranslate.xml
+++ b/java/res/values-th/donottranslate-config-spacing-and-punctuations.xml
diff --git a/java/res/values-th/strings-config-important-notice.xml b/java/res/values-th/strings-config-important-notice.xml
new file mode 100644
index 000000000..3f0b6034a
--- /dev/null
+++ b/java/res/values-th/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-th/strings-talkback-descriptions.xml b/java/res/values-th/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..eb712aeac
--- /dev/null
+++ b/java/res/values-th/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"เสียบชุดหูฟังเพื่อฟังเสียงเมื่อพิมพ์รหัสผ่าน"</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"ข้อความปัจจุบันคือ %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"ไม่มีข้อความ"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> แก้ไข <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> เป็น <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> ทำการแก้ไขอัตโนมัติ"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"รหัสคีย์ %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift เปิดอยู่ (แตะเพื่อปิดใช้งาน)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock เปิดอยู่ (แตะเพื่อปิดใช้งาน)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"ลบ"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"สัญลักษณ์"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"ตัวอักษร"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"หมายเลข"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"การตั้งค่า"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"แท็บ"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"วรรค"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"การป้อนข้อมูลด้วยเสียง"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"อีโมจิ"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"ส่งคืน"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"ค้นหา"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"จุด"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"เปลี่ยนภาษา"</string>
+ <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">"เปิดใช้งาน Shift แล้ว"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"เปิดใช้งาน Caps Lock แล้ว"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"ปิดใช้งาน Shift แล้ว"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"โหมดสัญลักษณ์"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"โหมดตัวอักษร"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"โหมดโทรศัพท์"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"โหมดสัญลักษณ์โทรศัพท์"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"ซ่อนแป้นพิมพ์แล้ว"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"กำลังแสดงแป้นพิมพ์ <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"วันที่"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"วันที่และเวลา"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"อีเมล"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"ข้อความ"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"หมายเลข"</string>
+ <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">"URL"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"ธรรมชาติ"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"สถานที่"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"สัญลักษณ์"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"ไอคอนสื่ออารมณ์"</string>
+</resources>
diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml
index 9249c05d5..ece0c4ba9 100644
--- a/java/res/values-th/strings.xml
+++ b/java/res/values-th/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"ค่าเริ่มต้นของระบบ"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"แนะนำชื่อผู้ติดต่อ"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"ใช้ชื่อจากรายชื่อติดต่อสำหรับคำแนะนำและการแก้ไข"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"คำแนะนำในแบบของคุณ"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"แตะ Space สองครั้งแทรกจุด"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"แตะ Spacebar สองครั้งจะแทรกจุดตามด้วยช่องว่างหนึ่งช่อง"</string>
<string name="auto_cap" msgid="1719746674854628252">"ปรับเป็นตัวพิมพ์ใหญ่อัตโนมัติ"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"แสดงรอยทางเดินของท่าทางสัมผัส"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"ดูตัวอย่างลอยแบบไดนามิก"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"ดูคำแนะนำในขณะที่ใช้ท่าทางสัมผัส"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : บันทึกแล้ว"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"เสียบชุดหูฟังเพื่อฟังเสียงเมื่อพิมพ์รหัสผ่าน"</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"ข้อความปัจจุบันคือ %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"ไม่มีข้อความ"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> แก้ไข <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> เป็น <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> ทำการแก้ไขอัตโนมัติ"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"รหัสคีย์ %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift เปิดอยู่ (แตะเพื่อปิดใช้งาน)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock เปิดอยู่ (แตะเพื่อปิดใช้งาน)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"ลบ"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"สัญลักษณ์"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"ตัวอักษร"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"หมายเลข"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"การตั้งค่า"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"แท็บ"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Space"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"การป้อนข้อมูลด้วยเสียง"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"หน้ายิ้ม"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"ค้นหา"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"เครื่องหมายจุด"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"เปลี่ยนภาษา"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"ถัดไป"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"ก่อนหน้า"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"เปิดใช้งาน Shift แล้ว"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"เปิดใช้งาน Caps Lock แล้ว"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"ปิดใช้งาน Shift แล้ว"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"โหมดสัญลักษณ์"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"โหมดตัวอักษร"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"โหมดโทรศัพท์"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"โหมดสัญลักษณ์โทรศัพท์"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"ซ่อนแป้นพิมพ์แล้ว"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"กำลังแสดงแป้นพิมพ์ <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"วันที่"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"วันที่และเวลา"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"อีเมล"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"ข้อความ"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"หมายเลข"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"โทรศัพท์"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"ข้อความ"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"เวลา"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"ท่าทางสัมผัสสำหรับวลี"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"ใส่ช่องว่างระหว่างท่าทางสัมผัสโดยเลื่อนไปยังแป้นเคาะวรรค"</string>
<string name="voice_input" msgid="3583258583521397548">"แป้นการป้อนข้อมูลด้วยเสียง"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"บนแป้นพิมพ์หลัก"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"บนแป้นพิมพ์สัญลักษณ์"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"ปิด"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"ไมค์บนแป้นพิมพ์หลัก"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"ไมค์บนแป้นพิมพ์สัญลักษณ์"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"ปิดใช้งานป้อนข้อมูลด้วยเสียง"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"ไม่ได้เปิดใช้วิธีการป้อนข้อมูลด้วยเสียง ตรวจสอบภาษาและการตั้งค่าการป้อนข้อมูล"</string>
<string name="configure_input_method" msgid="373356270290742459">"กำหนดค่าวิธีการป้อนข้อมูล"</string>
<string name="language_selection_title" msgid="1651299598555326750">"ภาษาในการป้อนข้อมูล"</string>
<string name="send_feedback" msgid="1780431884109392046">"ส่งข้อเสนอแนะ"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"อังกฤษ (สหราชอาณาจักร)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"อังกฤษ (อเมริกัน)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"สเปน (สหรัฐอเมริกา)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"อังกฤษ (สหราชอาณาจักร) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"อังกฤษ (สหรัฐอเมริกา) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"สเปน (สหรัฐอเมริกา) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (ดั้งเดิม)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"อังกฤษ (สหราชอาณาจักร) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"อังกฤษ (สหรัฐอเมริกา) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"สเปน (สหรัฐอเมริกา) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ดั้งเดิม)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ซีริลลิก)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (ละติน)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"ไม่มีภาษา (ตัวอักษรละติน)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"ตัวอักษร (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"ตัวอักษร (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"อ่านไฟล์พจนานุกรมภายนอก"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"ไม่มีไฟล์พจนานุกรมในโฟลเดอร์ดาวน์โหลด"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"เลือกไฟล์พจนานุกรมที่จะติดตั้ง"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"ติดตั้งไฟล์นี้สำหรับ <xliff:g id="LOCALE_NAME">%s</xliff:g> จริงๆ หรือ"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"ต้องการติดตั้งไฟล์นี้สำหรับ <xliff:g id="LANGUAGE_NAME">%s</xliff:g> จริงหรือ"</string>
<string name="error" msgid="8940763624668513648">"เกิดข้อผิดพลาด"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"ถ่ายโอนพจนานุกรมที่อยู่ติดต่อ"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"ถ่ายโอนพจนานุกรมส่วนตัว"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"ถ่ายโอนพจนานุกรมประวัติผู้ใช้"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"ถ่ายโอนพจนานุกรมในแบบคุณ"</string>
<string name="button_default" msgid="3988017840431881491">"ค่าเริ่มต้น"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"ยินดีต้อนรับสู่ <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"พร้อมการป้อนข้อมูลด้วยท่าทาง"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"รีเฟรช"</string>
<string name="last_update" msgid="730467549913588780">"ปรับปรุงแก้ไขครั้งล่าสุด"</string>
<string name="message_updating" msgid="4457761393932375219">"กำลังตรวจสอบการอัปเดต"</string>
- <string name="message_loading" msgid="8689096636874758814">"กำลังโหลด..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"กำลังโหลด…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"พจนานุกรมหลัก"</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="delete_dict" msgid="756853268088330054">"ลบ"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"ภาษาที่คุณเลือกใช้ในอุปกรณ์เคลื่อนที่มีพจนานุกรมที่สามารถใช้ได้&lt;br/&gt; เราขอแนะนำให้คุณ &lt;b&gt;ดาวน์โหลด&lt;/b&gt; พจนานุกรม <xliff:g id="LANGUAGE">%1$s</xliff:g> เพื่อรับประสบการณ์การพิมพ์ที่ดียิ่งขึ้น&lt;br/&gt; &lt;br/&gt;การดาวน์โหลดจะใช้เวลาหนึ่งถึงสองนาทีผ่านทาง 3G ซึ่งอาจมีการเรียกเก็บเงินหากคุณไม่ได้ใช้ &lt;b&gt;แผนบริการข้อมูลแบบไม่จำกัดปริมาณ&lt;/b&gt; &lt;br/&gt;หากคุณไม่แน่ใจว่าคุณใช้แผนบริการข้อมูลแบบใด เราขอแนะนำให้คุณเชื่อมต่อ WiFi เพื่อเริ่มการดาวน์โหลดอัตโนมัติ&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; เราขอแนะนำให้คุณ &lt;b&gt;ดาวน์โหลด&lt;/b&gt; พจนานุกรม <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> เพื่อรับประสบการณ์การพิมพ์ที่ดียิ่งขึ้น&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>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"ดาวน์โหลดผ่าน WiFi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"มีพจนานุกรมให้ใช้งานในภาษา <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"มีพจนานุกรมให้ใช้งานสำหรับ <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"กดเพื่อตรวจสอบและดาวน์โหลด"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"กำลังดาวน์โหลด: คำแนะนำสำหรับ <xliff:g id="LANGUAGE">%1$s</xliff:g> จะพร้อมใช้งานเร็วๆ นี้"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"กำลังดาวน์โหลด: คำแนะนำสำหรับ <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> จะพร้อมใช้งานเร็วๆ นี้"</string>
<string name="version_text" msgid="2715354215568469385">"เวอร์ชัน <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"เพิ่ม"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"เพิ่มในพจนานุกรม"</string>
diff --git a/java/res/values-tl/strings-config-important-notice.xml b/java/res/values-tl/strings-config-important-notice.xml
new file mode 100644
index 000000000..d8dd9194a
--- /dev/null
+++ b/java/res/values-tl/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Pahusayin ang suhestiyon batay sa iyong pag-uusap at na-type na data"</string>
+</resources>
diff --git a/java/res/values-tl/strings-talkback-descriptions.xml b/java/res/values-tl/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..fbf276be8
--- /dev/null
+++ b/java/res/values-tl/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Mag-plug in ng headset upang marinig ang mga password key na binabanggit nang malakas."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Ang kasalukuyang teksto ay %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Walang tekstong inilagay"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"Itinatama ng <xliff:g id="KEY_NAME">%1$s</xliff:g> ang <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> sa <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Nagsasagawa ang <xliff:g id="KEY_NAME">%1$s</xliff:g> ng auto-correction"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Key code %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Naka-on ang shift (i-tap upang i-disable)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Naka-on ang caps lock (i-tap upang i-disable)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Tanggalin"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Mga Simbolo"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Mga Titik"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Mga Numero"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Mga Setting"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Space"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Input ng boses"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Bumalik"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Maghanap"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Tuldok"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Magpalit ng wika"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Sunod"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Nauna"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Naka-enable ang shift"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Naka-enable ang caps lock"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Naka-disable ang shift"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbols mode"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Letters mode"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Phone mode"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Phone symbols mode"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Nakatago ang keyboard"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Ipinapakita ang keyboard na <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"petsa"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"petsa at oras"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"email"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"pagmemensahe"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"numero"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telepono"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"teksto"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"oras"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Mga Kamakailang Ginamit"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Mga Tao"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Mga Bagay"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Kalikasan"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Mga Lugar"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Mga Simbolo"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Mga Emoticon"</string>
+</resources>
diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml
index df6bda09b..ce1207a5f 100644
--- a/java/res/values-tl/strings.xml
+++ b/java/res/values-tl/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Default ng system"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Mungkahi pangalan Contact"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Gamitin pangalan mula Mga Contact sa mga mungkahi\'t pagwawasto"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Personalized suggestions"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Double-space period"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Naglalagay ng tuldok na may puwang ang pag-double tap sa spacebar"</string>
<string name="auto_cap" msgid="1719746674854628252">"Auto-capitalization"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Ipakita ang trail ng galaw"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dynamic na floating preview"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Tingnan ang iminungkahing salita habang gumagalaw"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Na-save"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Mag-plug in ng headset upang marinig ang mga password key na binabanggit nang malakas."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Ang kasalukuyang teksto ay %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Walang tekstong inilagay"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"Itatama at gagawing <xliff:g id="CORRECTED">%3$s</xliff:g> ng <xliff:g id="KEY">%1$s</xliff:g> ang <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"Magsasagawa ng auto-correction ang <xliff:g id="KEY">%1$s</xliff:g>"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Code ng key %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Naka-on ang shift (i-tap upang huwag paganahin)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Naka-on ang caps lock (i-tap upang huwag paganahin)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Tanggalin"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Mga Simbolo"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Mga Titik"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Mga Numero"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Mga Setting"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Puwang"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Input ng boses"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Smiley na mukha"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Bumalik"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Paghahanap"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Tuldok"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Magpalit ng wika"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Susunod"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Nakaraan"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Pinagana ang shift"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Pinagana ang caps lock"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Hindi pinagana ang shift"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Mode ng mga simbolo"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Mode ng mga titik"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Mode ng telepono"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Mode ng mga simbolo ng telepono"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Nakatago ang keyboard"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Ipinapakita ang <xliff:g id="MODE">%s</xliff:g> keyboard"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"petsa"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"petsa at oras"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"email"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"pagmemensahe"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"numero"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telepono"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"teksto"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"oras"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Phrase gesture"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Maglagay ng espasyo sa pamamagitan ng pag-glide sa space key"</string>
<string name="voice_input" msgid="3583258583521397548">"Voice input key"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Sa pangunahing keyboard"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Sa keyboard ng mga simbolo"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Naka-off"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mic sa pangunahing keyboard"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mic sa keyboard ng mga simbolo"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Hindi pinagana ang voice input"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Walang naka-enable na pamamaraan ng pag-input ng boses. Suriin ang mga setting ng Pag-input ng wika."</string>
<string name="configure_input_method" msgid="373356270290742459">"I-configure ang mga pamamaraan ng pag-input"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Mag-input ng mga wika"</string>
<string name="send_feedback" msgid="1780431884109392046">"Magpadala ng feedback"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Ingles (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Ingles (Estados Unidos)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Spanish (US)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Ingles (UK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Ingles (US) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Spanish (US) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Traditional)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Ingles (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Ingles (US) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spanish (US) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Traditional)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Cyrillic)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Walang wika (Alpabeto)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alpabeto (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alpabeto (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Magbasa ng panlabas na file ng diksyunaryo"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Walang mga file ng diksyunaryo sa folder na Mga Download"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Pumili ng file ng diksyunaryo na ii-install"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"I-install talaga ang file na ito para sa <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Talagang ii-install ang file na ito para sa <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Nagkaroon ng error"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Diksyunaryo ng contacts ng Dump"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Personal na diksyunaryo ng Dump"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Diksyunaryo ng user history ng Dump"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Personalization dictionary ng Dump"</string>
<string name="button_default" msgid="3988017840431881491">"Default"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Maligayang pagdating sa <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"gamit ang Gesture na Pag-type"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"I-refresh"</string>
<string name="last_update" msgid="730467549913588780">"Huling na-update"</string>
<string name="message_updating" msgid="4457761393932375219">"Tumitingin ng mga update"</string>
- <string name="message_loading" msgid="8689096636874758814">"Naglo-load..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Naglo-load…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Pangunahing diksyunaryo"</string>
<string name="cancel" msgid="6830980399865683324">"Kanselahin"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Mga Setting"</string>
<string name="install_dict" msgid="180852772562189365">"I-install"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Kanselahin"</string>
<string name="delete_dict" msgid="756853268088330054">"Tanggalin"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"May available na diksyunaryo ang piniling wika sa iyong mobile device.&lt;br/&gt; Inirerekomenda namin ang &lt;b&gt;pag-download&lt;/b&gt; sa diksyunaryong <xliff:g id="LANGUAGE">%1$s</xliff:g> upang mapabuti ang iyong karanasan sa pag-type.&lt;br/&gt; &lt;br/&gt; Maaaring umabot ng isa hanggang dalawang minuto ang pag-download gamit ang 3G. Maaaring may malapat na mga pagsingil kung wala kang &lt;b&gt;data plan na walang limitasyon&lt;/b&gt;.&lt;br/&gt; Kung hindi ka sigurado kung aling data plan ang mayroon ka, inirerekomenda naming maghanap ng koneksyon sa Wi-Fi upang awtomatikong simulan ang pag-download.&lt;br/&gt; &lt;br/&gt; Tip: Maaari kang mag-download at mag-alis ng mga diksyunaryo sa pamamagitan ng pagpunta sa &lt;b&gt;Wika at input&lt;/b&gt; sa menu na &lt;b&gt;Mga Setting&lt;/b&gt; ng iyong mobile device."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"May available na diksyunaryo ang napiling wika sa iyong mobile device.&lt;br/&gt; Inirerekomenda naming &lt;b&gt;i-download&lt;/b&gt; ang diksyunaryo ng <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> upang pagbutihin ang iyong karanasan sa pagta-type.&lt;br/&gt; &lt;br/&gt; Maaaring magtagal nang ilang minuto ang pag-download sa 3G. Maaaring magkaroon ng mga pagsingil kung wala kang &lt;b&gt;unlimited data plan&lt;/b&gt;.&lt;br/&gt; Kung hindi ka sigurado kung anong data plan ang mayroon ka, inirerekomenda naming maghanap ng koneksyon sa Wi-Fi upang awtomatikong masimulan ang pag-download.&lt;br/&gt; &lt;br/&gt; Tip: Maaari kang mag-download at mag-alis ng mga diksyunaryo sa pamamagitan ng pagpunta sa &lt;b&gt;Wika &amp; input&lt;/b&gt; sa menu ng &lt;b&gt;Mga Setting&lt;/b&gt; ng iyong mobile device."</string>
<string name="download_over_metered" msgid="1643065851159409546">"I-download ngayon (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"I-download gamit ang Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"May available na diksyunaryo para sa <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"May available na diksyunaryo para sa <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Pindutin upang suriin at i-download"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Dina-download: malapit nang maging handa ang mga suhestiyon para sa <xliff:g id="LANGUAGE">%1$s</xliff:g>."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Nagda-download: magkakaron ng mga suhestiyon para sa <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> sa lalong madaling panahon."</string>
<string name="version_text" msgid="2715354215568469385">"Bersyon <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Idagdag"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Idagdag sa diksyunaryo"</string>
diff --git a/java/res/values-tr/strings-config-important-notice.xml b/java/res/values-tr/strings-config-important-notice.xml
new file mode 100644
index 000000000..7d9f6ab12
--- /dev/null
+++ b/java/res/values-tr/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Önerileri iyileştirmek için iletşmlrmdn. ve yazılan verilerden öğren"</string>
+</resources>
diff --git a/java/res/values-tr/strings-talkback-descriptions.xml b/java/res/values-tr/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..d06c9009c
--- /dev/null
+++ b/java/res/values-tr/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Şifre tuşlarının sesli okunmasını dinlemek için kulaklık takın."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Mevcut metin: %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Metin girilmedi"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g>, <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> kelimesini <xliff:g id="CORRECTED_WORD">%3$s</xliff:g> olarak düzeltir"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> otomatik düzeltme yapar"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Tuş kodu: %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Üst karakter"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Üst karakter açık (devre dışı bırakmak için hafifçe vurun)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Büyük harf kilidi açık (devre dışı bırakmak için hafifçe vurun)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Sil"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Simgeler"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Harfler"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Rakamlar"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Ayarlar"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Sekme"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Boşluk çubuğu"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Ses girişi"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Enter"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Arama"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Nokta"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Dili değiştir"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Sonraki"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Önceki"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Üst karakter etkin"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Büyük harf etkin"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Üst karakter devre dışı"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Sembol modu"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Harf modu"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefon modu"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefon sembolleri modu"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Klavye gizli"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"<xliff:g id="KEYBOARD_MODE">%s</xliff:g> klavyesi görüntüleniyor"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"tarih"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"tarih ve saat"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"e-posta"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"mesajlaşma"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"rakam"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"metin"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"saat"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Son Kullanılanlar"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Kişiler"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Nesneler"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Doğa"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Yerler"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simgeler"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"İfadeler"</string>
+</resources>
diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
index a14295153..3584ec5db 100644
--- a/java/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Sistem varsayılanı"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Kişi Adları öner"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Öneri ve düzeltmeler için Kişiler\'deki adları kullan"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Kişisel öneriler"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Çift boşlukla nokta ekleme"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Boşluk çubuğuna iki kez vurmak nokta ve ardından bir boşluk ekler"</string>
<string name="auto_cap" msgid="1719746674854628252">"Otomatik olarak büyük harf yap"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Hareket izini göster"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Dinamik kayan önizleme"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Hareket sırasında önerilen kelimeyi göster"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Kaydedildi"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Şifre tuşlarının sesli okunmasını dinlemek için mikrofonlu kulaklık takın."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Mevcut metin: %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Hiç metin girilmedi"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> tuşu <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> kelimesini <xliff:g id="CORRECTED">%3$s</xliff:g> olarak düzeltir"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> tuşu otomatik düzeltme gerçekleştirir"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Tuş kodu: %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Üst Karakter"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Üst karakter açık (devre dışı bırakmak için hafifçe vurun)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Büyük harf kilidi açık (devre dışı bırakmak içinn hafifçe vurun)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Simgeler"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Harfler"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Rakamlar"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Ayarlar"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Sekme"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Boşluk"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Ses girişi"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Gülen yüz"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Ara"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Nokta"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Dili değiştir"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Sonraki"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Önceki"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Üst karakter etkin"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Büyük harf kilidi etkin"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Üst karakter devre dışı"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Sembol modu"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Harf modu"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Telefon modu"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Telefon sembolleri modu"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Klavye gizli"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"<xliff:g id="MODE">%s</xliff:g> klavyesi gösteriliyor"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"tarih"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"tarih ve saat"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"e-posta"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"mesajlaşma"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"rakam"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"telefon"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"metin"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"saat"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Kelime öbeği hareketi"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Hareketle girişte boşlukları, boşluk tuşuna kaydırarak girin"</string>
<string name="voice_input" msgid="3583258583521397548">"Ses girişi tuşu"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Ana klavyede"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Simge klavyesinde"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Kapalı"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Ana klavyedeki mikrofon"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Simge klavysnd mikrf"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Sesle grş devre dışı"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Hiçbir ses girişi yöntemi etkinleştirilmedi. Dil ve giriş ayarlarını kontrol edin."</string>
<string name="configure_input_method" msgid="373356270290742459">"Giriş yöntemlerini yapılandır"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Giriş dilleri"</string>
<string name="send_feedback" msgid="1780431884109392046">"Geri bildirim gönder"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"İngilizce (BK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"İngilizce (ABD)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"İspanyolca (ABD)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"İngilizce (İngiltere) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"İngilizce (ABD) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"İspanyolca (ABD) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Geleneksel)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"İngilizce (İngiltere) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"İngilizce (ABD) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"İspanyolca (ABD) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Geleneksel)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Kiril)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Dil yok (Alfabe)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabe (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabe (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Harici sözlük dosyasını oku"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"İndirilenler klasöründe sözlük dosyası yok"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Yüklemek için bir sözlük dosyası seçin"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"<xliff:g id="LOCALE_NAME">%s</xliff:g> için bu dosya gerçekten yüklensin mi?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> için bu dosya gerçekten yüklensin mi?"</string>
<string name="error" msgid="8940763624668513648">"Bir hata oluştu"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Kişiler sözlüğünün dökümünü al"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Kişisel sözlüğün dökümünü al"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Kullanıcı geçmişi sözlüğünün dökümünü al"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Kişiselleştirme sözlüğünün dökümünü al"</string>
<string name="button_default" msgid="3988017840431881491">"Varsayılan"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> uygulamasına hoş geldiniz"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"Hareketle Yazmayı içerir"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Yenile"</string>
<string name="last_update" msgid="730467549913588780">"Son güncelleme tarihi"</string>
<string name="message_updating" msgid="4457761393932375219">"Güncellemeler denetleniyor"</string>
- <string name="message_loading" msgid="8689096636874758814">"Yükleniyor..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Yükleniyor…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Ana sözlük"</string>
<string name="cancel" msgid="6830980399865683324">"İptal"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Ayarlar"</string>
<string name="install_dict" msgid="180852772562189365">"Yükle"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"İptal"</string>
<string name="delete_dict" msgid="756853268088330054">"Sil"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Mobil cihazınızda seçili dile ait kullanılabilir bir sözlük mevcut.&lt;br/&gt; Daha iyi yazabilmek için bu <xliff:g id="LANGUAGE">%1$s</xliff:g> sözlüğü &lt;b&gt;indirmenizi&lt;/b&gt; öneririz.&lt;br/&gt; &lt;br/&gt; İndirme işlemi 3G üzerinden bir veya iki dakika sürebilir. &lt;b&gt;Sınırsız veri planınız&lt;/b&gt; yoksa ücret alınabilir.&lt;br/&gt; Ne tür bir veri planına sahip olduğunuzdan emin değilseniz, otomatik olarak indirmeye başlamak için bir Kablosuz bağlantı bulmanızı öneririz.&lt;br/&gt; &lt;br/&gt; İpucu: Sözlükleri, mobil cihazınızın &lt;b&gt;Ayarlar&lt;/b&gt; menüsünde &lt;b&gt;Dil ve giriş&lt;/b&gt; seçeneğine giderek indirebilir ve silebilirsiniz."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Mobil cihazınızda seçili dile ait kullanılabilir bir sözlük var.&lt;br/&gt; Daha iyi yazabilmek için bu <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> sözlüğü &lt;b&gt;indirmenizi&lt;/b&gt; öneririz.&lt;br/&gt; &lt;br/&gt; İndirme işlemi 3G üzerinden bir veya iki dakika sürebilir. &lt;b&gt;Sınırsız veri planınız &lt;/b&gt;yoksa ücret alınabilir.&lt;br/&gt; Ne tür bir veri planına sahip olduğunuzdan emin değilseniz, otomatik olarak indirmeye başlamak için bir Kablosuz bağlantı bulmanızı öneririz.&lt;br/&gt; &lt;br/&gt; İpucu: Sözlükleri, mobil cihazınızın &lt;b&gt;Ayarlar&lt;/b&gt; menüsünde &lt;b&gt;Dil ve giriş&lt;/b&gt; seçeneğine giderek indirebilir ve silebilirsiniz."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Hemen indir (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Kablosuz üzerinden indir"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"<xliff:g id="LANGUAGE">%1$s</xliff:g> için kullanılabilecek bir sözlük mevcut"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> için kullanılabilir bir sözlük var"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"İncelemek ve indirmek için basın"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"<xliff:g id="LANGUAGE">%1$s</xliff:g> için önerilerin indirilmesine kısa süre içinde başlanacak."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> için önerilerin indirilmesine kısa süre içinde başlanacak."</string>
<string name="version_text" msgid="2715354215568469385">"Sürüm <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Ekle"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Sözlüğe ekle"</string>
diff --git a/java/res/values-uk/strings-config-important-notice.xml b/java/res/values-uk/strings-config-important-notice.xml
new file mode 100644
index 000000000..b95b72cd4
--- /dev/null
+++ b/java/res/values-uk/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-uk/strings-talkback-descriptions.xml b/java/res/values-uk/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..9b6d1142d
--- /dev/null
+++ b/java/res/values-uk/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Підключіть гарнітуру, щоб слухати озвучені символи пароля."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Поточний текст: %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Текст не введено"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> виправляє слово \"<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>\" на \"<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>\""</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> автоматично виправляє"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Код клавіші – %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift увімкнено (торкніться, щоб вимкнути)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps Lock увімкнено (торкніться, щоб вимкнути)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Видалити"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Символи"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Літери"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Цифри"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Налаштування"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Пробіл"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Голосовий ввід"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Cмайли Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Повернутися"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Пошук"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Крапка"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Змінити мову"</string>
+ <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">"Shift увімкнено"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock увімкнено"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift вимкнено"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Режим символів"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Режим літер"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Режим номерів телефону"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Режим телефонних символів"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Клавіатуру сховано"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Режим клавіатури: <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"дата"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"дата й час"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"електронні адреси"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"повідомлення"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"цифри"</string>
+ <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">"URL-адреси"</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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Природа"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Місця"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Символи"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Смайли"</string>
+</resources>
diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml
index da26d5005..15a30805e 100644
--- a/java/res/values-uk/strings.xml
+++ b/java/res/values-uk/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"За умовчанням"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Пропон. імена контактів"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Використ. імена зі списку контактів для пропозицій і виправлень"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Персональні пропозиції"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Крапка подвійним пробілом"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Подвійне натискання пробілу вставляє крапку з пробілом після неї"</string>
<string name="auto_cap" msgid="1719746674854628252">"Авто викор. вел. літер"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Показувати слід жестів"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Динамічний спливаючий перегляд"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Показувати пропоноване слово під час введення тексту жестами"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : збережено"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Підключіть гарнітуру, щоб прослухати відтворені вголос символи пароля."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Поточний текст – %s."</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Текст не введено"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> виправляє <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> на <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> здійснює автоматичне виправлення"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Код клавіші – %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Клавіша Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift увімкнено (швидко торкніться, щоб вимкнути)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock увімкнено (швидко торкніться, щоб вимкнути)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Клавіша Delete"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Символи"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Літери"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Цифри"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Налаштування"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Вкладка"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Пробіл"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Голосовий ввід"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Смайлик"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Клавіша Return"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Пошук"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Крапка"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Змінити мову"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Далі"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Назад"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift увімкнено"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Caps Lock увімкнено"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift вимкнено"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Режим символів"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Режим букв і цифр"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Режим набору номера"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Режим набору символів"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Клавіатуру сховано"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Режим клавіатури: <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"дата"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"дата й час"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"електронні адреси"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"повідомлення"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"цифри"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"номери телефонів"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"текст"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"час"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL-адреси"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Безперервний ввід фраз"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Вставляйте пробіли, проводячи пальцем по клавіші пробілу"</string>
<string name="voice_input" msgid="3583258583521397548">"Ключ голосового вводу"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"На основ. клавіатурі"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Символьна клавіатура"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Вимк."</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Мікрофон на основній клавіатурі"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Miкр. на симв. клавіат."</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Голос. ввід вимкнено"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Способи голосового вводу не ввімкнено. Перейдіть у налаштування \"Мова та введення\"."</string>
<string name="configure_input_method" msgid="373356270290742459">"Налаштування методів введення"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Мови вводу"</string>
<string name="send_feedback" msgid="1780431884109392046">"Надіслати відгук"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Англійська (Великобританія)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Англійська (США)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"іспанська (США)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Англійська (Великобр.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Англійська (США) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"іспанська (США) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (традиційна)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Англійська (Британія) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Англійська (США) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Іспанська (США) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (традиційна)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (кирилиця)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (латиниця)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Стандартна (латиниця)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Латиниця (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Латиниця (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Читати файл зовнішнього словника"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"У папці \"Завантаження\" немає файлів словника"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Вибрати файл словника, який потрібно встановити"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Справді встановити цей файл для такої мови: <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Справді встановити цей файл для такої мови: <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Сталася помилка"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Вивантаження словника контактів"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Вивантаження особистого словника"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Вивантаж. словника користув. історії"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Вивантаження словника персоналізації"</string>
<string name="button_default" msgid="3988017840431881491">"За умовчанням"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Вітаємо в програмі <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"з функцією Ввід жестами"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Оновити"</string>
<string name="last_update" msgid="730467549913588780">"Останнє оновлення"</string>
<string name="message_updating" msgid="4457761393932375219">"Перевірка наявності оновлень"</string>
- <string name="message_loading" msgid="8689096636874758814">"Завантаження…"</string>
+ <string name="message_loading" msgid="5638680861387748936">"Завантаження…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"Основний словник"</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="delete_dict" msgid="756853268088330054">"Видалити"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Для вибраної на вашому мобільному пристрої мови доступний словник.&lt;br/&gt; Радимо &lt;b&gt;завантажити&lt;/b&gt; словник для цієї мови (<xliff:g id="LANGUAGE">%1$s</xliff:g>), щоб покращити введення тексту.&lt;br/&gt; &lt;br/&gt; У мережі 3G завантаження триває 1–2 хвилини. Якщо у вас не &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; Радимо &lt;b&gt;завантажити&lt;/b&gt; словник для цієї мови (<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>), щоб покращити введення тексту.&lt;br/&gt; &lt;br/&gt; У мережі 3G завантаження триває 1–2 хвилини. Якщо у вас не &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> Mб)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Завантажити через Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Доступний словник для такої мови: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Доступний словник для такої мови: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Натисніть, щоб переглянути та завантажити"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Скоро почнеться завантаження пропозицій для такої мови: <xliff:g id="LANGUAGE">%1$s</xliff:g>."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Завантаження. Скоро будуть готові пропозиції для такої мови: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>."</string>
<string name="version_text" msgid="2715354215568469385">"Версія <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Додати"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Додати в словник"</string>
diff --git a/java/res/values-v20/platform-theme.xml b/java/res/values-v20/platform-theme.xml
new file mode 100644
index 000000000..06062047b
--- /dev/null
+++ b/java/res/values-v20/platform-theme.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- TODO: This file is temporarily placed under values-v20. -->
+<!-- TODO: It might be moved under values-v21. -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style name="platformActivityTheme" parent="@android:style/Theme.Quantum.Light" />
+ <style name="platformDialogTheme" parent="@android:style/Theme.Quantum.Light.Dialog" />
+</resources>
diff --git a/java/res/values-vi/strings-config-important-notice.xml b/java/res/values-vi/strings-config-important-notice.xml
new file mode 100644
index 000000000..828f0b603
--- /dev/null
+++ b/java/res/values-vi/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Tìm hiểu từ thư từ trao đổi và dữ liệu đã nhập của bạn để cải tiến đề xuất"</string>
+</resources>
diff --git a/java/res/values-vi/strings-talkback-descriptions.xml b/java/res/values-vi/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..9202883c8
--- /dev/null
+++ b/java/res/values-vi/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Cắm tai nghe để nghe mật khẩu được đọc to."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Ký tự hiện tại là %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Không có ký tự nào được nhập"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> sửa <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> thành <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> tự động sửa"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Mã phím %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift đang bật (nhấn để tắt)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Caps lock đang bật (nhấn để tắt)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Xóa"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Biểu tượng"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Chữ cái"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Số"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Cài đặt"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Dấu cách"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Nhập bằng giọng nói"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"Biểu tượng cảm xúc"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Quay lại"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Tìm kiếm"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Dấu chấm"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Chuyển ngôn ngữ"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Tiếp theo"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Trước"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Đã bật Shift"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Đã bật Caps lock"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Đã tắt Shift"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Chế độ biểu tượng"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Chế độ chữ cái"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Chế độ điện thoại"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Chế độ biểu tượng điện thoại"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Bàn phím bị ẩn"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Hiển thị bàn phím <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"ngày"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"ngày và giờ"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"email"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"nhắn tin"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"số"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"điện thoại"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"văn bản"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"giờ"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Gần đây"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Con người"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Đồ vật"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Tự nhiên"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Địa điểm"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Biểu tượng"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Biểu tượng cảm xúc"</string>
+</resources>
diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml
index 81cd373e4..529dcec17 100644
--- a/java/res/values-vi/strings.xml
+++ b/java/res/values-vi/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Mặc định của hệ thống"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Đề xuất tên liên hệ"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Sử dụng tên từ Danh bạ cho các đề xuất và chỉnh sửa"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Đề xuất được cá nhân hóa"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Dấu cách đôi"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Nhấn đúp vào phím cách sẽ chèn thêm một dấu sau dấu cách"</string>
<string name="auto_cap" msgid="1719746674854628252">"Tự động viết hoa"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Hiển thị vệt cử chỉ"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Xem trước nổi động"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Xem từ được đề xuất trong khi dùng cử chỉ"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Đã lưu"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Cắm tai nghe để nghe mật khẩu."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Ký tự hiện tại là %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Không có ký tự nào được nhập"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"<xliff:g id="KEY">%1$s</xliff:g> sửa <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> thành <xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"<xliff:g id="KEY">%1$s</xliff:g> thực hiện tự động sửa"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Mã phím %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift đang bật (bấm để tắt)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock đang bật (bấm để tắt)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Xóa"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Biểu tượng"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Chữ cái"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Số"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Cài đặt"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Dấu cách"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Nhập dữ liệu bằng giọng nói"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Mặt cười"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Quay lại"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Tìm kiếm"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Dấu chấm"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Chuyển ngôn ngữ"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Tiếp theo"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Trước"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Đã bật Shift"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Đã bật Caps lock"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Đã tắt Shift"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Chế độ biểu tượng"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Chế độ chữ cái"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Chế độ điện thoại"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Chế độ biểu tượng điện thoại"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Bàn phím bị ẩn"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Hiển thị bàn phím <xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"ngày"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"ngày và giờ"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"email"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"nhắn tin"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"số"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"điện thoại"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"văn bản"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"giờ"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Cử chỉ nhập cụm từ"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Nhập dấu cách khi thực hiện cử chỉ bằng cách trượt tới phím cách"</string>
<string name="voice_input" msgid="3583258583521397548">"Khóa nhập giọng nói"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Trên bàn phím chính"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Trên bàn phím biểu tượng"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"Tắt"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Micrô trên bàn phím chính"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Micrô trên bàn phím biểu tượng"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Nhập liệu bằng giọng nói đã bị tắt"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Không có phương thức nhập bằng giọng nói nào được bật. Kiểm tra cài đặt Ngôn ngữ và phương thức nhập."</string>
<string name="configure_input_method" msgid="373356270290742459">"Định cấu hình phương thức nhập"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Ngôn ngữ nhập"</string>
<string name="send_feedback" msgid="1780431884109392046">"Gửi phản hồi"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"Tiếng Anh (Anh)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Tiếng Anh (Mỹ)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"Tiếng Tây Ban Nha (Mỹ)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Tiếng Anh (Anh) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Tiếng Anh (Mỹ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"Tiếng Tây Ban Nha (Mỹ) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Truyền thống)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Tiếng Anh (Anh) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Tiếng Anh (Mỹ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Tiếng Tây Ban Nha (Mỹ) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Truyền thống)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tiếng Kirin)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tiếng Latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Không ngôn ngữ nào (Bảng chữ cái)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Bảng chữ cái (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Bảng chữ cái (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Đọc tệp từ điển bên ngoài"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Không có tệp từ điển nào trong thư mục Nội dung tải xuống"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Chọn tệp từ điển để cài đặt"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Thực sự cài đặt tệp này cho <xliff:g id="LOCALE_NAME">%s</xliff:g>?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Thực sự cài đặt tệp này cho <xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Đã xảy ra lỗi"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Tạo từ điển danh bạ"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Lưu vào từ điển cá nhân"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Lưu vào từ điển lịch sử người dùng"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Lưu vào từ điển cá nhân hóa"</string>
<string name="button_default" msgid="3988017840431881491">"Mặc định"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Chào mừng bạn đến với <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"với Nhập bằng cử chỉ"</string>
@@ -188,7 +149,7 @@
<string name="setup_step3_action" msgid="600879797256942259">"Định cấu hình các ngôn ngữ khác"</string>
<string name="setup_finish_action" msgid="276559243409465389">"Đã xong"</string>
<string name="show_setup_wizard_icon" msgid="5008028590593710830">"Hiển thị biểu tượng ứng dụng"</string>
- <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"Hiển thị biểu tượng ứng dụng trong trình khởi chạy"</string>
+ <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"Hiển thị biểu tượng ứng dụng trong trình chạy"</string>
<string name="app_name" msgid="6320102637491234792">"Nhà cung cấp từ điển"</string>
<string name="dictionary_provider_name" msgid="3027315045397363079">"Nhà cung cấp từ điển"</string>
<string name="dictionary_service_name" msgid="6237472350693511448">"Dịch vụ từ điển"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Làm mới"</string>
<string name="last_update" msgid="730467549913588780">"Cập nhật lần cuối"</string>
<string name="message_updating" msgid="4457761393932375219">"Đang kiểm tra cập nhật"</string>
- <string name="message_loading" msgid="8689096636874758814">"Đang tải..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Đang tải..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"Từ điển chính"</string>
<string name="cancel" msgid="6830980399865683324">"Hủy"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Cài đặt"</string>
<string name="install_dict" msgid="180852772562189365">"Cài đặt"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Hủy"</string>
<string name="delete_dict" msgid="756853268088330054">"Xóa"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Ngôn ngữ đã chọn trên thiết bị di động của bạn hiện có từ điển.&lt;br/&gt; Bạn nên &lt;b&gt;tải xuống&lt;/b&gt; từ điển <xliff:g id="LANGUAGE">%1$s</xliff:g> để cải thiện trải nghiệm nhập của mình.&lt;br/&gt; &lt;br/&gt; Quá trình tải xuống có thể mất vài phút qua 3G. Có thể mất phí nếu bạn không có &lt;b&gt;gói dữ liệu không giới hạn&lt;/b&gt;.&lt;br/&gt; Nếu bạn không chắc mình có gói dữ liệu nào, bạn nên tìm kết nối Wi-Fi để bắt đầu tải xuống tự động.&lt;br/&gt; &lt;br/&gt; Mẹo: Bạn có thể tải xuống và xóa từ điển bằng cách đi tới &lt;b&gt;Ngôn ngữ và nhập&lt;/b&gt; trong trình đơn &lt;b&gt;Cài đặt&lt;/b&gt; trên thiết bị di động của mình."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Ngôn ngữ đã chọn trên thiết bị di động của bạn hiện có từ điển.&lt;br/&gt; Bạn nên &lt;b&gt;tải xuống&lt;/b&gt; từ điển <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> để cải thiện trải nghiệm nhập của mình.&lt;br/&gt; &lt;br/&gt; Quá trình tải xuống có thể mất vài phút qua 3G. Có thể mất phí nếu bạn không có &lt;b&gt;gói dữ liệu không giới hạn&lt;/b&gt;.&lt;br/&gt; Nếu bạn không chắc mình có gói dữ liệu nào, bạn nên tìm kết nối Wi-Fi để bắt đầu tải xuống tự động.&lt;br/&gt; &lt;br/&gt; Mẹo: Bạn có thể tải xuống và xóa từ điển bằng cách đi tới &lt;b&gt;Ngôn ngữ và nhập&lt;/b&gt; trong trình đơn &lt;b&gt;Cài đặt&lt;/b&gt; trên thiết bị di động của mình."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Tải xuống bây giờ (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Tải xuống qua Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Có sẵn từ điển cho <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Hiện có từ điển cho <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Nhấn để xem lại và tải xuống"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Tải xuống: đề xuất đối với <xliff:g id="LANGUAGE">%1$s</xliff:g> sẽ sớm sẵn sàng."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Đang tải xuống: đề xuất cho <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> sẽ sớm sẵn sàng."</string>
<string name="version_text" msgid="2715354215568469385">"Phiên bản <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Thêm"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Thêm vào từ điển"</string>
diff --git a/java/res/values-zh-rCN/strings-config-important-notice.xml b/java/res/values-zh-rCN/strings-config-important-notice.xml
new file mode 100644
index 000000000..6013af78d
--- /dev/null
+++ b/java/res/values-zh-rCN/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-zh-rCN/strings-talkback-descriptions.xml b/java/res/values-zh-rCN/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..93f89e091
--- /dev/null
+++ b/java/res/values-zh-rCN/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"插入耳机可听到输入密码时的按键提示音。"</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"当前文字为%s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"未输入文字"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"按<xliff:g id="KEY_NAME">%1$s</xliff:g>键可将<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>更正为<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"按<xliff:g id="KEY_NAME">%1$s</xliff:g>键可进行自动更正"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"键码为%d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"已开启Shift模式(点按即可关闭)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"已锁定大写模式(点按即可关闭)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"删除"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"符号"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"字母"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"数字"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"设置"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"空格"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"语音输入"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"表情符号"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"回车"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"搜索"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"点"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"切换语言"</string>
+ <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">"已开启Shift模式"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"已锁定大写模式"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"已关闭Shift模式"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"符号模式"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"字母模式"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"电话模式"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"电话符号模式"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"键盘已隐藏"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"当前显示的是<xliff:g id="KEYBOARD_MODE">%s</xliff:g>键盘"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"日期"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"日期和时间"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"电子邮件地址"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"消息"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"数字"</string>
+ <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="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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"自然"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"地点"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"符号"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"表情图标"</string>
+</resources>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index d347c9ce8..41fe0bfb6 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"系统默认值"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"联系人姓名建议"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"根据通讯录中的姓名提供建议和更正"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"个性化建议"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"双击空格插入句号"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"双击空格键可插入句号并后跟空格"</string>
<string name="auto_cap" msgid="1719746674854628252">"自动大写"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"显示滑行输入轨迹"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"动态漂浮预览"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"在滑行输入过程中显示建议字词"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>:已保存"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"需要插入耳机才能听到密码的按键声。"</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"当前文本为%s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"未输入文字"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"按<xliff:g id="KEY">%1$s</xliff:g>可将<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>更正为<xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"按<xliff:g id="KEY">%1$s</xliff:g>可执行自动更正"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"键码为 %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift 模式已启用(点按即可停用)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"大写锁定已启用(点按即可停用)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"删除"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"符号"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"字母"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"数字"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"设置"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"空格"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"语音输入"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"笑脸"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"返回"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"搜索"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"点"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"切换语言"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"下一个"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"上一个"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift 模式已启用"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"大写锁定已启用"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift 模式已停用"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"符号模式"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"字母模式"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"电话模式"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"电话符号模式"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"键盘已隐藏"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"目前显示的是<xliff:g id="MODE">%s</xliff:g>键盘"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"日期"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"日期和时间"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"电子邮件"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"短信"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"数字"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"电话"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"文字"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"时间"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"网址"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"词组滑行输入"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"滑行输入时,滑过空格键即可输入空格"</string>
<string name="voice_input" msgid="3583258583521397548">"语音输入键"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"主键盘上"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"符号键盘上"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"关闭"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"主键盘上的麦克风"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"符号键盘上的麦克风"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"语音输入功能已停用"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"未启用任何语音输入法。请检查“语言和输入法”设置。"</string>
<string name="configure_input_method" msgid="373356270290742459">"配置输入法"</string>
<string name="language_selection_title" msgid="1651299598555326750">"输入语言"</string>
<string name="send_feedback" msgid="1780431884109392046">"发送反馈"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"英语(英国)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"英语(美国)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"西班牙语(美国)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"英语(英国)(<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"英语(美国)(<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"西班牙语(美国)(<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g>(传统)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"英式英语(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"美式英语(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"美式西班牙语(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(传统)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(西里尔文)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(拉丁文)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"无语言(字母)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"字母 (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"字母 (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"读取外部词典文件"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"“下载内容”文件夹中没有词典文件"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"选择要安装的词典文件"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"确定要为<xliff:g id="LOCALE_NAME">%s</xliff:g>安装此文件吗?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"确定要安装这个<xliff:g id="LANGUAGE_NAME">%s</xliff:g>词典吗?"</string>
<string name="error" msgid="8940763624668513648">"出现错误"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"转储联系人词典"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"转储个人词典"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"转储用户历史记录词典"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"转储个性化词典"</string>
<string name="button_default" msgid="3988017840431881491">"默认"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"欢迎使用 <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"体验顺畅的滑行输入体验"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"刷新"</string>
<string name="last_update" msgid="730467549913588780">"上次更新时间"</string>
<string name="message_updating" msgid="4457761393932375219">"正在检查更新"</string>
- <string name="message_loading" msgid="8689096636874758814">"正在加载..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"正在加载…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"主词典"</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="delete_dict" msgid="756853268088330054">"删除"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"支持您移动设备上所选语言的词典现已可供下载啦!&lt;br/&gt;建议您&lt;b&gt;下载&lt;/b&gt;这部<xliff:g id="LANGUAGE">%1$s</xliff:g>词典,以享受更好的输入体验。&lt;br/&gt;&lt;br/&gt;通过 3G 进行下载可能需要 1 到 2 分钟的时间。如果您使用的不是&lt;b&gt;无流量限制的套餐&lt;/b&gt;,则可能需要支付一定的费用。&lt;br/&gt;如果您不确定自己使用的是哪种流量套餐,建议您使用 WLAN 连接自动开始下载。&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;我们建议您&lt;b&gt;下载&lt;/b&gt;这个<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>词典,以便获得更好的输入体验。&lt;br/&gt;&lt;br/&gt;通过3G网络下载可能需要一两分钟的时间。如果您使用的不是&lt;b&gt;无流量限制的套餐&lt;/b&gt;,则可能产生一定的流量费。&lt;br/&gt;如果您不确定自己使用的是哪种流量套餐,我们建议您连接到WLAN网络以便自动开始下载。&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>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"通过 WLAN 下载"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"<xliff:g id="LANGUAGE">%1$s</xliff:g>词典可供下载"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"有一个<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>词典可供下载"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"按此通知即可查看和下载"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"下载中:很快就能启用<xliff:g id="LANGUAGE">%1$s</xliff:g>的词典建议服务了!"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"正在下载:<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>输入建议功能马上就可以使用了!"</string>
<string name="version_text" msgid="2715354215568469385">"版本<xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"添加"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"添加到词典"</string>
diff --git a/java/res/values-zh-rHK/strings-config-important-notice.xml b/java/res/values-zh-rHK/strings-config-important-notice.xml
new file mode 100644
index 000000000..a21b24388
--- /dev/null
+++ b/java/res/values-zh-rHK/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-zh-rHK/strings-talkback-descriptions.xml b/java/res/values-zh-rHK/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..8b60504d9
--- /dev/null
+++ b/java/res/values-zh-rHK/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"插上耳機即可聽到系統朗讀密碼鍵。"</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"目前文字為 %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"未輸入文字"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"按「<xliff:g id="KEY_NAME">%1$s</xliff:g>」可將「<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>」修正為「<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>」"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"按「<xliff:g id="KEY_NAME">%1$s</xliff:g>」可自動修正"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"按鍵代碼 %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift 鍵"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift 鍵已開啟 (輕按即可停用)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"大寫鎖定已開啟 (輕按即可停用)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"刪除"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"符號"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"字母"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"數字"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"設定"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab 鍵"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"空白鍵"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"語音輸入"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"表情圖案"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Return 鍵"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"搜尋"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"分點符號"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"切換語言"</string>
+ <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">"Shift 鍵已啟用"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"大寫鎖定已啟用"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift 鍵已停用"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"符號模式"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"字母模式"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"撥號模式"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"符號撥號模式"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"鍵盤已隱藏"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"目前顯示的是<xliff:g id="KEYBOARD_MODE">%s</xliff:g>鍵盤"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"日期"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"日期和時間"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"電郵"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"短訊"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"數字"</string>
+ <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="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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"大自然"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"地點"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"符號"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"表情符號"</string>
+</resources>
diff --git a/java/res/values-zh-rHK/strings.xml b/java/res/values-zh-rHK/strings.xml
index 306045591..34fa9c037 100644
--- a/java/res/values-zh-rHK/strings.xml
+++ b/java/res/values-zh-rHK/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"系統預設"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"建議聯絡人名稱"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"使用「聯絡人」的名稱提供建議與修正"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"個人化建議"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"按兩下空格鍵插入句號"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"只要輕按兩下空格鍵,即可插入句號並在後面加上一個空格"</string>
<string name="auto_cap" msgid="1719746674854628252">"自動大寫"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"顯示手勢軌跡"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"動態浮動預覽"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"在啟用手勢輸入時顯示建議的字詞"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>:已儲存"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"插上耳機即可聽到系統朗讀密碼鍵。"</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"目前文字為 %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"未輸入文字"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"按「<xliff:g id="KEY">%1$s</xliff:g>」可將「<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>」修正為「<xliff:g id="CORRECTED">%3$s</xliff:g>」"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"按「<xliff:g id="KEY">%1$s</xliff:g>」可自動修正"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"按鍵代碼 %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift 鍵"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift 鍵已開啟 (輕按即可停用)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"大寫鎖定已開啟 (輕按即可停用)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"刪除"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"符號"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"字母"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"數字"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"設定"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab 鍵"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"空白鍵"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"語音輸入"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"笑臉"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Return 鍵"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"搜尋"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"點"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"切換語言"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"下一步"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"上一步"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift 鍵已啟用"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"大寫鎖定已啟用"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift 鍵已停用"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"符號模式"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"字母模式"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"撥號模式"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"符號撥號模式"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"鍵盤已隱藏"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"目前顯示的是<xliff:g id="MODE">%s</xliff:g>鍵盤"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"日期"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"日期和時間"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"電郵"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"短訊"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"數字"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"電話"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"文字"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"時間"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"網址"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"詞組手勢"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"在手勢輸入過程中,滑過空白鍵即可輸入空格"</string>
<string name="voice_input" msgid="3583258583521397548">"語音輸入鍵"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"於主鍵盤"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"符號鍵盤上"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"關閉"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"主鍵盤上的麥克風"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"符號鍵盤上的麥克風"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"語音輸入已停用"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"尚未啟用語音輸入法,請檢查語言和輸入設定。"</string>
<string name="configure_input_method" msgid="373356270290742459">"設定輸入法"</string>
<string name="language_selection_title" msgid="1651299598555326750">"輸入語言"</string>
<string name="send_feedback" msgid="1780431884109392046">"傳送意見"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"英文 (英國)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"英文 (美國)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"西班牙文 (美國)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"英文 (英國) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"英文 (美國) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"西班牙文 (美國) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (傳統)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"英文 (英國) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"英文 (美國) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"西班牙文 (美國) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (傳統)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (西里爾文)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (拉丁文)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"無語言 (字母)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"字母 (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"字母 (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"讀取外部字典檔案"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"「下載」資料夾中沒有任何字典檔案"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"選取要安裝的字典檔案"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"準備好要為<xliff:g id="LOCALE_NAME">%s</xliff:g>版本安裝這個檔案嗎?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"準備為<xliff:g id="LANGUAGE_NAME">%s</xliff:g>版本安裝這個檔案嗎?"</string>
<string name="error" msgid="8940763624668513648">"發生錯誤"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"傾印聯絡人字典"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"傾印個人字典"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"傾印使用者記錄字典"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"傾印個人化字典"</string>
<string name="button_default" msgid="3988017840431881491">"預設"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"歡迎使用「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"配備觸控輸入功能"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"重新整理"</string>
<string name="last_update" msgid="730467549913588780">"上次更新日期"</string>
<string name="message_updating" msgid="4457761393932375219">"正在查看更新"</string>
- <string name="message_loading" msgid="8689096636874758814">"正在載入..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"正在載入…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"主要字典"</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="delete_dict" msgid="756853268088330054">"刪除"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"您的流動裝置所選取的語言現有字典可供使用。&lt;br/&gt;建議您&lt;b&gt;下載&lt;/b&gt;<xliff:g id="LANGUAGE">%1$s</xliff:g>字典,讓您輸入時更方便。&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;我們建議您&lt;b&gt;下載&lt;/b&gt;<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>字典,讓您輸入時更方便。&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> MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"經由 Wi-Fi 下載"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"可使用<xliff:g id="LANGUAGE">%1$s</xliff:g>字典"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"可使用<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>字典"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"按下即可查看並下載"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"下載中:很快就能提供<xliff:g id="LANGUAGE">%1$s</xliff:g>字詞建議。"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"下載中:<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>字詞建議服務即將啟用。"</string>
<string name="version_text" msgid="2715354215568469385">"版本 <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"新增"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"加入字典"</string>
diff --git a/java/res/values-zh-rTW/strings-config-important-notice.xml b/java/res/values-zh-rTW/strings-config-important-notice.xml
new file mode 100644
index 000000000..dfffa69cf
--- /dev/null
+++ b/java/res/values-zh-rTW/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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>
+</resources>
diff --git a/java/res/values-zh-rTW/strings-talkback-descriptions.xml b/java/res/values-zh-rTW/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..6351a985a
--- /dev/null
+++ b/java/res/values-zh-rTW/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"連接耳機即可聽取系統朗讀密碼按鍵。"</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"目前文字為 %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"未輸入文字"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"按下「<xliff:g id="KEY_NAME">%1$s</xliff:g>」可將「<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>」修正為「<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>」"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"按下「<xliff:g id="KEY_NAME">%1$s</xliff:g>」可執行自動修正"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"按鍵代碼 %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"Shift 鍵"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"Shift 鍵已開啟 (輕按即可停用)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"大寫鎖定已開啟 (輕按即可停用)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"刪除"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"符號"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"字母"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"數字"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"設定"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Tab 鍵"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"空格鍵"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"語音輸入"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"表情符號"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"返回"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"搜尋"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"圓點符號"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"切換語言"</string>
+ <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">"Shift 鍵已啟用"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"大寫鎖定已啟用"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift 鍵已停用"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"符號模式"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"字母模式"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"撥號模式"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"撥號符號模式"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"鍵盤已隱藏"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"目前顯示的是<xliff:g id="KEYBOARD_MODE">%s</xliff:g>鍵盤"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"日期"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"日期和時間"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"電子郵件"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"簡訊"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"數字"</string>
+ <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="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>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"自然"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"地點"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"符號"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"表情"</string>
+</resources>
diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index 2c474b79e..9c9f5e052 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"系統預設"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"聯絡人姓名建議"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"根據「聯絡人」名稱提供建議與修正"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"個人化建議"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"輕按兩下空格鍵即插入句號"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"輕按兩下空格鍵可插入句號另加一個空格"</string>
<string name="auto_cap" msgid="1719746674854628252">"自動大寫"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"顯示手勢軌跡"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"動態浮動預覽"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"使用滑行輸入時顯示建議字詞"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>:已儲存"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"連接耳機即可聽取系統朗讀密碼按鍵。"</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"目前文字為 %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"未輸入文字"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"按下「<xliff:g id="KEY">%1$s</xliff:g>」可將「<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>」修正為「<xliff:g id="CORRECTED">%3$s</xliff:g>」"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"按下「<xliff:g id="KEY">%1$s</xliff:g>」可執行自動修正"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"按鍵代碼 %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift 鍵"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift 鍵已開啟 (輕按即可停用)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"大寫鎖定已開啟 (輕按即可停用)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"刪除"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"符號"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"字母"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"數字"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"設定"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab 鍵"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"空白鍵"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"語音輸入"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"笑臉"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"返回"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"搜尋"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"點"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"切換語言"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"下一頁"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"上一頁"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Shift 鍵已啟用"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"大寫鎖定已啟用"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Shift 鍵已停用"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"符號模式"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"字母模式"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"撥號模式"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"撥號符號模式"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"鍵盤已隱藏"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"目前顯示的是<xliff:g id="MODE">%s</xliff:g>鍵盤"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"日期"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"日期和時間"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"電子郵件"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"簡訊"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"數字"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"電話號碼"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"文字"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"時間"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"網址"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"詞組手勢"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"手勢輸入時,滑過空格鍵即可輸入空格"</string>
<string name="voice_input" msgid="3583258583521397548">"語音輸入按鍵"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"主鍵盤上"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"符號鍵盤上"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"關閉"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"主鍵盤上的麥克風"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"符號鍵盤上的麥克風"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"語音輸入已停用"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"尚未啟動語音輸入法,請檢查語言與輸入設定。"</string>
<string name="configure_input_method" msgid="373356270290742459">"設定輸入法"</string>
<string name="language_selection_title" msgid="1651299598555326750">"輸入語言"</string>
<string name="send_feedback" msgid="1780431884109392046">"提供意見"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"英文 (英國)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"英文 (美國)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"西班牙文 (美國)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"英文 (英國) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"英文 (美國) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"西班牙文 (美國) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (傳統)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"英文 (英國) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"英文 (美國) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"西班牙文 (美國) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (傳統)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (斯拉夫文)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (拉丁文)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"無語言 (字母)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"字母 (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"字母 (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"讀取外部字典檔案"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"「下載」資料夾中沒有任何字典檔案"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"選取要安裝的字典檔案"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"準備為<xliff:g id="LOCALE_NAME">%s</xliff:g>版本安裝這個檔案嗎?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"確定要安裝這個<xliff:g id="LANGUAGE_NAME">%s</xliff:g>檔案嗎?"</string>
<string name="error" msgid="8940763624668513648">"發生錯誤"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"傾印聯絡人字典"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"捨棄個人字典"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"捨棄使用者紀錄字典"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"捨棄個人化字典"</string>
<string name="button_default" msgid="3988017840431881491">"預設"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"歡迎使用 <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"含滑行輸入功能"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"重新整理"</string>
<string name="last_update" msgid="730467549913588780">"上次更新時間:"</string>
<string name="message_updating" msgid="4457761393932375219">"正在檢查更新"</string>
- <string name="message_loading" msgid="8689096636874758814">"載入中..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"載入中…"</string>
<string name="main_dict_description" msgid="3072821352793492143">"主要字典"</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="delete_dict" msgid="756853268088330054">"刪除"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"您的行動裝置設定的語言,現有字典可供使用。&lt;br/&gt; 建議您&lt;b&gt;下載&lt;/b&gt;<xliff:g id="LANGUAGE">%1$s</xliff:g>字典,加強輸入功能。&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;建議您&lt;b&gt;下載&lt;/b&gt;<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>字典,藉此強化輸入功能。&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>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"透過 Wi-Fi 下載"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"支援<xliff:g id="LANGUAGE">%1$s</xliff:g>字典"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"支援<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>字典"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"按下即可查看並下載"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"下載中:即將啟用<xliff:g id="LANGUAGE">%1$s</xliff:g>字詞建議服務。"</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"下載中:即將啟用<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>字詞建議服務。"</string>
<string name="version_text" msgid="2715354215568469385">"版本 <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"新增"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"加入字典"</string>
diff --git a/java/res/values-zu/strings-config-important-notice.xml b/java/res/values-zu/strings-config-important-notice.xml
new file mode 100644
index 000000000..0d352006c
--- /dev/null
+++ b/java/res/values-zu/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<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">"Funda kusukela kwezokuxhumana zakho nedatha ethayiphiwe ukuze uthuthukise iziphakamiso"</string>
+</resources>
diff --git a/java/res/values-zu/strings-talkback-descriptions.xml b/java/res/values-zu/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..e01f7347d
--- /dev/null
+++ b/java/res/values-zu/strings-talkback-descriptions.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="spoken_use_headphones" msgid="4313642710742229868">"Plaka ku-headset ukuze uzwe okhiye bephasiwedi ezindlebeni zakho bezwakala kakhulu."</string>
+ <string name="spoken_current_text_is" msgid="4240549866156675799">"Umbhalo wamanje ngu %s"</string>
+ <string name="spoken_no_text_entered" msgid="1711276837961785646">"Awukho umbhalo ofakiwe"</string>
+ <string name="spoken_auto_correct" msgid="8989324692167993804">"I-<xliff:g id="KEY_NAME">%1$s</xliff:g> ilungisa i-<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> kube yi-<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+ <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"I-<xliff:g id="KEY_NAME">%1$s</xliff:g> yenza ukulungisa okuzenzakalelayo"</string>
+ <string name="spoken_description_unknown" msgid="2382510329910793539">"Ikhodi yokhiye %d"</string>
+ <string name="spoken_description_shift" msgid="7209798151676638728">"U-Shift"</string>
+ <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"U-Shift uvuliwe (thepha ukuwuvimbela)"</string>
+ <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Ofeleba bavuliwe (thepha ukubavimbela)"</string>
+ <string name="spoken_description_delete" msgid="3878902286264983302">"Susa"</string>
+ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Amasimbuli"</string>
+ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Izinhlamvu"</string>
+ <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Izinombolo"</string>
+ <string name="spoken_description_settings" msgid="7281251004003143204">"Izilungiselelo"</string>
+ <string name="spoken_description_tab" msgid="8210782459446866716">"Ithebhu"</string>
+ <string name="spoken_description_space" msgid="5908716896642059145">"Isikhala"</string>
+ <string name="spoken_description_mic" msgid="6153138783813452464">"Okungenayo kwezwi"</string>
+ <string name="spoken_description_emoji" msgid="7990051553008088470">"I-Emoji"</string>
+ <string name="spoken_description_return" msgid="3183692287397645708">"Buyela"</string>
+ <string name="spoken_description_search" msgid="5099937658231911288">"Sesha"</string>
+ <string name="spoken_description_dot" msgid="5644176501632325560">"Icashazi"</string>
+ <string name="spoken_description_language_switch" msgid="6818666779313544553">"Shintsha ulimi"</string>
+ <string name="spoken_description_action_next" msgid="431761808119616962">"Okulandelayo"</string>
+ <string name="spoken_description_action_previous" msgid="2919072174697865110">"Okwangaphambilini"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"U-Shift uvunyelwe"</string>
+ <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Ofeleba bavunyelwe"</string>
+ <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"U-Shift uvimbelwe"</string>
+ <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Imodi yezimpawu"</string>
+ <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Imodi yezinhlamvu"</string>
+ <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Imodi yefoni"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Imodi yezimpawu zefoni"</string>
+ <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Ikhibhodi ifihliwe"</string>
+ <string name="announce_keyboard_mode" msgid="6698257917367823205">"Ibonisa ikhibhodi ye-<xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+ <string name="keyboard_mode_date" msgid="6597407244976713364">"idethi"</string>
+ <string name="keyboard_mode_date_time" msgid="3642804408726668808">"idethi nesikhathi"</string>
+ <string name="keyboard_mode_email" msgid="1239682082047693644">"i-imeyili"</string>
+ <string name="keyboard_mode_im" msgid="3812086215529493501">"imilayezo"</string>
+ <string name="keyboard_mode_number" msgid="5395042245837996809">"inombolo"</string>
+ <string name="keyboard_mode_phone" msgid="2486230278064523665">"ifoni"</string>
+ <string name="keyboard_mode_text" msgid="9138789594969187494">"umbhalo"</string>
+ <string name="keyboard_mode_time" msgid="8558297845514402675">"isikhathi"</string>
+ <string name="keyboard_mode_url" msgid="8072011652949962550">"I-URL"</string>
+ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Okwakamuva"</string>
+ <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Abantu"</string>
+ <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Izinto"</string>
+ <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Indalo"</string>
+ <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Izindawo"</string>
+ <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Amasimbuli"</string>
+ <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Izithombe-mzwelo"</string>
+</resources>
diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml
index 27d11316c..c79d81dcc 100644
--- a/java/res/values-zu/strings.xml
+++ b/java/res/values-zu/strings.xml
@@ -46,6 +46,7 @@
<string name="settings_system_default" msgid="6268225104743331821">"Okuzenzakalelayo kwesistimu"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Sikisela amagama Othintana nabo"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Amagama abasebenzisi kusuka Kothintana nabo bokusikisela nokulungisa"</string>
+ <string name="use_personalized_dicts" msgid="5167396352105467626">"Iziphakamiso ezenziwe okomuntu siqu"</string>
<string name="use_double_space_period" msgid="8781529969425082860">"Isikhathi se-Double-space"</string>
<string name="use_double_space_period_summary" msgid="6532892187247952799">"Ukuthepha kabili kubha yesikhala kufaka isikhathi esilandelwa yisikhala"</string>
<string name="auto_cap" msgid="1719746674854628252">"Ukwenza ofeleba okuzenzakalelayo"</string>
@@ -73,56 +74,10 @@
<string name="gesture_preview_trail" msgid="3802333369335722221">"Bonisa i-trail yokuthinta"</string>
<string name="gesture_floating_preview_text" msgid="4443240334739381053">"Ukuhlola kuqala okuntantayo okunamandla"</string>
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Bona igama eliphakanyisiwe ngenkathi uthinta"</string>
- <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Kulondoloziwe"</string>
- <string name="spoken_use_headphones" msgid="896961781287283493">"Plaka ku-headset ukuze uzwe okhiye bephasiwedi ezindlebeni zakho bezwakala kakhulu."</string>
- <string name="spoken_current_text_is" msgid="2485723011272583845">"Umbhalo wamanje ngu %s"</string>
- <string name="spoken_no_text_entered" msgid="7479685225597344496">"Awukho umbhalo ofakiwe"</string>
- <string name="spoken_auto_correct" msgid="8005997889020109763">"I-<xliff:g id="KEY">%1$s</xliff:g> ilungisa i-<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> ibe yi-<xliff:g id="CORRECTED">%3$s</xliff:g>"</string>
- <string name="spoken_auto_correct_obscured" msgid="6276420476908833791">"I-<xliff:g id="KEY">%1$s</xliff:g> yenza ukulungiswa kokuzenzakalela"</string>
- <string name="spoken_description_unknown" msgid="3197434010402179157">"Ikhodi yokhiye %d"</string>
- <string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"U-Shift uvuliwe (thepha ukuwuvimbela)"</string>
- <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Ofeleba bavuliwe (thepha ukubavimbela)"</string>
- <string name="spoken_description_delete" msgid="8740376944276199801">"Susa"</string>
- <string name="spoken_description_to_symbol" msgid="5486340107500448969">"Amasimbuli"</string>
- <string name="spoken_description_to_alpha" msgid="23129338819771807">"Imbhalo"</string>
- <string name="spoken_description_to_numeric" msgid="591752092685161732">"Izinombolo"</string>
- <string name="spoken_description_settings" msgid="4627462689603838099">"Izilungiselelo"</string>
- <string name="spoken_description_tab" msgid="2667716002663482248">"Tab"</string>
- <string name="spoken_description_space" msgid="2582521050049860859">"Isikhala"</string>
- <string name="spoken_description_mic" msgid="615536748882611950">"Okungenayo kwezwi"</string>
- <string name="spoken_description_smiley" msgid="2256309826200113918">"Ubuso-obumomothekayo"</string>
- <string name="spoken_description_return" msgid="8178083177238315647">"Buyisela"</string>
- <string name="spoken_description_search" msgid="1247236163755920808">"Sesha"</string>
- <string name="spoken_description_dot" msgid="40711082435231673">"Icashazi"</string>
- <string name="spoken_description_language_switch" msgid="5507091328222331316">"Shintsha ulimi"</string>
- <string name="spoken_description_action_next" msgid="8636078276664150324">"Okulandelayo"</string>
- <string name="spoken_description_action_previous" msgid="800872415009336208">"Okwandulele"</string>
- <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"U-Shift uvunyelwe"</string>
- <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Ofeleba bavunyelwe"</string>
- <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"U-Shift uvimbelwe"</string>
- <string name="spoken_description_mode_symbol" msgid="7183343879909747642">"Imodi yezimpawu"</string>
- <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Imodi yezinhlamvu"</string>
- <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Imodi yefoni"</string>
- <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Imodi yezimpawu zefoni"</string>
- <string name="announce_keyboard_hidden" msgid="8718927835531429807">"Ikhibhodi ifihliwe"</string>
- <string name="announce_keyboard_mode" msgid="4729081055438508321">"Kuboniswa ikhibhodi engu-<xliff:g id="MODE">%s</xliff:g>"</string>
- <string name="keyboard_mode_date" msgid="3137520166817128102">"idethi"</string>
- <string name="keyboard_mode_date_time" msgid="339593358488851072">"idethi nesikhathi"</string>
- <string name="keyboard_mode_email" msgid="6216248078128294262">"i-imeyili"</string>
- <string name="keyboard_mode_im" msgid="1137405089766557048">"imilayezo"</string>
- <string name="keyboard_mode_number" msgid="7991623440699957069">"inombolo"</string>
- <string name="keyboard_mode_phone" msgid="6851627527401433229">"ifoni"</string>
- <string name="keyboard_mode_text" msgid="6479436687899701619">"umbhalo"</string>
- <string name="keyboard_mode_time" msgid="4381856885582143277">"isikhathi"</string>
- <string name="keyboard_mode_url" msgid="1519819835514911218">"I-URL"</string>
+ <string name="gesture_space_aware" msgid="2078291600664682496">"Igama lokuthinta"</string>
+ <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Faka izikhala ngesikhathi sokuthinta ngokushelelela kukhiye wesikhala"</string>
<string name="voice_input" msgid="3583258583521397548">"Inkinobho yokufaka izwi"</string>
- <string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Kwikhibhodi eyisisekelo"</string>
- <string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Ikhibhodi yezimpawu"</string>
- <string name="voice_input_modes_off" msgid="3745699748218082014">"VALIWE"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"I-mic kwikhibhodi eyisisekelo"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Ikhibhodi yezimpawu ze-mic"</string>
- <string name="voice_input_modes_summary_off" msgid="63875609591897607">"Okufakwayo ngezwi kuvinjelwe"</string>
+ <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Azikho izindlela zokufaka zezwi ezinikwe amandla. Hlola izilungiselelo zolimi kanye nezokufaka."</string>
<string name="configure_input_method" msgid="373356270290742459">"Misa izindlela zokufakwayo"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Izilimi zokufakwayo"</string>
<string name="send_feedback" msgid="1780431884109392046">"Thumela impendulo"</string>
@@ -135,10 +90,12 @@
<string name="subtype_en_GB" msgid="88170601942311355">"i-English(UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"i-English (US)"</string>
<string name="subtype_es_US" msgid="5583145191430180200">"I-Spanish (US)"</string>
- <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"I-English (UK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"I-English (US) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_with_layout_es_US" msgid="6261791057007890189">"I-Spanish (US) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
- <string name="subtype_nepali_traditional" msgid="9032247506728040447">"<xliff:g id="LANGUAGE">%s</xliff:g> (Ezosiko)"</string>
+ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"I-English (UK) ( <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g> )"</string>
+ <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"I-English (US) ( <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g> )"</string>
+ <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Isi-Spanish (US) ( <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g> )"</string>
+ <string name="subtype_generic_traditional" msgid="8584594350973800586">"Isi-<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Tradition)"</string>
+ <string name="subtype_generic_cyrillic" msgid="7486451947618138947">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Isi-Cyrillic)"</string>
+ <string name="subtype_generic_latin" msgid="9128716486310604145">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Isi-Latin)"</string>
<string name="subtype_no_language" msgid="7137390094240139495">"Alikho ulimi (Alfabhethi)"</string>
<string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabhethi (QWERTY)"</string>
<string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabhethi (QWERTZ)"</string>
@@ -168,8 +125,12 @@
<string name="prefs_read_external_dictionary" msgid="2588931418575013067">"Funda ifayela elangaphandle lesichazamazwi"</string>
<string name="read_external_dictionary_no_files_message" msgid="4947420942224623792">"Awekho amafayela wesichazamazwi kufolda yokulandiwe"</string>
<string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"Khetha ifayela lesichazamazwi ukuze ulifake"</string>
- <string name="read_external_dictionary_confirm_install_message" msgid="6898610163768980870">"Ufuna ukufakela i-<xliff:g id="LOCALE_NAME">%s</xliff:g> leli fayela ngokweqiniso?"</string>
+ <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"Fakela ngempela leli fayela i-<xliff:g id="LANGUAGE_NAME">%s</xliff:g>?"</string>
<string name="error" msgid="8940763624668513648">"Kube nephutha"</string>
+ <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"Yenza uhlu isichazamazwi soxhumana nabo"</string>
+ <string name="prefs_dump_user_dict" msgid="294870685041741951">"Lahla isichazamazwi somuntu siqu"</string>
+ <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"Lahla isichazamazwi somlando womsebenzisi"</string>
+ <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"Lahla isichazamazwi sokwenza kube ngokwakho"</string>
<string name="button_default" msgid="3988017840431881491">"Okuzenzakalelayo"</string>
<string name="setup_welcome_title" msgid="6112821709832031715">"Siyakwamukela ku-<xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="setup_welcome_additional_description" msgid="8150252008545768953">"nokuthayipha ngokuthinta"</string>
@@ -207,18 +168,19 @@
<string name="check_for_updates_now" msgid="8087688440916388581">"Qala kabusha"</string>
<string name="last_update" msgid="730467549913588780">"Igcine ukulungiswa"</string>
<string name="message_updating" msgid="4457761393932375219">"Ihlola izibuyekezo"</string>
- <string name="message_loading" msgid="8689096636874758814">"Iyalayisha..."</string>
+ <string name="message_loading" msgid="5638680861387748936">"Iyalayisha..."</string>
<string name="main_dict_description" msgid="3072821352793492143">"Isichazamazwi sakho esisemqoka"</string>
<string name="cancel" msgid="6830980399865683324">"Khansela"</string>
+ <string name="go_to_settings" msgid="3876892339342569259">"Izilungiselelo"</string>
<string name="install_dict" msgid="180852772562189365">"Faka"</string>
<string name="cancel_download_dict" msgid="7843340278507019303">"Khansela"</string>
<string name="delete_dict" msgid="756853268088330054">"Susa"</string>
- <string name="should_download_over_metered_prompt" msgid="2878629598667658845">"Ulimi olukhethiwe kudivayisi yakho yeselula linesichazamazwi esitholakalayo.&lt;br/&gt; Sincoma &lt;b&gt;ukulanda&lt;/b&gt; isichazamazwi sesi-<xliff:g id="LANGUAGE">%1$s</xliff:g> ukwenza kangcono isipiliyoni sakho sokuthayipha.&lt;br/&gt; &lt;br/&gt; Ukulanda ukungathatha iminithi noma amaminithi amabili nge-3G. Amashaja angasebenza uma ungenalo &lt;b&gt;icebo ledatha elinganqunyelwe&lt;/b&gt;.&lt;br/&gt; Uma ungenasiqinisekiso sokuthi iliphi icebo ledatha onalo, sincoma ukuthola uxhumo lwe-Wi-Fi ukuze uqale ukulanda ngokuzenzakalelayo.&lt;br/&gt; &lt;br/&gt; Ithiphu: Ungalanda futhi ususe izichazamazwi ngokuya ku-&lt;b&gt;Ulimi nokungenayo&lt;/b&gt; kumenyu ye-&lt;b&gt;Izilungiselelo&lt;/b&gt; yedivayisi yakho yeselula."</string>
+ <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Ulimi olukhethiwe kudivayisi yakho yeselula lunesichazamazwi esitholakalayo.&lt;br/&gt; Sincoma &lt;b&gt;ukulanda&lt;/b&gt; isichazamazwi se-<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> ukuze sithuthukise umuzwa wakho wokuthayipha.&lt;br/&gt; &lt;br/&gt; Ukulanda kungathatha iminithi noma amabili ngaphezulu kwe-3G. Ukukhokhiswa kungasebenza uma unganalo &lt;b&gt;uhlelo lwedatha elingenamkhawulo&lt;/b&gt;.&lt;br/&gt; Uma ungenaso isiqiniseko sokuthi ukuliphi uhlelo lwedatha, sincoma ukuthi uthole ukuxhumeka kwe-Wi-Fi ukuze uqale ukulanda ngokuzenzakalela.&lt;br/&gt; &lt;br/&gt; Ithiphu: Ungalanda uphinde ususe izichazamazwi ngokuya ku-&lt;b&gt;Ulimi nokokufaka&lt;/b&gt; kumenyu ye-&lt;b&gt;Izilungiselelo&lt;/b&gt; zedivayisi yakho yeselula."</string>
<string name="download_over_metered" msgid="1643065851159409546">"Landa manje (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>MB)"</string>
<string name="do_not_download_over_metered" msgid="2176209579313941583">"Landa nge-Wi-Fi"</string>
- <string name="dict_available_notification_title" msgid="6514288591959117288">"Isichazamazwi se-<xliff:g id="LANGUAGE">%1$s</xliff:g> siyatholakala"</string>
+ <string name="dict_available_notification_title" msgid="4583842811218581658">"Isichazamazwi sitholakalela i-<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
<string name="dict_available_notification_description" msgid="1075194169443163487">"Cindezela ukuze ubuyekeze uphinde ulande"</string>
- <string name="toast_downloading_suggestions" msgid="1313027353588566660">"Ukulanda: iziphakamiso ze-<xliff:g id="LANGUAGE">%1$s</xliff:g> zizolunga maduze."</string>
+ <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Ukulanda: iziphakamiso ze-<xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> zizolunga maduze."</string>
<string name="version_text" msgid="2715354215568469385">"Inguqulo engu-<xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
<string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Engeza"</string>
<string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Faka kusichazamazwi"</string>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 31945d020..475e92f2e 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -26,14 +26,14 @@
<attr name="keyboardViewStyle" format="reference" />
<!-- MainKeyboardView style -->
<attr name="mainKeyboardViewStyle" format="reference" />
+ <!-- Key preview text view style -->
+ <attr name="keyPreviewTextViewStyle" format="reference"/>
<!-- EmojiPalettesView style -->
<attr name="emojiPalettesViewStyle" format="reference" />
<!-- MoreKeysKeyboard style -->
<attr name="moreKeysKeyboardStyle" format="reference" />
<!-- MoreKeysKeyboardView style -->
<attr name="moreKeysKeyboardViewStyle" format="reference" />
- <!-- MoreKeysKeyboardView container style -->
- <attr name="moreKeysKeyboardContainerStyle" format="reference" />
<!-- Suggestions strip style -->
<attr name="suggestionStripViewStyle" format="reference" />
<!-- Suggestion word style -->
@@ -41,9 +41,9 @@
</declare-styleable>
<declare-styleable name="KeyboardView">
- <!-- Image for the key. This image needs to be a StateListDrawable, with the following
- possible states: normal, pressed, checkable, checkable+pressed, checkable+checked,
- checkable+checked+pressed. -->
+ <!-- Image for the key. This image needs to be a {@link StateListDrawable}, with the
+ following possible states: normal, pressed, checkable, checkable+pressed,
+ checkable+checked, checkable+checked+pressed. -->
<attr name="keyBackground" format="reference" />
<!-- Image for the functional key used in Emoji layout. -->
<attr name="keyBackgroundEmojiFunctional" format="reference" />
@@ -72,9 +72,11 @@
<attr name="autoCorrectionSpacebarLedEnabled" format="boolean" />
<attr name="autoCorrectionSpacebarLedIcon" format="reference" />
<!-- Size of the text for spacebar language label, in the proportion of key height. -->
- <attr name="spacebarTextRatio" format="fraction" />
- <attr name="spacebarTextColor" format="color" />
- <attr name="spacebarTextShadowColor" format="color" />
+ <attr name="languageOnSpacebarTextRatio" format="fraction" />
+ <attr name="languageOnSpacebarTextColor" format="color" />
+ <attr name="languageOnSpacebarTextShadowColor" format="color" />
+ <!-- Background image for the spacebar. -->
+ <attr name="spacebarBackground" format="reference" />
<!-- Fadeout animator for spacebar language label. -->
<attr name="languageOnSpacebarFinalAlpha" format="integer" />
<attr name="languageOnSpacebarFadeoutAnimator" format="reference" />
@@ -89,8 +91,8 @@
<attr name="touchNoiseThresholdTime" format="integer" />
<!-- Touch noise threshold distance in millimeter -->
<attr name="touchNoiseThresholdDistance" format="dimension" />
- <!-- Sliding key input enable -->
- <attr name="slidingKeyInputEnable" format="boolean" />
+ <!-- Enable key selection by dragging finger -->
+ <attr name="keySelectionByDraggingFinger" format="boolean" />
<attr name="slidingKeyInputPreviewColor" format="color" />
<attr name="slidingKeyInputPreviewWidth" format="dimension" />
<attr name="slidingKeyInputPreviewBodyRatio" format="integer" />
@@ -109,6 +111,7 @@
<attr name="keyPreviewOffset" format="dimension" />
<!-- Height of the key press feedback popup. -->
<attr name="keyPreviewHeight" format="dimension" />
+ <!-- TODO: consolidate key preview linger timeout with the key preview animation parameters. -->
<!-- Delay after key releasing and key press feedback dismissing in millisecond -->
<attr name="keyPreviewLingerTimeout" format="integer" />
<!-- Layout resource for more keys keyboard -->
@@ -172,7 +175,7 @@
</declare-styleable>
<declare-styleable name="SuggestionStripView">
- <attr name="suggestionStripOption" format="integer">
+ <attr name="suggestionStripOptions" format="integer">
<!-- This should be aligned with SuggestionStripLayoutHelper.AUTO_CORRECT_* and etc. -->
<flag name="autoCorrectBold" value="0x01" />
<flag name="autoCorrectUnderline" value="0x02" />
@@ -217,7 +220,6 @@
<attr name="iconSearchKey" format="reference" />
<attr name="iconTabKey" format="reference" />
<attr name="iconShortcutKey" format="reference" />
- <attr name="iconShortcutForLabel" format="reference" />
<attr name="iconSpaceKeyForNumberLayout" format="reference" />
<attr name="iconShiftKeyShifted" format="reference" />
<attr name="iconShortcutKeyDisabled" format="reference" />
@@ -235,10 +237,6 @@
</declare-styleable>
<declare-styleable name="Keyboard_Key">
- <!-- The unicode value that this key outputs.
- Code value represented in hexadecimal prefixed with "0x" or code value reference using
- "!code/<code_name>" notation. -->
- <attr name="code" format="string" />
<!-- The alternate unicode value that this key outputs while typing.
Code value represented in hexadecimal prefixed with "0x" or code value reference using
"!code/<code_name>" notation. -->
@@ -270,12 +268,12 @@
<flag name="altCodeWhileTyping" value="0x04" />
<flag name="enableLongPress" value="0x08" />
</attr>
- <!-- The string of characters to output when this key is pressed. -->
- <attr name="keyOutputText" format="string" />
- <!-- The label to display on the key. -->
- <attr name="keyLabel" format="string" />
+ <!-- The label, icon to display on the key. And code, outputText of the key. -->
+ <attr name="keySpec" format="string" />
<!-- The hint label to display on the key in conjunction with the label. -->
<attr name="keyHintLabel" format="string" />
+ <!-- The vertical adjustment of key hint label in proportion to its height. -->
+ <attr name="keyHintLabelVerticalAdjustment" format="fraction" />
<!-- The key label flags. -->
<attr name="keyLabelFlags" format="integer">
<!-- This should be aligned with Key.LABEL_FLAGS__* -->
@@ -292,24 +290,25 @@
<flag name="hasPopupHint" value="0x200" />
<flag name="hasShiftedLetterHint" value="0x400" />
<flag name="hasHintLabel" value="0x800" />
+ <!-- These two flags are currently unused. Leave these for possible future use. -->
<flag name="withIconLeft" value="0x1000" />
<flag name="withIconRight" value="0x2000" />
<flag name="autoXScale" value="0x4000" />
+ <!-- The autoScale value implies autoXScale bit on to optimize scaling code path. -->
+ <flag name="autoScale" value="0xc000" />
<!-- If true, character case of code, altCode, moreKeys, keyOutputText, keyLabel,
or keyHintLabel will never be subject to change. -->
- <flag name="preserveCase" value="0x8000" />
+ <flag name="preserveCase" value="0x10000" />
<!-- If true, use keyShiftedLetterHintActivatedColor for the shifted letter hint and
keyTextInactivatedColor for the primary key top label. -->
- <flag name="shiftedLetterActivated" value="0x10000" />
+ <flag name="shiftedLetterActivated" value="0x20000" />
<!-- If true, use EditorInfo.actionLabel for the key label. -->
- <flag name="fromCustomActionLabel" value="0x20000" />
+ <flag name="fromCustomActionLabel" value="0x40000" />
<!-- If true, disable keyHintLabel. -->
<flag name="disableKeyHintLabel" value="0x40000000" />
<!-- If true, disable additionalMoreKeys. -->
<flag name="disableAdditionalMoreKeys" value="0x80000000" />
</attr>
- <!-- The icon to display on the key instead of the label. -->
- <attr name="keyIcon" format="string" />
<!-- The icon for disabled key -->
<attr name="keyIconDisabled" format="string" />
<!-- The icon to show in the popup preview. -->
@@ -415,8 +414,7 @@
<attr name="navigatePrevious" format="boolean" />
<attr name="passwordInput" format="boolean" />
<attr name="clobberSettingsKey" format="boolean" />
- <attr name="shortcutKeyEnabled" format="boolean" />
- <attr name="shortcutKeyOnSymbols" format="boolean" />
+ <attr name="supportsSwitchingToShortcutIme" format="boolean" />
<attr name="hasShortcutKey" format="boolean" />
<attr name="languageSwitchKeyEnabled" format="boolean" />
<attr name="isMultiLine" format="boolean" />
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 93f25a7f6..824928c6b 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -19,26 +19,13 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Color resources for Gingerbread theme. -->
- <color name="highlight_color_gb">#FFFCAE00</color>
- <color name="typed_word_color_gb">@android:color/white</color>
- <color name="highlight_translucent_color_gb">#99FCAE00</color>
- <color name="key_text_color_gb">@android:color/white</color>
- <color name="key_text_shadow_color_gb">#BB000000</color>
- <color name="key_text_inactivated_color_gb">#66E0E4E5</color>
- <color name="key_hint_letter_color_gb">#80000000</color>
- <color name="key_hint_label_color_gb">#E0E0E4E5</color>
- <color name="key_shifted_letter_hint_inactivated_color_gb">#66E0E4E5</color>
- <color name="key_shifted_letter_hint_activated_color_gb">#CCE0E4E5</color>
- <color name="spacebar_text_color_gb">#FFC0C0C0</color>
- <color name="spacebar_text_shadow_color_gb">#80000000</color>
- <color name="gesture_floating_preview_color_gb">#C0000000</color>
<!-- Color resources for IceCreamSandwich theme. Base color = 33B5E5 -->
<!-- android:color/holo_blue_light value is #FF33B5E5 -->
<color name="highlight_color_ics">#FF33B5E5</color>
<color name="typed_word_color_ics">#D833B5E5</color>
<color name="suggested_word_color_ics">#B233B5E5</color>
<color name="highlight_translucent_color_ics">#9933B5E5</color>
+ <color name="key_text_color_holo">@android:color/white</color>
<color name="key_text_shadow_color_holo">@android:color/transparent</color>
<color name="key_text_inactivated_color_holo">#66E0E4E5</color>
<color name="key_hint_letter_color_holo">#80000000</color>
@@ -65,7 +52,4 @@
<!-- TODO: Color which should be included in the theme -->
<color name="emoji_key_background_color">#00000000</color>
<color name="emoji_key_pressed_background_color">#30FFFFFF</color>
-
- <color name="key_text_color_normal_holo">@android:color/white</color>
- <color name="key_text_color_functional_holo">@android:color/white</color>
</resources>
diff --git a/java/res/values/config-auto-correction-thresholds.xml b/java/res/values/config-auto-correction-thresholds.xml
new file mode 100644
index 000000000..7d94a42a4
--- /dev/null
+++ b/java/res/values/config-auto-correction-thresholds.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <!-- The array of auto correction threshold values. -->
+ <string-array name="auto_correction_threshold_values" translatable="false">
+ <!-- Off, When auto correction setting is Off, this value is not used. -->
+ <item>floatMaxValue</item>
+ <!-- Modest : Suggestion whose normalized score is greater than this value
+ will be subject to auto-correction. -->
+ <item>0.185</item>
+ <!-- Aggressive -->
+ <item>0.067</item>
+ <!-- Very Aggressive : Suggestion whose normalized score is greater than this value
+ will be subject to auto-correction. "floatNegativeInfinity" is a special marker
+ string for Float.NEGATIVE_INFINITY -->
+ <item>floatNegativeInfinity</item>
+ </string-array>
+
+ <!-- The index of the auto correction threshold values array. -->
+ <string name="auto_correction_threshold_mode_index_off" translatable="false">0</string>
+ <string name="auto_correction_threshold_mode_index_modest" translatable="false">1</string>
+ <string name="auto_correction_threshold_mode_index_aggressive" translatable="false">2</string>
+ <string name="auto_correction_threshold_mode_index_very_aggressive" translatable="false">3</string>
+
+ <!-- The array of the auto correction threshold settings values. -->
+ <string-array name="auto_correction_threshold_mode_indexes" translatable="false">
+ <item>@string/auto_correction_threshold_mode_index_off</item>
+ <item>@string/auto_correction_threshold_mode_index_modest</item>
+ <item>@string/auto_correction_threshold_mode_index_aggressive</item>
+ <item>@string/auto_correction_threshold_mode_index_very_aggressive</item>
+ </string-array>
+ <!-- The array of the human readable auto correction threshold settings entries. -->
+ <string-array name="auto_correction_threshold_modes" translatable="false">
+ <item>@string/auto_correction_threshold_mode_off</item>
+ <item>@string/auto_correction_threshold_mode_modest</item>
+ <item>@string/auto_correction_threshold_mode_aggressive</item>
+ <item>@string/auto_correction_threshold_mode_very_aggressive</item>
+ </string-array>
+</resources>
diff --git a/java/res/values/config-common.xml b/java/res/values/config-common.xml
new file mode 100644
index 000000000..3fe4b947c
--- /dev/null
+++ b/java/res/values/config-common.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <bool name="config_block_potentially_offensive">true</bool>
+ <!-- Default value for next word prediction: after entering a word and a space only, should we look
+ at input history to suggest a hopefully helpful suggestions for the next word? -->
+ <bool name="config_default_next_word_prediction">true</bool>
+
+ <!-- This configuration must be aligned with {@link KeyboardTheme#DEFAULT_THEME_ID}. -->
+ <string name="config_default_keyboard_theme_id" translatable="false">2</string>
+
+ <integer name="config_delay_update_shift_state">100</integer>
+ <integer name="config_double_space_period_timeout">1100</integer>
+
+ <integer name="config_key_repeat_start_timeout">400</integer>
+ <integer name="config_key_repeat_interval">50</integer>
+
+ <integer name="config_ignore_alt_code_key_timeout">350</integer>
+
+ <integer name="config_key_preview_show_up_duration">17</integer>
+ <integer name="config_key_preview_dismiss_duration">53</integer>
+ <fraction name="config_key_preview_show_up_start_scale">98%</fraction>
+ <fraction name="config_key_preview_dismiss_end_scale">94%</fraction>
+ <!-- TODO: consolidate key preview linger timeout with the above animation parameters. -->
+ <integer name="config_key_preview_linger_timeout">70</integer>
+ <!-- Suppress showing key preview duration after batch input in millisecond -->
+ <integer name="config_suppress_key_preview_after_batch_input_duration">1000</integer>
+
+ <bool name="config_default_vibration_enabled">true</bool>
+ <integer name="config_max_vibration_duration">100</integer>
+
+ <integer name="config_default_longpress_key_timeout">300</integer>
+ <integer name="config_max_longpress_timeout">700</integer>
+ <integer name="config_min_longpress_timeout">100</integer>
+ <integer name="config_longpress_timeout_step">10</integer>
+ <integer name="config_max_more_keys_column">5</integer>
+ <integer name="config_more_keys_keyboard_fadein_anim_time">0</integer>
+ <integer name="config_more_keys_keyboard_fadeout_anim_time">100</integer>
+
+ <!-- Long pressing shift will invoke caps-lock if > 0, never invoke caps-lock if == 0 -->
+ <integer name="config_longpress_shift_lock_timeout">1200</integer>
+
+ <!-- Sliding key input preview parameters -->
+ <dimen name="config_sliding_key_input_preview_width">8.0dp</dimen>
+ <!-- Percentages of sliding key input preview body and shadow, in proportion to the width.
+ A negative value of the shadow ratio disables drawing shadow. -->
+ <!-- TODO: May use the shadow to alleviate rugged trail drawing. -->
+ <integer name="config_sliding_key_input_preview_body_ratio">100</integer>
+ <integer name="config_sliding_key_input_preview_shadow_ratio">-1</integer>
+ <dimen name="config_key_hysteresis_distance_for_sliding_modifier">8.0dp</dimen>
+
+ <integer name="config_language_on_spacebar_final_alpha">128</integer>
+ <dimen name="config_language_on_spacebar_horizontal_margin">1dp</dimen>
+
+ <integer name="config_gesture_floating_preview_text_linger_timeout">200</integer>
+ <integer name="config_gesture_trail_fadeout_start_delay">100</integer>
+ <integer name="config_gesture_trail_fadeout_duration">800</integer>
+ <integer name="config_gesture_trail_update_interval">20</integer>
+ <!-- Static threshold for gesture after fast typing (msec) -->
+ <integer name="config_gesture_static_time_threshold_after_fast_typing">500</integer>
+ <!-- Static threshold for starting gesture detection (keyWidth%/sec) -->
+ <fraction name="config_gesture_detect_fast_move_speed_threshold">150%</fraction>
+ <!-- Dynamic threshold for gesture after fast typing (msec) -->
+ <integer name="config_gesture_dynamic_threshold_decay_duration">450</integer>
+ <!-- Time based threshold values for gesture detection (msec) -->
+ <integer name="config_gesture_dynamic_time_threshold_from">300</integer>
+ <integer name="config_gesture_dynamic_time_threshold_to">20</integer>
+ <!-- Distance based threshold values for gesture detection (keyWidth%/sec) -->
+ <fraction name="config_gesture_dynamic_distance_threshold_from">600%</fraction>
+ <fraction name="config_gesture_dynamic_distance_threshold_to">50%</fraction>
+ <!-- Parameter for gesture sampling (keyWidth%/sec) -->
+ <fraction name="config_gesture_sampling_minimum_distance">16.6666%</fraction>
+ <!-- Parameters for gesture recognition (msec) and (keyWidth%/sec) -->
+ <integer name="config_gesture_recognition_minimum_time">100</integer>
+ <integer name="config_gesture_recognition_update_time">100</integer>
+ <fraction name="config_gesture_recognition_speed_threshold">550%</fraction>
+
+ <integer name="config_keyboard_grid_width">32</integer>
+ <integer name="config_keyboard_grid_height">16</integer>
+ <dimen name="config_touch_noise_threshold_distance">12.6dp</dimen>
+ <integer name="config_touch_noise_threshold_time">40</integer>
+
+ <!-- Common keyboard configuration. -->
+ <fraction name="config_keyboard_left_padding">0%p</fraction>
+ <fraction name="config_keyboard_right_padding">0%p</fraction>
+ <dimen name="config_keyboard_vertical_correction">0.0dp</dimen>
+
+ <!-- Common key top visual configuration. -->
+ <dimen name="config_key_popup_hint_letter_padding">2dp</dimen>
+
+ <!-- Common suggestion strip configuration. -->
+ <integer name="config_suggestions_count_in_strip">3</integer>
+ <fraction name="config_center_suggestion_percentile">36%</fraction>
+ <integer name="config_delay_update_suggestions">100</integer>
+ <integer name="config_delay_update_old_suggestions">300</integer>
+
+ <!-- Common more suggestions configuraion. -->
+ <dimen name="config_more_suggestions_key_horizontal_padding">12dp</dimen>
+ <dimen name="config_more_suggestions_bottom_gap">6dp</dimen>
+ <dimen name="config_more_suggestions_modal_tolerance">32.0dp</dimen>
+ <fraction name="config_more_suggestions_info_ratio">18%</fraction>
+
+ <!-- Common gesture trail parameters -->
+ <!-- Minimum distance between gesture trail sampling points. -->
+ <dimen name="config_gesture_trail_min_sampling_distance">9.6dp</dimen>
+ <!-- Maximum angular threshold between gesture trails interpolation segments in degree. -->
+ <integer name="config_gesture_trail_max_interpolation_angular_threshold">15</integer>
+ <!-- Maximum distance threshold between gesture trails interpolation segments. -->
+ <dimen name="config_gesture_trail_max_interpolation_distance_threshold">16.0dp</dimen>
+ <!-- Maximum number of gesture trail interpolation segments. -->
+ <integer name="config_gesture_trail_max_interpolation_segments">6</integer>
+ <dimen name="config_gesture_trail_start_width">10.0dp</dimen>
+ <dimen name="config_gesture_trail_end_width">2.5dp</dimen>
+ <!-- Percentages of gesture preview taril body and shadow, in proportion to the trail width.
+ A negative value of the shadow ratio disables drawing shadow. -->
+ <!-- TODO: May use the shadow to alleviate rugged trail drawing. -->
+ <integer name="config_gesture_trail_body_ratio">100</integer>
+ <integer name="config_gesture_trail_shadow_ratio">-1</integer>
+
+ <!-- Common configuration of Emoji keyboard -->
+ <dimen name="config_emoji_category_page_id_height">3dp</dimen>
+
+ <!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. -->
+ <dimen name="config_accessibility_edge_slop">8dp</dimen>
+
+ <integer name="config_user_dictionary_max_word_length">48</integer>
+
+ <!-- Personalization configuration -->
+ <!-- -1 means periocical wipe of the personalization dict is disabled. -->
+ <integer name="config_personalization_dict_wipe_interval_in_days">-1</integer>
+</resources>
diff --git a/java/res/color/emoji_tab_label_color_gb.xml b/java/res/values/config-dictionary-pack.xml
index e1d2f715e..d076af452 100644
--- a/java/res/color/emoji_tab_label_color_gb.xml
+++ b/java/res/values/config-dictionary-pack.xml
@@ -18,16 +18,13 @@
*/
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_focused="true"
- android:color="@color/key_text_color_gb" />
- <item
- android:state_pressed="true"
- android:color="@color/key_text_color_gb" />
- <item
- android:state_selected="true"
- android:color="@color/key_text_color_gb" />
- <item
- android:color="@color/key_text_inactivated_color_gb" />
-</selector>
+<!-- Configuration values for Dictionary pack. -->
+<resources>
+ <!-- Settings for the dictionary pack -->
+ <bool name="allow_over_metered">false</bool>
+ <bool name="allow_over_roaming">false</bool>
+ <bool name="dict_downloads_visible_in_download_UI">false</bool>
+ <bool name="metadata_downloads_visible_in_download_UI">false</bool>
+ <bool name="display_notification_for_auto_update">false</bool>
+ <bool name="display_notification_for_user_requested_update">false</bool>
+</resources>
diff --git a/java/res/values/config-per-form-factor.xml b/java/res/values/config-per-form-factor.xml
new file mode 100644
index 000000000..67fc75134
--- /dev/null
+++ b/java/res/values/config-per-form-factor.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- Configuration values for Small Phone. -->
+<resources>
+ <bool name="config_enable_show_key_preview_popup_option">true</bool>
+ <!-- Whether or not Popup on key press is enabled by default -->
+ <bool name="config_default_key_preview_popup">true</bool>
+ <bool name="config_default_sound_enabled">false</bool>
+ <bool name="config_enable_show_voice_key_option">true</bool>
+ <bool name="config_key_selection_by_dragging_finger">true</bool>
+ <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
+ false -->
+ <bool name="config_show_more_keys_keyboard_at_touched_point">false</bool>
+</resources>
diff --git a/java/res/values/config-screen-metrics.xml b/java/res/values/config-screen-metrics.xml
new file mode 100644
index 000000000..99629944a
--- /dev/null
+++ b/java/res/values/config-screen-metrics.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <!-- Must be aligned with {@link Constants#SCREEN_METRICS_SMALL_PHONE}. -->
+ <integer name="config_screen_metrics">0</integer>
+</resources>
diff --git a/java/res/values-hdpi/config.xml b/java/res/values/config-spellchecker-thresholds.xml
index 4cf3562fe..e99ba6621 100644
--- a/java/res/values-hdpi/config.xml
+++ b/java/res/values/config-spellchecker-thresholds.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2011, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -19,12 +19,7 @@
-->
<resources>
- <!-- Screen metrics for logging.
- 0 = "mdpi phone screen"
- 1 = "hdpi phone screen"
- 2 = "mdpi 11 inch tablet screen"
- 3 = "xhdpi phone screen?"
- 4 = ?
- -->
- <integer name="log_screen_metrics">1</integer>
+ <!-- Threshold of the normalized score of the best suggestion for the spell checker to declare
+ a word to be "recommended" -->
+ <string name="spellchecker_recommended_threshold_value" translatable="false">0.11</string>
</resources>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 61779d4b5..45ea48392 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -18,120 +18,71 @@
*/
-->
+<!-- Configuration values for Small Phone Portrait. -->
<resources>
<bool name="config_use_fullscreen_mode">false</bool>
- <bool name="config_enable_show_voice_key_option">true</bool>
- <bool name="config_enable_show_option_of_key_preview_popup">true</bool>
- <!-- TODO: Disable the following configuration for production. -->
- <bool name="config_enable_usability_study_mode_option">true</bool>
- <!-- Whether or not Popup on key press is enabled by default -->
- <bool name="config_default_key_preview_popup">true</bool>
- <!-- Default value for next word prediction: after entering a word and a space only, should we look
- at input history to suggest a hopefully helpful suggestions for the next word? -->
- <bool name="config_default_next_word_prediction">true</bool>
- <bool name="config_default_sound_enabled">false</bool>
- <bool name="config_default_vibration_enabled">true</bool>
- <integer name="config_max_vibration_duration">100</integer> <!-- milliseconds -->
- <integer name="config_delay_update_suggestions">100</integer>
- <integer name="config_delay_update_old_suggestions">300</integer>
- <integer name="config_delay_update_shift_state">100</integer>
- <integer name="config_language_on_spacebar_final_alpha">128</integer>
- <integer name="config_more_keys_keyboard_fadein_anim_time">0</integer>
- <integer name="config_more_keys_keyboard_fadeout_anim_time">100</integer>
- <integer name="config_keyboard_grid_width">32</integer>
- <integer name="config_keyboard_grid_height">16</integer>
- <integer name="config_double_space_period_timeout">1100</integer>
- <!-- This configuration is an index of {@link KeyboardSwitcher#KEYBOARD_THEMES[]}. -->
- <string name="config_default_keyboard_theme_index" translatable="false">2</string>
- <integer name="config_max_more_keys_column">5</integer>
- <!--
- Configuration for MainKeyboardView
- -->
<dimen name="config_key_hysteresis_distance">8.0dp</dimen>
- <dimen name="config_key_hysteresis_distance_for_sliding_modifier">8.0dp</dimen>
- <integer name="config_touch_noise_threshold_time">40</integer>
- <dimen name="config_touch_noise_threshold_distance">12.6dp</dimen>
- <integer name="config_key_preview_linger_timeout">70</integer>
- <bool name="config_sliding_key_input_enabled">true</bool>
- <!-- Sliding key input preview parameters -->
- <dimen name="config_sliding_key_input_preview_width">8.0dp</dimen>
- <!-- Percentages of sliding key input preview body and shadow, in proportion to the width.
- A negative value of the shadow ratio disables drawing shadow. -->
- <!-- TODO: May use the shadow to alleviate rugged trail drawing. -->
- <integer name="config_sliding_key_input_preview_body_ratio">100</integer>
- <integer name="config_sliding_key_input_preview_shadow_ratio">-1</integer>
- <integer name="config_key_repeat_start_timeout">400</integer>
- <integer name="config_key_repeat_interval">50</integer>
- <integer name="config_default_longpress_key_timeout">300</integer> <!-- milliseconds -->
- <integer name="config_longpress_timeout_step">10</integer> <!-- milliseconds -->
- <integer name="config_min_longpress_timeout">100</integer> <!-- milliseconds -->
- <integer name="config_max_longpress_timeout">700</integer> <!-- milliseconds -->
- <!-- Long pressing shift will invoke caps-lock if > 0, never invoke caps-lock if == 0 -->
- <integer name="config_longpress_shift_lock_timeout">1200</integer> <!-- milliseconds -->
- <integer name="config_ignore_alt_code_key_timeout">350</integer> <!-- milliseconds -->
- <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
- false -->
- <bool name="config_show_more_keys_keyboard_at_touched_point">false</bool>
- <bool name="config_block_potentially_offensive">true</bool>
- <integer name="config_gesture_floating_preview_text_linger_timeout">200</integer>
- <integer name="config_gesture_trail_fadeout_start_delay">100</integer>
- <integer name="config_gesture_trail_fadeout_duration">800</integer>
- <integer name="config_gesture_trail_update_interval">20</integer>
- <!-- Static threshold for gesture after fast typing (msec) -->
- <integer name="config_gesture_static_time_threshold_after_fast_typing">500</integer>
- <!-- Static threshold for starting gesture detection (keyWidth%/sec) -->
- <fraction name="config_gesture_detect_fast_move_speed_threshold">150%</fraction>
- <!-- Dynamic threshold for gesture after fast typing (msec) -->
- <integer name="config_gesture_dynamic_threshold_decay_duration">450</integer>
- <!-- Time based threshold values for gesture detection (msec) -->
- <integer name="config_gesture_dynamic_time_threshold_from">300</integer>
- <integer name="config_gesture_dynamic_time_threshold_to">20</integer>
- <!-- Distance based threshold values for gesture detection (keyWidth%/sec) -->
- <fraction name="config_gesture_dynamic_distance_threshold_from">600%</fraction>
- <fraction name="config_gesture_dynamic_distance_threshold_to">50%</fraction>
- <!-- Parameter for gesture sampling (keyWidth%/sec) -->
- <fraction name="config_gesture_sampling_minimum_distance">16.6666%</fraction>
- <!-- Parameters for gesture recognition (msec) and (keyWidth%/sec) -->
- <integer name="config_gesture_recognition_minimum_time">100</integer>
- <integer name="config_gesture_recognition_update_time">100</integer>
- <fraction name="config_gesture_recognition_speed_threshold">550%</fraction>
- <!-- Suppress showing key preview duration after batch input in millisecond -->
- <integer name="config_suppress_key_preview_after_batch_input_duration">1000</integer>
- <!--
- Configuration for auto correction
- -->
- <string-array name="auto_correction_threshold_values" translatable="false">
- <!-- Off, When auto correction setting is Off, this value is not used. -->
- <item>floatMaxValue</item>
- <!-- Modest : Suggestion whose normalized score is greater than this value
- will be subject to auto-correction. -->
- <item>0.185</item>
- <!-- Aggressive -->
- <item>0.067</item>
- <!-- Very Aggressive : Suggestion whose normalized score is greater than this value
- will be subject to auto-correction. "floatNegativeInfinity" is a special marker
- string for Float.NEGATIVE_INFINITY -->
- <item>floatNegativeInfinity</item>
- </string-array>
- <!-- Threshold of the normalized score of the best suggestion for the spell checker to declare
- a word to be "recommended" -->
- <string name="spellchecker_recommended_threshold_value" translatable="false">0.11</string>
- <!-- Screen metrics for logging.
- 0 = "mdpi phone screen"
- 1 = "hdpi phone screen"
- 2 = "mdpi 11 inch tablet screen"
- 3 = "xhdpi phone screen?"
- 4 = ?
- -->
- <integer name="log_screen_metrics">0</integer>
- <!-- Settings for the dictionary pack -->
- <bool name="allow_over_metered">false</bool>
- <bool name="allow_over_roaming">false</bool>
- <bool name="dict_downloads_visible_in_download_UI">false</bool>
- <bool name="metadata_downloads_visible_in_download_UI">false</bool>
- <bool name="display_notification_for_auto_update">false</bool>
- <bool name="display_notification_for_user_requested_update">false</bool>
+ <!-- Preferable keyboard height in absolute scale: 1.285in -->
+ <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
+ <dimen name="config_default_keyboard_height">205.6dp</dimen>
+ <fraction name="config_max_keyboard_height">46%p</fraction>
+ <fraction name="config_min_keyboard_height">-61.8%p</fraction>
+ <dimen name="config_more_keys_keyboard_key_height">52.8dp</dimen>
+ <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+ <!-- config_more_keys_keyboard_key_height x 1.2 -->
+ <dimen name="config_more_keys_keyboard_slide_allowance">63.36dp</dimen>
+ <dimen name="config_more_keys_keyboard_key_horizontal_padding">8dp</dimen>
+
+ <fraction name="config_keyboard_top_padding_holo">2.335%p</fraction>
+ <fraction name="config_keyboard_bottom_padding_holo">4.669%p</fraction>
+ <fraction name="config_key_vertical_gap_holo">6.127%p</fraction>
+ <fraction name="config_key_horizontal_gap_holo">1.739%p</fraction>
+ <!-- config_more_keys_keyboard_key_height x -0.5 -->
+ <dimen name="config_more_keys_keyboard_vertical_correction_holo">-26.4dp</dimen>
+ <dimen name="config_key_preview_offset_holo">8.0dp</dimen>
+
+ <dimen name="config_key_preview_height">80dp</dimen>
+ <fraction name="config_key_preview_text_ratio">82%</fraction>
+ <fraction name="config_key_letter_ratio">55%</fraction>
+ <fraction name="config_key_large_letter_ratio">65%</fraction>
+ <fraction name="config_key_label_ratio">34%</fraction>
+ <fraction name="config_key_large_label_ratio">40%</fraction>
+ <fraction name="config_key_hint_letter_ratio">25%</fraction>
+ <fraction name="config_key_hint_label_ratio">44%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio">35%</fraction>
+ <fraction name="config_language_on_spacebar_text_ratio">33.735%</fraction>
+ <dimen name="config_key_label_horizontal_padding">4dp</dimen>
+ <dimen name="config_key_hint_letter_padding">1dp</dimen>
+ <dimen name="config_key_shifted_letter_hint_padding">2dp</dimen>
+
+ <!-- For 5-row keyboard -->
+ <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
+ <fraction name="config_key_letter_ratio_5row">64%</fraction>
+ <fraction name="config_key_shifted_letter_hint_ratio_5row">41%</fraction>
+
+ <dimen name="config_suggestions_strip_height">40dp</dimen>
+ <dimen name="config_more_suggestions_row_height">40dp</dimen>
+ <integer name="config_max_more_suggestions_row">6</integer>
+ <fraction name="config_min_more_suggestions_width">90%</fraction>
+ <dimen name="config_suggestions_strip_horizontal_padding">0dp</dimen>
+ <dimen name="config_suggestion_min_width">44dp</dimen>
+ <dimen name="config_suggestion_text_horizontal_padding">6dp</dimen>
+ <dimen name="config_suggestion_text_size">18dp</dimen>
+ <dimen name="config_more_suggestions_hint_text_size">27dp</dimen>
+
+ <!-- Gesture floating preview text parameters -->
+ <dimen name="config_gesture_floating_preview_text_size">24dp</dimen>
+ <dimen name="config_gesture_floating_preview_text_offset">73dp</dimen>
+ <dimen name="config_gesture_floating_preview_horizontal_padding">24dp</dimen>
+ <dimen name="config_gesture_floating_preview_vertical_padding">16dp</dimen>
+ <dimen name="config_gesture_floating_preview_round_radius">2dp</dimen>
+
+ <!-- Emoji keyboard -->
+ <fraction name="config_emoji_keyboard_key_width">14.2857%p</fraction>
+ <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
+ <fraction name="config_emoji_keyboard_key_letter_size">68%p</fraction>
+ <integer name="config_emoji_keyboard_max_page_key_count">21</integer>
</resources>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
deleted file mode 100644
index 4588b10eb..000000000
--- a/java/res/values/dimens.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
- <!-- Preferable keyboard height in absolute scale: 1.285in -->
- <!-- This keyboardHeight value should match with keyboard-heights.xml -->
- <dimen name="keyboardHeight">205.6dp</dimen>
- <fraction name="maxKeyboardHeight">46%p</fraction>
- <fraction name="minKeyboardHeight">-61.8%p</fraction>
-
- <dimen name="popup_key_height">52.8dp</dimen>
-
- <dimen name="more_keys_keyboard_key_horizontal_padding">8dp</dimen>
-
- <fraction name="keyboard_left_padding">0%p</fraction>
- <fraction name="keyboard_right_padding">0%p</fraction>
-
- <fraction name="keyboard_top_padding_gb">1.556%p</fraction>
- <fraction name="keyboard_bottom_padding_gb">4.669%p</fraction>
- <fraction name="key_bottom_gap_gb">6.495%p</fraction>
- <fraction name="key_horizontal_gap_gb">1.971%p</fraction>
-
- <fraction name="keyboard_top_padding_holo">2.335%p</fraction>
- <fraction name="keyboard_bottom_padding_holo">4.669%p</fraction>
- <fraction name="key_bottom_gap_holo">6.127%p</fraction>
- <fraction name="key_horizontal_gap_holo">1.739%p</fraction>
-
- <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- popup_key_height x 1.2 -->
- <dimen name="more_keys_keyboard_slide_allowance">63.36dp</dimen>
- <!-- popup_key_height x -1.0 -->
- <dimen name="more_keys_keyboard_vertical_correction_gb">-52.8dp</dimen>
- <dimen name="keyboard_vertical_correction">0.0dp</dimen>
-
- <fraction name="key_letter_ratio">55%</fraction>
- <fraction name="key_large_letter_ratio">65%</fraction>
- <fraction name="key_label_ratio">34%</fraction>
- <fraction name="key_large_label_ratio">40%</fraction>
- <fraction name="key_hint_letter_ratio">25%</fraction>
- <fraction name="key_hint_label_ratio">44%</fraction>
- <fraction name="key_uppercase_letter_ratio">35%</fraction>
- <fraction name="key_preview_text_ratio">82%</fraction>
- <fraction name="spacebar_text_ratio">33.735%</fraction>
- <dimen name="key_preview_height">80dp</dimen>
- <dimen name="key_preview_offset_gb">-8.0dp</dimen>
-
- <dimen name="key_label_horizontal_padding">4dp</dimen>
- <dimen name="key_hint_letter_padding">1dp</dimen>
- <dimen name="key_popup_hint_letter_padding">2dp</dimen>
- <dimen name="key_uppercase_letter_padding">2dp</dimen>
-
- <!-- For 5-row keyboard -->
- <fraction name="key_bottom_gap_5row">3.20%p</fraction>
- <fraction name="key_letter_ratio_5row">64%</fraction>
- <fraction name="key_uppercase_letter_ratio_5row">41%</fraction>
-
- <dimen name="key_preview_offset_holo">8.0dp</dimen>
- <!-- popup_key_height x -0.5 -->
- <dimen name="more_keys_keyboard_vertical_correction_holo">-26.4dp</dimen>
-
- <dimen name="suggestions_strip_height">40dp</dimen>
- <dimen name="more_suggestions_key_horizontal_padding">12dp</dimen>
- <dimen name="more_suggestions_row_height">40dp</dimen>
- <dimen name="more_suggestions_bottom_gap">6dp</dimen>
- <dimen name="more_suggestions_modal_tolerance">32.0dp</dimen>
- <dimen name="more_suggestions_slide_allowance">16.0dp</dimen>
- <integer name="max_more_suggestions_row">6</integer>
- <fraction name="min_more_suggestions_width">90%</fraction>
- <fraction name="more_suggestions_info_ratio">18%</fraction>
- <dimen name="suggestions_strip_padding">0dp</dimen>
- <dimen name="suggestion_min_width">44dp</dimen>
- <dimen name="suggestion_padding">6dp</dimen>
- <dimen name="suggestion_text_size">18dp</dimen>
- <dimen name="more_suggestions_hint_text_size">27dp</dimen>
- <integer name="suggestions_count_in_strip">3</integer>
- <fraction name="center_suggestion_percentile">36%</fraction>
-
- <!-- Gesture trail parameters -->
- <!-- Minimum distance between gesture trail sampling points. -->
- <dimen name="gesture_trail_min_sampling_distance">9.6dp</dimen>
- <!-- Maximum angular threshold between gesture trails interpolation segments in degree. -->
- <integer name="gesture_trail_max_interpolation_angular_threshold">15</integer>
- <!-- Maximum distance threshold between gesture trails interpolation segments. -->
- <dimen name="gesture_trail_max_interpolation_distance_threshold">16.0dp</dimen>
- <!-- Maximum number of gesture trail interpolation segments. -->
- <integer name="gesture_trail_max_interpolation_segments">6</integer>
- <dimen name="gesture_trail_start_width">10.0dp</dimen>
- <dimen name="gesture_trail_end_width">2.5dp</dimen>
- <!-- Percentages of gesture preview taril body and shadow, in proportion to the trail width.
- A negative value of the shadow ratio disables drawing shadow. -->
- <!-- TODO: May use the shadow to alleviate rugged trail drawing. -->
- <integer name="gesture_trail_body_ratio">100</integer>
- <integer name="gesture_trail_shadow_ratio">-1</integer>
- <!-- Gesture floating preview text parameters -->
- <dimen name="gesture_floating_preview_text_size">24dp</dimen>
- <dimen name="gesture_floating_preview_text_offset">73dp</dimen>
- <dimen name="gesture_floating_preview_horizontal_padding">24dp</dimen>
- <dimen name="gesture_floating_preview_vertical_padding">16dp</dimen>
- <dimen name="gesture_floating_preview_round_radius">2dp</dimen>
-
- <!-- Emoji keyboard -->
- <fraction name="emoji_keyboard_key_width">14.2857%p</fraction>
- <fraction name="emoji_keyboard_row_height">33%p</fraction>
- <fraction name="emoji_keyboard_key_letter_size">68%p</fraction>
- <integer name="emoji_keyboard_max_key_count">21</integer>
- <dimen name="emoji_category_page_id_height">3dp</dimen>
-
- <!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. -->
- <dimen name="accessibility_edge_slop">8dp</dimen>
-
- <integer name="user_dictionary_max_word_length" translatable="false">48</integer>
-
- <dimen name="language_on_spacebar_horizontal_margin">1dp</dimen>
-
-</resources>
diff --git a/java/res/values/donottranslate-config-important-notice.xml b/java/res/values/donottranslate-config-important-notice.xml
new file mode 100644
index 000000000..7c6527c28
--- /dev/null
+++ b/java/res/values/donottranslate-config-important-notice.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <!-- The array of the text of the important notices displayed on the suggestion strip. -->
+ <string-array name="important_notice_title_array" translatable="false">
+ <!-- empty -->
+ </string-array>
+ <!-- The array of the contents of the important notices. -->
+ <string-array name="important_notice_contents_array" translatable="false">
+ <!-- empty -->
+ </string-array>
+</resources>
diff --git a/java/res/values/donottranslate-config-spacing-and-punctuations.xml b/java/res/values/donottranslate-config-spacing-and-punctuations.xml
new file mode 100644
index 000000000..1be5cf888
--- /dev/null
+++ b/java/res/values/donottranslate-config-spacing-and-punctuations.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- TODO: these settings depend on the language. They should be put either in the dictionary
+ header, or in the subtype maybe? -->
+ <!-- Symbols that are suggested between words -->
+ <string name="suggested_punctuations">!,?,\\,,:,;,\",(,),\',-,/,@,_</string>
+ <!-- Symbols that are normally preceded by a space (used to add an auto-space before these) -->
+ <string name="symbols_preceded_by_space">([{&amp;</string>
+ <!-- Symbols that are normally followed by a space (used to add an auto-space after these) -->
+ <string name="symbols_followed_by_space">.,;:!?)]}&amp;</string>
+ <!-- Symbols that separate words -->
+ <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
+ <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
+ <!-- Word connectors -->
+ <string name="symbols_word_connectors">\'-</string>
+ <!-- The sentence separator code point, for capitalization -->
+ <!-- U+002E: "." FULL STOP ; 2Eh = 46d -->
+ <integer name="sentence_separator">46</integer>
+ <!-- Whether this language uses spaces between words -->
+ <bool name="current_language_has_spaces">true</bool>
+</resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index af5ec061b..9a610a0d0 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -18,25 +18,6 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- TODO: these settings depend on the language. They should be put either in the dictionary
- header, or in the subtype maybe? -->
- <!-- Symbols that are suggested between words -->
- <string name="suggested_punctuations">!,?,\\,,:,;,\",(,),\',-,/,@,_</string>
- <!-- Symbols that are normally preceded by a space (used to add an auto-space before these) -->
- <string name="symbols_preceded_by_space">([{&amp;</string>
- <!-- Symbols that are normally followed by a space (used to add an auto-space after these) -->
- <string name="symbols_followed_by_space">.,;:!?)]}&amp;</string>
- <!-- Symbols that separate words -->
- <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
- <string name="symbols_word_separators">"&#x0009;&#x0020;\n"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
- <!-- Word connectors -->
- <string name="symbols_word_connectors">\'-</string>
- <!-- The sentence separator code point, for capitalization -->
- <!-- U+002E: "." FULL STOP ; 2Eh = 46d -->
- <integer name="sentence_separator">46</integer>
- <!-- Whether this language uses spaces between words -->
- <bool name="current_language_has_spaces">true</bool>
-
<!-- Always show the suggestion strip -->
<string name="prefs_suggestion_visibility_show_value">0</string>
<!-- Show the suggestion strip only on portrait mode -->
@@ -57,74 +38,22 @@
<item>@string/prefs_suggestion_visibility_hide_name</item>
</string-array>
- <string name="auto_correction_threshold_mode_index_off">0</string>
- <string name="auto_correction_threshold_mode_index_modest">1</string>
- <string name="auto_correction_threshold_mode_index_aggressive">2</string>
- <string name="auto_correction_threshold_mode_index_very_aggressive">3</string>
- <string-array name="auto_correction_threshold_mode_indexes">
- <item>@string/auto_correction_threshold_mode_index_off</item>
- <item>@string/auto_correction_threshold_mode_index_modest</item>
- <item>@string/auto_correction_threshold_mode_index_aggressive</item>
- <item>@string/auto_correction_threshold_mode_index_very_aggressive</item>
- </string-array>
- <string-array name="auto_correction_threshold_modes">
- <item>@string/auto_correction_threshold_mode_off</item>
- <item>@string/auto_correction_threshold_mode_modest</item>
- <item>@string/auto_correction_threshold_mode_aggressive</item>
- <item>@string/auto_correction_threshold_mode_very_aggressive</item>
- </string-array>
-
+ <!-- For backward compatibility.
+ See {@link SettingsValues#needsToShowVoiceInputKey(SharedPreferences,Resources)} -->
<string name="voice_mode_main">0</string>
- <string name="voice_mode_symbols">1</string>
- <string name="voice_mode_off">2</string>
- <string-array name="voice_input_modes_values">
- <item>@string/voice_mode_main</item>
- <item>@string/voice_mode_symbols</item>
- <item>@string/voice_mode_off</item>
- </string-array>
- <!-- Array of Voice Input modes -->
- <string-array name="voice_input_modes">
- <item>@string/voice_input_modes_main_keyboard</item>
- <item>@string/voice_input_modes_symbols_keyboard</item>
- <item>@string/voice_input_modes_off</item>
- </string-array>
- <!-- Array of Voice Input modes summary -->
- <string-array name="voice_input_modes_summary">
- <item>@string/voice_input_modes_summary_main_keyboard</item>
- <item>@string/voice_input_modes_summary_symbols_keyboard</item>
- <item>@string/voice_input_modes_summary_off</item>
- </string-array>
<!-- Title for Latin keyboard debug settings activity / dialog -->
<string name="english_ime_debug_settings">Android keyboard Debug settings</string>
<string name="prefs_debug_mode">Debug Mode</string>
<string name="prefs_force_non_distinct_multitouch">Force non-distinct multitouch</string>
- <!-- Keyboard theme names -->
- <string name="layout_gingerbread">Gingerbread</string>
- <string name="layout_ics">IceCreamSandwich</string>
- <string name="layout_klp">KeyLimePie</string>
-
- <!-- For keyboard theme switcher dialog -->
- <string-array name="keyboard_layout_modes">
- <item>@string/layout_ics</item>
- <item>@string/layout_gingerbread</item>
- <item>@string/layout_klp</item>
- </string-array>
- <!-- An element must be an index of {@link KeyboardSwitcher#KEYBOARD_THEMES[]}. -->
- <string-array name="keyboard_layout_modes_values">
- <item>0</item>
- <item>1</item>
- <item>2</item>
- </string-array>
-
<!-- For keyboard color scheme option dialog. -->
- <string-array name="keyboard_color_schemes">
+ <string-array name="keyboard_theme_names">
<item>@string/keyboard_color_scheme_white</item>
<item>@string/keyboard_color_scheme_blue</item>
</string-array>
- <!-- An element must be an index of {@link KeyboardSwitcher#KEYBOARD_THEMES[]}. -->
- <string-array name="keyboard_color_schemes_values">
+ <!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. -->
+ <string-array name="keyboard_theme_ids">
<item>2</item>
<item>0</item>
</string-array>
diff --git a/java/res/values/keyboard-heights.xml b/java/res/values/keyboard-heights.xml
index c651a89b3..12dd51d9d 100644
--- a/java/res/values/keyboard-heights.xml
+++ b/java/res/values/keyboard-heights.xml
@@ -33,7 +33,5 @@
<!-- Preferable keyboard height in absolute scale: 48.0mm -->
<!-- Xoom -->
<item>HARDWARE=stingray,283.1337</item>
- <!-- Default value for unknown device: empty string -->
- <item>,</item>
</string-array>
</resources>
diff --git a/java/res/values/keyboard-icons-holo.xml b/java/res/values/keyboard-icons-holo.xml
index b49e1d10b..4c888d570 100644
--- a/java/res/values/keyboard-icons-holo.xml
+++ b/java/res/values/keyboard-icons-holo.xml
@@ -32,7 +32,6 @@
<item name="iconSearchKey">@drawable/sym_keyboard_search_holo_dark</item>
<item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item>
<item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo_dark</item>
- <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo_dark</item>
<item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item>
<item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo_dark</item>
<item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo_dark</item>
diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml
index cde4e4447..032b5fd91 100644
--- a/java/res/values/keypress-vibration-durations.xml
+++ b/java/res/values/keypress-vibration-durations.xml
@@ -59,7 +59,5 @@
<item>MODEL=XT1035:MANUFACTURER=motorola,18</item>
<!-- Sony Xperia Z, Z Ultra -->
<item>MODEL=C6603|C6806:MANUFACTURER=Sony,35</item>
- <!-- Default value for unknown device. The negative value means system default. -->
- <item>,-1</item>
</string-array>
</resources>
diff --git a/java/res/values/keypress-volumes.xml b/java/res/values/keypress-volumes.xml
index d359055c2..074581d00 100644
--- a/java/res/values/keypress-volumes.xml
+++ b/java/res/values/keypress-volumes.xml
@@ -26,7 +26,5 @@
<item>HARDWARE=grouper,0.3f</item>
<item>HARDWARE=mako,0.3f</item>
<item>HARDWARE=manta,0.2f</item>
- <!-- Default value for unknown device. The negative value means system default. -->
- <item>,-1.0f</item>
</string-array>
</resources>
diff --git a/java/res/values/phantom-sudden-move-event-device-list.xml b/java/res/values/phantom-sudden-move-event-device-list.xml
index 53002b31e..4f91cd389 100644
--- a/java/res/values/phantom-sudden-move-event-device-list.xml
+++ b/java/res/values/phantom-sudden-move-event-device-list.xml
@@ -23,7 +23,5 @@
See {@link com.android.inputmethod.keyboard.PointerTracker}. -->
<!-- Xoom -->
<item>HARDWARE=stingray,true</item>
- <!-- Default value for unknown device -->
- <item>,false</item>
</string-array>
</resources>
diff --git a/java/res/values/platform-theme.xml b/java/res/values/platform-theme.xml
new file mode 100644
index 000000000..8e131a2b0
--- /dev/null
+++ b/java/res/values/platform-theme.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style name="platformActivityTheme" parent="@android:style/Theme.Holo" />
+ <style name="platformDialogTheme" parent="@android:style/Theme.Holo.Dialog" />
+</resources>
diff --git a/java/res/values/strings-config-important-notice.xml b/java/res/values/strings-config-important-notice.xml
new file mode 100644
index 000000000..aa3cd109c
--- /dev/null
+++ b/java/res/values/strings-config-important-notice.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <integer name="config_important_notice_version">0</integer>
+ <!-- Description for option enabling the use by the keyboards of sent/received messages, e-mail and typing history to improve suggestion accuracy [CHAR LIMIT=68] -->
+ <string name="use_personalized_dicts_summary">Learn from your communications and typed data to improve suggestions</string>
+</resources>
diff --git a/java/res/values/strings-talkback-descriptions.xml b/java/res/values/strings-talkback-descriptions.xml
new file mode 100644
index 000000000..4ffca10c8
--- /dev/null
+++ b/java/res/values/strings-talkback-descriptions.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Spoken description to let the user know that when typing in a password, they can plug in a headset in to hear spoken descriptions of the keys they type. [CHAR LIMIT=NONE] -->
+ <string name="spoken_use_headphones">Plug in a headset to hear password keys spoken aloud.</string>
+
+ <!-- Spoken description for the currently entered text -->
+ <string name="spoken_current_text_is">Current text is "%s"</string>
+ <!-- Spoken description when there is no text entered -->
+ <string name="spoken_no_text_entered">No text entered</string>
+
+ <!-- Spoken description to let the user know what auto-correction will be performed when a key is pressed. An auto-correction replaces a single word with one or more words. -->
+ <string name="spoken_auto_correct"><xliff:g id="KEY_NAME" example="Space">%1$s</xliff:g> corrects <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> to <xliff:g id="CORRECTED_WORD">%3$s</xliff:g></string>
+ <!-- Spoken description used during obscured (e.g. password) entry to let the user know that auto-correction will be performed when a key is pressed. -->
+ <string name="spoken_auto_correct_obscured"><xliff:g id="KEY_NAME" example="Space">%1$s</xliff:g> performs auto-correction</string>
+
+ <!-- Spoken description for unknown keyboard keys. -->
+ <string name="spoken_description_unknown">Key code %d</string>
+ <!-- Spoken description for the "Shift" keyboard key when "Shift" is off. -->
+ <string name="spoken_description_shift">Shift</string>
+ <!-- Spoken description for the "Shift" keyboard key when "Shift" is on. -->
+ <string name="spoken_description_shift_shifted">Shift on (tap to disable)</string>
+ <!-- Spoken description for the "Shift" keyboard key when "Caps lock" is on. -->
+ <string name="spoken_description_caps_lock">Caps lock on (tap to disable)</string>
+ <!-- Spoken description for the "Delete" keyboard key. -->
+ <string name="spoken_description_delete">Delete</string>
+ <!-- Spoken description for the "To Symbol" keyboard key. -->
+ <string name="spoken_description_to_symbol">Symbols</string>
+ <!-- Spoken description for the "To Alpha" keyboard key. -->
+ <string name="spoken_description_to_alpha">Letters</string>
+ <!-- Spoken description for the "To Numbers" keyboard key. -->
+ <string name="spoken_description_to_numeric">Numbers</string>
+ <!-- Spoken description for the "Settings" keyboard key. -->
+ <string name="spoken_description_settings">Settings</string>
+ <!-- Spoken description for the "Tab" keyboard key. -->
+ <string name="spoken_description_tab">Tab</string>
+ <!-- Spoken description for the "Space" keyboard key. -->
+ <string name="spoken_description_space">Space</string>
+ <!-- Spoken description for the "Mic" keyboard key. -->
+ <string name="spoken_description_mic">Voice input</string>
+ <!-- Spoken description for the "Emoji" keyboard key. -->
+ <string name="spoken_description_emoji">Emoji</string>
+ <!-- Spoken description for the "Return" keyboard key. -->
+ <string name="spoken_description_return">Return</string>
+ <!-- Spoken description for the "Search" keyboard key. -->
+ <string name="spoken_description_search">Search</string>
+ <!-- Spoken description for the "U+2022" (BULLET) keyboard key. -->
+ <string name="spoken_description_dot">Dot</string>
+ <!-- Spoken description for the "Switch language" keyboard key. -->
+ <string name="spoken_description_language_switch">Switch language</string>
+ <!-- Spoken description for the "Next" action keyboard key. -->
+ <string name="spoken_description_action_next">Next</string>
+ <!-- Spoken description for the "Previous" action keyboard key. -->
+ <string name="spoken_description_action_previous">Previous</string>
+
+ <!-- Spoken feedback after turning "Shift" mode on. -->
+ <string name="spoken_description_shiftmode_on">Shift enabled</string>
+ <!-- Spoken feedback after turning "Caps lock" mode on. -->
+ <string name="spoken_description_shiftmode_locked">Caps lock enabled</string>
+ <!-- Spoken feedback after changing to the symbols keyboard. -->
+ <string name="spoken_description_mode_symbol">Symbols mode</string>
+ <!-- Spoken feedback after changing to the symbols shift keyboard. -->
+ <string name="spoken_description_mode_symbol_shift">Symbols shift mode</string>
+ <!-- Spoken feedback after changing to the alphanumeric keyboard. -->
+ <string name="spoken_description_mode_alpha">Letters mode</string>
+ <!-- Spoken feedback after changing to the phone dialer keyboard. -->
+ <string name="spoken_description_mode_phone">Phone mode</string>
+ <!-- Spoken feedback after changing to the shifted phone dialer (symbols) keyboard. -->
+ <string name="spoken_description_mode_phone_shift">Phone symbols mode</string>
+
+ <!-- Spoken feedback when the keyboard is hidden. -->
+ <string name="announce_keyboard_hidden">Keyboard hidden</string>
+ <!-- Spoken feedback when the keyboard mode changes. -->
+ <string name="announce_keyboard_mode">Showing <xliff:g id="KEYBOARD_MODE" example="email">%s</xliff:g> keyboard</string>
+ <!-- Description of the keyboard mode for entering dates. -->
+ <string name="keyboard_mode_date">date</string>
+ <!-- Description of the keyboard mode for entering dates and times. -->
+ <string name="keyboard_mode_date_time">date and time</string>
+ <!-- Description of the keyboard mode for entering email addresses. -->
+ <string name="keyboard_mode_email">email</string>
+ <!-- Description of the keyboard mode for entering text messages. -->
+ <string name="keyboard_mode_im">messaging</string>
+ <!-- Description of the keyboard mode for entering numbers. -->
+ <string name="keyboard_mode_number">number</string>
+ <!-- Description of the keyboard mode for entering phone numbers. -->
+ <string name="keyboard_mode_phone">phone</string>
+ <!-- Description of the keyboard mode for entering generic text. -->
+ <string name="keyboard_mode_text">text</string>
+ <!-- Description of the keyboard mode for entering times. -->
+ <string name="keyboard_mode_time">time</string>
+ <!-- Description of the keyboard mode for entering URLs. -->
+ <string name="keyboard_mode_url">URL</string>
+
+ <!-- Description of the emoji category icon of Recents. -->
+ <string name="spoken_descrption_emoji_category_recents">Recents</string>
+ <!-- Description of the emoji category icon of People. -->
+ <string name="spoken_descrption_emoji_category_people">People</string>
+ <!-- Description of the emoji category icon of Objects. -->
+ <string name="spoken_descrption_emoji_category_objects">Objects</string>
+ <!-- Description of the emoji category icon of Nature. -->
+ <string name="spoken_descrption_emoji_category_nature">Nature</string>
+ <!-- Description of the emoji category icon of Places. -->
+ <string name="spoken_descrption_emoji_category_places">Places</string>
+ <!-- Description of the emoji category icon of Symbols. -->
+ <string name="spoken_descrption_emoji_category_symbols">Symbols</string>
+ <!-- Description of the emoji category icon of Emoticons. -->
+ <string name="spoken_descrption_emoji_category_emoticons">Emoticons</string>
+</resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 11b3ea3af..9f93055e2 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -78,7 +78,7 @@
<string name="key_preview_popup_dismiss_default_delay">Default</string>
<!-- Units abbreviation for the duration (milliseconds) [CHAR LIMIT=10] -->
- <string name="abbreviation_unit_milliseconds"><xliff:g id="milliseconds">%s</xliff:g>ms</string>
+ <string name="abbreviation_unit_milliseconds"><xliff:g id="MILLISECONDS">%s</xliff:g>ms</string>
<!-- The text that represents the current settings value is the system default [CHAR LIMIT=25] -->
<string name="settings_system_default">System default</string>
@@ -87,6 +87,9 @@
<!-- Description for option enabling or disabling the use of names of people in Contacts for suggestion and correction [CHAR LIMIT=65] -->
<string name="use_contacts_dict_summary">Use names from Contacts for suggestions and corrections</string>
+ <!-- Option name for enabling the use by the keyboards of sent/received messages, e-mail and typing history to improve suggestion accuracy [CHAR LIMIT=25] -->
+ <string name="use_personalized_dicts">Personalized suggestions</string>
+
<!-- Option name for enabling or disabling the double-space period feature that lets double tap on spacebar insert a period followed by a space [CHAR LIMIT=30] -->
<string name="use_double_space_period">Double-space period</string>
<!-- Description for option enabling or disabling the double-space period feature that lets double tap on spacebar insert a period followed by a space [CHAR LIMIT=65] -->
@@ -147,118 +150,15 @@
<string name="gesture_floating_preview_text">Dynamic floating preview</string>
<!-- Description for "gesture_floating_preview_text" option. The user can see a suggested word floating under the moving finger during a gesture input. [CHAR LIMIT=65]-->
<string name="gesture_floating_preview_text_summary">See the suggested word while gesturing</string>
-
- <!-- Indicates that a word has been added to the dictionary -->
- <string name="added_word"><xliff:g id="word">%s</xliff:g> : Saved</string>
-
- <!-- Spoken description to let the user know that when typing in a password, they can plug in a headset in to hear spoken descriptions of the keys they type. [CHAR LIMIT=NONE] -->
- <string name="spoken_use_headphones">Plug in a headset to hear password keys spoken aloud.</string>
-
- <!-- Spoken description for the currently entered text -->
- <string name="spoken_current_text_is">Current text is "%s"</string>
- <!-- Spoken description when there is no text entered -->
- <string name="spoken_no_text_entered">No text entered</string>
-
- <!-- Spoken description to let the user know what auto-correction will be performed when a key is pressed. An auto-correction replaces a single word with one or more words. -->
- <string name="spoken_auto_correct"><xliff:g id="key" example="Space">%1$s</xliff:g> corrects <xliff:g id="original_word">%2$s</xliff:g> to <xliff:g id="corrected">%3$s</xliff:g></string>
- <!-- Spoken description used during obscured (e.g. password) entry to let the user know that auto-correction will be performed when a key is pressed. -->
- <string name="spoken_auto_correct_obscured"><xliff:g id="key" example="Space">%1$s</xliff:g> performs auto-correction</string>
-
- <!-- Spoken description for unknown keyboard keys. -->
- <string name="spoken_description_unknown">Key code %d</string>
- <!-- Spoken description for the "Shift" keyboard key when "Shift" is off. -->
- <string name="spoken_description_shift">Shift</string>
- <!-- Spoken description for the "Shift" keyboard key when "Shift" is on. -->
- <string name="spoken_description_shift_shifted">Shift on (tap to disable)</string>
- <!-- Spoken description for the "Shift" keyboard key when "Caps lock" is on. -->
- <string name="spoken_description_caps_lock">Caps lock on (tap to disable)</string>
- <!-- Spoken description for the "Delete" keyboard key. -->
- <string name="spoken_description_delete">Delete</string>
- <!-- Spoken description for the "To Symbol" keyboard key. -->
- <string name="spoken_description_to_symbol">Symbols</string>
- <!-- Spoken description for the "To Alpha" keyboard key. -->
- <string name="spoken_description_to_alpha">Letters</string>
- <!-- Spoken description for the "To Numbers" keyboard key. -->
- <string name="spoken_description_to_numeric">Numbers</string>
- <!-- Spoken description for the "Settings" keyboard key. -->
- <string name="spoken_description_settings">Settings</string>
- <!-- Spoken description for the "Tab" keyboard key. -->
- <string name="spoken_description_tab">Tab</string>
- <!-- Spoken description for the "Space" keyboard key. -->
- <string name="spoken_description_space">Space</string>
- <!-- Spoken description for the "Mic" keyboard key. -->
- <string name="spoken_description_mic">Voice input</string>
- <!-- Spoken description for the "Smiley" keyboard key. -->
- <string name="spoken_description_smiley">Smiley face</string>
- <!-- Spoken description for the "Return" keyboard key. -->
- <string name="spoken_description_return">Return</string>
- <!-- Spoken description for the "Search" keyboard key. -->
- <string name="spoken_description_search">Search</string>
- <!-- Spoken description for the "U+2022" (BULLET) keyboard key. -->
- <string name="spoken_description_dot">Dot</string>
- <!-- Spoken description for the "Switch language" keyboard key. -->
- <string name="spoken_description_language_switch">Switch language</string>
- <!-- Spoken description for the "Next" action keyboard key. -->
- <string name="spoken_description_action_next">Next</string>
- <!-- Spoken description for the "Previous" action keyboard key. -->
- <string name="spoken_description_action_previous">Previous</string>
-
- <!-- Spoken feedback after turning "Shift" mode on. -->
- <string name="spoken_description_shiftmode_on">Shift enabled</string>
- <!-- Spoken feedback after turning "Caps lock" mode on. -->
- <string name="spoken_description_shiftmode_locked">Caps lock enabled</string>
- <!-- Spoken feedback after turning "Shift" mode off. -->
- <string name="spoken_description_shiftmode_off">Shift disabled</string>
-
- <!-- Spoken feedback after changing to the symbols keyboard. -->
- <string name="spoken_description_mode_symbol">Symbols mode</string>
- <!-- Spoken feedback after changing to the alphanumeric keyboard. -->
- <string name="spoken_description_mode_alpha">Letters mode</string>
- <!-- Spoken feedback after changing to the phone dialer keyboard. -->
- <string name="spoken_description_mode_phone">Phone mode</string>
- <!-- Spoken feedback after changing to the shifted phone dialer (symbols) keyboard. -->
- <string name="spoken_description_mode_phone_shift">Phone symbols mode</string>
-
- <!-- Spoken feedback when the keyboard is hidden. -->
- <string name="announce_keyboard_hidden">Keyboard hidden</string>
- <!-- Spoken feedback when the keyboard mode changes. -->
- <string name="announce_keyboard_mode">Showing <xliff:g id="mode" example="email">%s</xliff:g> keyboard</string>
- <!-- Description of the keyboard mode for entering dates. -->
- <string name="keyboard_mode_date">date</string>
- <!-- Description of the keyboard mode for entering dates and times. -->
- <string name="keyboard_mode_date_time">date and time</string>
- <!-- Description of the keyboard mode for entering email addresses. -->
- <string name="keyboard_mode_email">email</string>
- <!-- Description of the keyboard mode for entering text messages. -->
- <string name="keyboard_mode_im">messaging</string>
- <!-- Description of the keyboard mode for entering numbers. -->
- <string name="keyboard_mode_number">number</string>
- <!-- Description of the keyboard mode for entering phone numbers. -->
- <string name="keyboard_mode_phone">phone</string>
- <!-- Description of the keyboard mode for entering generic text. -->
- <string name="keyboard_mode_text">text</string>
- <!-- Description of the keyboard mode for entering times. -->
- <string name="keyboard_mode_time">time</string>
- <!-- Description of the keyboard mode for entering URLs. -->
- <string name="keyboard_mode_url">URL</string>
+ <!-- Option to enable space aware gesture input. The user can input multiple words by gliding through the space key during a gesture input. [CHAR LIMIT=30]-->
+ <string name="gesture_space_aware">Phrase gesture</string>
+ <!-- Description for "gesture_space_aware" option. The user can input multiple words by gliding through the space key during a gesture input.[CHAR LIMIT=65]-->
+ <string name="gesture_space_aware_summary">Input spaces during gestures by gliding to the space key</string>
<!-- Preferences item for enabling speech input -->
<string name="voice_input">Voice input key</string>
-
- <!-- Voice Input modes -->
- <!-- On settings screen, voice input pop-up menu option to show voice key on main keyboard [CHAR LIMIT=20] -->
- <string name="voice_input_modes_main_keyboard">On main keyboard</string>
- <!-- On settings screen, voice input pop-up menu option to show voice key on symbols keyboard [CHAR LIMIT=20] -->
- <string name="voice_input_modes_symbols_keyboard">On symbols keyboard</string>
- <!-- On settings screen, voice input pop-up menu option to never show voice key [CHAR LIMIT=20] -->
- <string name="voice_input_modes_off">Off</string>
- <!-- Voice Input modes summary -->
- <!-- On settings screen, voice input pop-up menu summary text to show voice key on main keyboard [CHAR LIMIT=20] -->
- <string name="voice_input_modes_summary_main_keyboard">Mic on main keyboard</string>
- <!-- On settings screen, voice input pop-up menu summary text to show voice key on symbols keyboard [CHAR LIMIT=20] -->
- <string name="voice_input_modes_summary_symbols_keyboard">Mic on symbols keyboard</string>
- <!-- On settings screen, voice input pop-up menu summary text to never show voice key [CHAR LIMIT=20] -->
- <string name="voice_input_modes_summary_off">Voice input is disabled</string>
+ <!-- The summary text to describe the reason why the "Voice input key" option is disabled. [CHAR LIMIT=100] -->
+ <string name="voice_input_disabled_summary">No voice input methods enabled. Check Language &amp; input settings.</string>
<!-- Title for configuring input method settings [CHAR LIMIT=35] -->
<string name="configure_input_method">Configure input methods</string>
@@ -346,32 +246,40 @@
<!-- Title of the item to change the keyboard theme [CHAR LIMIT=20]-->
<string name="keyboard_layout">Keyboard theme</string>
- <!-- Description for English (United Kingdom) keyboard subtype [CHAR LIMIT=25] -->
+ <!-- Description for English (UK) keyboard subtype [CHAR LIMIT=25]
+ (UK) should be an abbreviation of United Kingdom to fit in the CHAR LIMIT. -->
<string name="subtype_en_GB">English (UK)</string>
- <!-- Description for English (United States) keyboard subtype [CHAR LIMIT=25] -->
+ <!-- Description for English (US) keyboard subtype [CHAR LIMIT=25]
+ (US) should be an abbreviation of United States to fit in the CHAR LIMIT. -->
<string name="subtype_en_US">English (US)</string>
- <!-- Description for Spanish (United States) keyboard subtype [CHAR LIMIT=25] -->
+ <!-- Description for Spanish (US) keyboard subtype [CHAR LIMIT=25]
+ (US) should be an abbreviation of United States to fit in the CHAR LIMIT. -->
<string name="subtype_es_US">Spanish (US)</string>
- <!-- Description for English (United Kingdom) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
+ <!-- Description for English (UK) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
+ (UK) should be an abbreviation of United Kingdom to fit in the CHAR LIMIT.
This should be identical to subtype_en_GB aside from the trailing (%s). -->
- <string name="subtype_with_layout_en_GB">English (UK) (<xliff:g id="layout">%s</xliff:g>)</string>
- <!-- Description for English (United States) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
+ <string name="subtype_with_layout_en_GB">English (UK) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+ <!-- Description for English (US) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
+ (US) should be an abbreviation of United States to fit in the CHAR LIMIT.
This should be identical to subtype_en_US aside from the trailing (%s). -->
- <string name="subtype_with_layout_en_US">English (US) (<xliff:g id="layout">%s</xliff:g>)</string>
- <!-- Description for Spanish (United States) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
+ <string name="subtype_with_layout_en_US">English (US) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+ <!-- Description for Spanish (US) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
+ (US) should be an abbreviation of United Statesn to fit in the CHAR LIMIT.
This should be identical to subtype_es_US aside from the trailing (%s). -->
- <string name="subtype_with_layout_es_US">Spanish (US) (<xliff:g id="layout">%s</xliff:g>)</string>
- <!-- Description for Nepali (Traditional) keyboard subtype [CHAR LIMIT=25] -->
- <string name="subtype_nepali_traditional"><xliff:g id="language">%s</xliff:g> (Traditional)</string>
- <!-- TODO: Uncomment once we can handle IETF language tag with script name specified.
- Description for Serbian Cyrillic keyboard subtype [CHAR LIMIT=25]
- <string name="subtype_serbian_cyrillic">Serbian (Cyrillic)</string>
- Description for Serbian Latin keyboard subtype [CHAR LIMIT=25]
- <string name="subtype_serbian_latin">Serbian (Latin)</string>
- Description for Serbian Latin keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
- This should be identical to subtype_serbian_latin aside from the trailing (%s).
- <string name="subtype_with_layout_sr-Latn">Serbian (Latin) (<xliff:g id="layout">%s</xliff:g>)</string>
- -->
+ <string name="subtype_with_layout_es_US">Spanish (US) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+ <!-- Description for "LANGUAGE_NAME" (Traditional) keyboard subtype [CHAR LIMIT=25]
+ (Traditional) can be an abbreviation to fit in the CHAR LIMIT. -->
+ <string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (Traditional)</string>
+ <!-- Description for "LANGUAGE_NAME" (Compact) keyboard subtype [CHAR LIMIT=25]
+ (Compact) can be an abbreviation to fit in the CHAR LIMIT.
+ TODO: Remove translatable=false once we are settled down with the naming. -->
+ <string name="subtype_generic_compact" translatable="false"><xliff:g id="LANGUAGE_NAME" example="Hindi">%s</xliff:g> (Compact)</string>
+ <!-- Description for "LANGUAGE_NAME" (Cyrillic) keyboard subtype [CHAR LIMIT=25]
+ (Cyrillic) can be an abbreviation to fit in the CHAR LIMIT. -->
+ <string name="subtype_generic_cyrillic"><xliff:g id="LANGUAGE_NAME" example="Serbian">%s</xliff:g> (Cyrillic)</string>
+ <!-- Description for "LANGUAGE_NAME" (Latin) keyboard subtype [CHAR LIMIT=25]
+ (Latin) can be an abbreviation to fit in the CHAR LIMIT. -->
+ <string name="subtype_generic_latin"><xliff:g id="LANGUAGE_NAME" example="Serbian">%s</xliff:g> (Latin)</string>
<!-- This string is displayed in a language list that allows to choose a language for
suggestions in a software keyboard. This setting won't give suggestions in any particular
language, hence "No language".
@@ -480,7 +388,7 @@ mobile devices. [CHAR LIMIT=25] -->
<!-- Title of the button to postpone enabling a custom input style entry in the settings dialog [CHAR LIMIT=15] -->
<string name="not_now">Not now</string>
<!-- Toast text to describe the same input style already exists [CHAR LIMIT=64]-->
- <string name="custom_input_style_already_exists">"The same input style already exists: <xliff:g id="input_style_name">%s</xliff:g>"</string>
+ <string name="custom_input_style_already_exists">"The same input style already exists: <xliff:g id="INPUT_STYLE_NAME" example="English (Dvorak)">%s</xliff:g>"</string>
<!-- Title of an option for usability study mode -->
<string name="prefs_usability_study_mode">Usability study mode</string>
@@ -490,26 +398,38 @@ mobile devices. [CHAR LIMIT=25] -->
<string name="prefs_keypress_vibration_duration_settings">Keypress vibration duration</string>
<!-- Title of the settings for keypress sound volume [CHAR LIMIT=35] -->
<string name="prefs_keypress_sound_volume_settings">Keypress sound volume</string>
+ <!-- Title of the settings for key popup show up animation duration (in milliseconds) [CHAR LIMIT=35] -->
+ <string name="prefs_key_popup_show_up_duration_settings" translatable="false">Key popup show up duration</string>
+ <!-- Title of the settings for key popup dismiss animation duration (in milliseconds) [CHAR LIMIT=35] -->
+ <string name="prefs_key_popup_dismiss_duration_settings" translatable="false">Key popup dismiss duration</string>
+ <!-- Title of the settings for key popup show up animation start scale (in percentile) [CHAR LIMIT=35] -->
+ <string name="prefs_key_popup_show_up_start_scale_settings" translatable="false">Key popup show up start scale</string>
+ <!-- Title of the settings for key popup dismiss animation end scale (in percentile) [CHAR LIMIT=35] -->
+ <string name="prefs_key_popup_dismiss_end_scale_settings" translatable="false">Key popup dismiss end scale</string>
<!-- Title of the settings for reading an external dictionary file -->
<string name="prefs_read_external_dictionary">Read external dictionary file</string>
- <!-- Title of the settings for using only personalization dictionary -->
- <string name="prefs_use_only_personalization_dictionary" translatable="false">Use only personalization dictionary</string>
- <!-- Title of the settings for boosting personalization dictionary -->
- <string name="prefs_boost_personalization_dictionary" translatable="false">Boost personalization dictionary</string>
<!-- Message to show when there are no files to install as an external dictionary [CHAR LIMIT=100] -->
<string name="read_external_dictionary_no_files_message">No dictionary files in the Downloads folder</string>
<!-- Title of the dialog that selects a file to install as an external dictionary [CHAR LIMIT=50] -->
<string name="read_external_dictionary_multiple_files_title">Select a dictionary file to install</string>
<!-- Title of the confirmation dialog to install a file as an external dictionary [CHAR LIMIT=50] -->
- <string name="read_external_dictionary_confirm_install_message">Really install this file for <xliff:g id="locale_name">%s</xliff:g>?</string>
+ <string name="read_external_dictionary_confirm_install_message">Really install this file for <xliff:g id="LANGUAGE_NAME" example="English">%s</xliff:g>?</string>
<!-- Title for an error dialog that contains the details of the error in the body [CHAR LIMIT=80] -->
<string name="error">There was an error</string>
+ <!-- Title of the settings for dumpping contacts dictionary file [CHAR LIMIT=35] -->
+ <string name="prefs_dump_contacts_dict">Dump contacts dictionary</string>
+ <!-- Title of the settings for dumpping personal dictionary file [CHAR LIMIT=35] -->
+ <string name="prefs_dump_user_dict">Dump personal dictionary</string>
+ <!-- Title of the settings for dumpping user history dictionary file [CHAR LIMIT=35] -->
+ <string name="prefs_dump_user_history_dict">Dump user history dictionary</string>
+ <!-- Title of the settings for dumpping personalization dictionary file [CHAR LIMIT=35] -->
+ <string name="prefs_dump_personalization_dict">Dump personalization dictionary</string>
<!-- Title of the button to revert to the default value of the device in the settings dialog [CHAR LIMIT=15] -->
<string name="button_default">Default</string>
<!-- Title of the setup wizard welcome screen. [CHAR LIMT=40] -->
- <string name="setup_welcome_title">"Welcome to <xliff:g id="application_name">%s</xliff:g>"</string>
+ <string name="setup_welcome_title">"Welcome to <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>"</string>
<!-- Additional title of the setup wizard welcome screen, just below the setup_welcome_title. [CHAR_LIMIT=64] -->
<string name="setup_welcome_additional_description">with Gesture Typing</string>
<!-- The label of the button that starts the setup wizard. [CHAR_LIMIT=64] -->
@@ -517,23 +437,23 @@ mobile devices. [CHAR LIMIT=25] -->
<!-- The label of the button that navigates the user to the next step of the setup wizard. [CHAR_LIMIT=64] -->
<string name="setup_next_action">Next step</string>
<!-- Title of the setup wizard. [CHAR LIMT=40] -->
- <string name="setup_steps_title">"Setting up <xliff:g id="application_name">%s</xliff:g>"</string>
+ <string name="setup_steps_title">"Setting up <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>"</string>
<!-- Ordinal number of the 1st step in the setup wizard. [CHAR LIMIT=5] -->
<string name="setup_step1_bullet" translatable="false">1</string>
<!-- Title of the 1st step in the setup wizard. [CHAR LIMIT=64] -->
- <string name="setup_step1_title">"Enable <xliff:g id="application_name">%s</xliff:g>"</string>
+ <string name="setup_step1_title">"Enable <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>"</string>
<!-- Detailed instruction of the 1st step in the setup wizard. [CHAR LIMIT=120] -->
- <string name="setup_step1_instruction">"Please check \"<xliff:g id="application_name">%s</xliff:g>\" in your Language &amp; input settings. This will authorize it to run on your device."</string>
+ <string name="setup_step1_instruction">"Please check \"<xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>\" in your Language &amp; input settings. This will authorize it to run on your device."</string>
<!-- Detailed instruction of the already finished 1st step in the setup wizard. [CHAR LIMIT=120] -->
- <string name="setup_step1_finished_instruction">"<xliff:g id="application_name">%s</xliff:g> is already enabled in your Language &amp; input settings, so this step is done. On to the next one!"</string>
+ <string name="setup_step1_finished_instruction">"<xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> is already enabled in your Language &amp; input settings, so this step is done. On to the next one!"</string>
<!-- The label of the button that triggers the Language & input settings in order to enable the keyboard. [CHAR_LIMIT=64] -->
<string name="setup_step1_action">Enable in Settings</string>
<!-- Ordinal number of the 2nd step in the setup wizard. [CHAR LIMIT=5] -->
<string name="setup_step2_bullet" translatable="false">2</string>
<!-- Title of the 2nd step in the setup wizard. [CHAR LIMIT=64] -->
- <string name="setup_step2_title">"Switch to <xliff:g id="application_name">%s</xliff:g>"</string>
+ <string name="setup_step2_title">"Switch to <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>"</string>
<!-- Detailed instruction of the 2nd step in the setup wizard. [CHAR LIMIT=120] -->
- <string name="setup_step2_instruction">"Next, select \"<xliff:g id="application_name">%s</xliff:g>\" as your active text-input method."</string>
+ <string name="setup_step2_instruction">"Next, select \"<xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>\" as your active text-input method."</string>
<!-- The label of the button that triggers the choose input method dialog in order to select the keyboard. [CHAR_LIMIT=64] -->
<string name="setup_step2_action">Switch input methods</string>
<!-- Ordinal number of the 3rd step in the setup wizard. [CHAR LIMIT=5] -->
@@ -541,7 +461,7 @@ mobile devices. [CHAR LIMIT=25] -->
<!-- Title of the 3rd step in the setup wizard. [CHAR LIMIT=64] -->
<string name="setup_step3_title">"Congratulations, you're all set!"</string>
<!-- Detailed instruction of the 3rd step in the setup wizard. [CHAR LIMIT=120] -->
- <string name="setup_step3_instruction">Now you can type in all your favorite apps with <xliff:g id="application_name">%s</xliff:g>.</string>
+ <string name="setup_step3_instruction">Now you can type in all your favorite apps with <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>.</string>
<!-- The label of the button that triggers the screen for configuaring additional languages of the keyboard. [CHAR_LIMIT=64] -->
<string name="setup_step3_action">Configure additional languages</string>
<!-- The label of the button that finishes the setup wizard. [CHAR_LIMIT=64] -->
@@ -592,13 +512,15 @@ mobile devices. [CHAR LIMIT=25] -->
<!-- Message to display in a dialog box while we are actively updating the word list [CHAR LIMIT=60] -->
<string name="message_updating">Checking for updates</string>
<!-- Message to display while the add-on dictionary list is updating [no space constraints on this, there is plenty of space but shorter is better because it's only on the screen for a second] -->
- <string name="message_loading">Loading...</string>
+ <string name="message_loading">Loading&#x2026;</string>
<!-- String to explain this dictionary is the main dictionary for this language [CHAR_LIMIT=30] -->
<string name="main_dict_description">Main dictionary</string>
<!-- Standard message to dismiss a dialog box -->
<string name="cancel">Cancel</string>
+ <!-- Title of the button in a dialog box. The button takes the user to the keyboard settings. [CHAR LIMIT=15] -->
+ <string name="go_to_settings">Settings</string>
<!-- Action to download and install a dictionary [CHAR_LIMIT=15] -->
<string name="install_dict">Install</string>
@@ -609,24 +531,24 @@ mobile devices. [CHAR LIMIT=25] -->
<!-- Message in the popup informing the user a dictionary is available for their language, and asking for a decision to download over their mobile data plan or not. The reason we ask for this is, the data is large and may be downloaded over a paid-per-megabyte connection but a dictionary is also essential to type comfortably, so we ask the user. This only pops in selected cases, when there is no dictionary at all currently, and the only available network seems to be metered. The "Language & input" part should be set to the actual name of the option (message ID 5292716747264442359 in the translation console). [CHAR_LIMIT=700] -->
<string name="should_download_over_metered_prompt">The selected language on your mobile device has an available dictionary.&lt;br/>
-We recommend &lt;b>downloading&lt;/b> the <xliff:g id="language" example="English">%1$s</xliff:g> dictionary to improve your typing experience.&lt;br/>
+We recommend &lt;b>downloading&lt;/b> the <xliff:g id="LANGUAGE_NAME" example="English">%1$s</xliff:g> dictionary to improve your typing experience.&lt;br/>
&lt;br/>
The download could take a minute or two over 3G. Charges may apply if you don\'t have an &lt;b>unlimited data plan&lt;/b>.&lt;br/>
If you are not sure which data plan you have, we recommend finding a Wi-Fi connection to start the download automatically.&lt;br/>
&lt;br/>
Tip: You can download and remove dictionaries by going to &lt;b>Language &amp; input&lt;/b> in the &lt;b>Settings&lt;/b> menu of your mobile device.</string>
- <string name="download_over_metered">Download now (<xliff:g id="size_in_megabytes" example="0.7">%1$.1f</xliff:g>MB)</string>
+ <string name="download_over_metered">Download now (<xliff:g id="SIZE_IN_MEGABYTES" example="0.7">%1$.1f</xliff:g>MB)</string>
<string name="do_not_download_over_metered">Download over Wi-Fi</string>
<!-- The text of the "dictionary available" notification. -->
- <string name="dict_available_notification_title">A dictionary is available for <xliff:g id="language" example="English">%1$s</xliff:g></string>
+ <string name="dict_available_notification_title">A dictionary is available for <xliff:g id="LANGUAGE_NAME" example="English">%1$s</xliff:g></string>
<!-- The small subtext in the "dictionary available" notification. -->
<string name="dict_available_notification_description">Press to review and download</string>
<!-- The text of the toast warning a download is starting automatically to enable suggestions for the selected language [CHAR LIMIT=100] -->
- <string name="toast_downloading_suggestions">Downloading: suggestions for <xliff:g id="language" example="English">%1$s</xliff:g> will be ready soon.</string>
+ <string name="toast_downloading_suggestions">Downloading: suggestions for <xliff:g id="LANGUAGE_NAME" example="English">%1$s</xliff:g> will be ready soon.</string>
<!-- Version text [CHAR LIMIT=30]-->
- <string name="version_text">Version <xliff:g id="version_number" example="1.0.1864.643521">%1$s</xliff:g></string>
+ <string name="version_text">Version <xliff:g id="VERSION_NUMBER" example="1.0.1864.643521">%1$s</xliff:g></string>
<!-- User dictionary settings -->
<!-- User dictionary settings. The summary of the listem item to go into the User dictionary settings screen. -->
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index 298936d9c..eb6cdd975 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -25,49 +25,49 @@
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_default</item>
<item name="rowHeight">25%p</item>
<item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item>
- <item name="keyboardLeftPadding">@fraction/keyboard_left_padding</item>
- <item name="keyboardRightPadding">@fraction/keyboard_right_padding</item>
+ <item name="keyboardLeftPadding">@fraction/config_keyboard_left_padding</item>
+ <item name="keyboardRightPadding">@fraction/config_keyboard_right_padding</item>
<item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item>
</style>
<style name="KeyboardView">
<item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
- <item name="keyLetterSize">@fraction/key_letter_ratio</item>
- <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item>
- <item name="keyLabelSize">@fraction/key_label_ratio</item>
- <item name="keyLargeLabelRatio">@fraction/key_large_label_ratio</item>
- <item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item>
- <item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item>
- <item name="keyShiftedLetterHintRatio">@fraction/key_uppercase_letter_ratio</item>
+ <item name="keyLetterSize">@fraction/config_key_letter_ratio</item>
+ <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
+ <item name="keyLabelSize">@fraction/config_key_label_ratio</item>
+ <item name="keyLargeLabelRatio">@fraction/config_key_large_label_ratio</item>
+ <item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio</item>
+ <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>
+ <item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</item>
<item name="keyTypeface">normal</item>
- <item name="keyLabelHorizontalPadding">@dimen/key_label_horizontal_padding</item>
- <item name="keyHintLetterPadding">@dimen/key_hint_letter_padding</item>
- <item name="keyPopupHintLetterPadding">@dimen/key_popup_hint_letter_padding</item>
- <item name="keyShiftedLetterHintPadding">@dimen/key_uppercase_letter_padding</item>
- <item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item>
- <item name="verticalCorrection">@dimen/keyboard_vertical_correction</item>
+ <item name="keyLabelHorizontalPadding">@dimen/config_key_label_horizontal_padding</item>
+ <item name="keyHintLetterPadding">@dimen/config_key_hint_letter_padding</item>
+ <item name="keyPopupHintLetterPadding">@dimen/config_key_popup_hint_letter_padding</item>
+ <item name="keyShiftedLetterHintPadding">@dimen/config_key_shifted_letter_hint_padding</item>
+ <item name="keyPreviewTextRatio">@fraction/config_key_preview_text_ratio</item>
+ <item name="verticalCorrection">@dimen/config_keyboard_vertical_correction</item>
<item name="backgroundDimAlpha">128</item>
- <item name="gestureFloatingPreviewTextSize">@dimen/gesture_floating_preview_text_size</item>
- <item name="gestureFloatingPreviewTextOffset">@dimen/gesture_floating_preview_text_offset</item>
- <item name="gestureFloatingPreviewHorizontalPadding">@dimen/gesture_floating_preview_horizontal_padding</item>
- <item name="gestureFloatingPreviewVerticalPadding">@dimen/gesture_floating_preview_vertical_padding</item>
- <item name="gestureFloatingPreviewRoundRadius">@dimen/gesture_floating_preview_round_radius</item>
- <item name="gestureTrailMinSamplingDistance">@dimen/gesture_trail_min_sampling_distance</item>
- <item name="gestureTrailMaxInterpolationAngularThreshold">@integer/gesture_trail_max_interpolation_angular_threshold</item>
- <item name="gestureTrailMaxInterpolationDistanceThreshold">@dimen/gesture_trail_max_interpolation_distance_threshold</item>
- <item name="gestureTrailMaxInterpolationSegments">@integer/gesture_trail_max_interpolation_segments</item>
+ <item name="gestureFloatingPreviewTextSize">@dimen/config_gesture_floating_preview_text_size</item>
+ <item name="gestureFloatingPreviewTextOffset">@dimen/config_gesture_floating_preview_text_offset</item>
+ <item name="gestureFloatingPreviewHorizontalPadding">@dimen/config_gesture_floating_preview_horizontal_padding</item>
+ <item name="gestureFloatingPreviewVerticalPadding">@dimen/config_gesture_floating_preview_vertical_padding</item>
+ <item name="gestureFloatingPreviewRoundRadius">@dimen/config_gesture_floating_preview_round_radius</item>
+ <item name="gestureTrailMinSamplingDistance">@dimen/config_gesture_trail_min_sampling_distance</item>
+ <item name="gestureTrailMaxInterpolationAngularThreshold">@integer/config_gesture_trail_max_interpolation_angular_threshold</item>
+ <item name="gestureTrailMaxInterpolationDistanceThreshold">@dimen/config_gesture_trail_max_interpolation_distance_threshold</item>
+ <item name="gestureTrailMaxInterpolationSegments">@integer/config_gesture_trail_max_interpolation_segments</item>
<item name="gestureTrailFadeoutStartDelay">@integer/config_gesture_trail_fadeout_start_delay</item>
<item name="gestureTrailFadeoutDuration">@integer/config_gesture_trail_fadeout_duration</item>
<item name="gestureTrailUpdateInterval">@integer/config_gesture_trail_update_interval</item>
- <item name="gestureTrailStartWidth">@dimen/gesture_trail_start_width</item>
- <item name="gestureTrailEndWidth">@dimen/gesture_trail_end_width</item>
- <item name="gestureTrailBodyRatio">@integer/gesture_trail_body_ratio</item>
- <item name="gestureTrailShadowRatio">@integer/gesture_trail_shadow_ratio</item>
+ <item name="gestureTrailStartWidth">@dimen/config_gesture_trail_start_width</item>
+ <item name="gestureTrailEndWidth">@dimen/config_gesture_trail_end_width</item>
+ <item name="gestureTrailBodyRatio">@integer/config_gesture_trail_body_ratio</item>
+ <item name="gestureTrailShadowRatio">@integer/config_gesture_trail_shadow_ratio</item>
<!-- Common attributes of MainKeyboardView -->
<item name="keyHysteresisDistance">@dimen/config_key_hysteresis_distance</item>
<item name="keyHysteresisDistanceForSlidingModifier">@dimen/config_key_hysteresis_distance_for_sliding_modifier</item>
<item name="touchNoiseThresholdTime">@integer/config_touch_noise_threshold_time</item>
<item name="touchNoiseThresholdDistance">@dimen/config_touch_noise_threshold_distance</item>
- <item name="slidingKeyInputEnable">@bool/config_sliding_key_input_enabled</item>
+ <item name="keySelectionByDraggingFinger">@bool/config_key_selection_by_dragging_finger</item>
<item name="slidingKeyInputPreviewWidth">@dimen/config_sliding_key_input_preview_width</item>
<item name="slidingKeyInputPreviewBodyRatio">@integer/config_sliding_key_input_preview_body_ratio</item>
<item name="slidingKeyInputPreviewShadowRatio">@integer/config_sliding_key_input_preview_shadow_ratio</item>
@@ -75,11 +75,13 @@
<item name="keyRepeatInterval">@integer/config_key_repeat_interval</item>
<item name="longPressShiftLockTimeout">@integer/config_longpress_shift_lock_timeout</item>
<item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item>
- <item name="keyPreviewHeight">@dimen/key_preview_height</item>
+ <item name="keyPreviewLayout">@layout/key_preview</item>
+ <item name="keyPreviewHeight">@dimen/config_key_preview_height</item>
+ <!-- TODO: consolidate key preview linger timeout with the key preview animation parameters. -->
<item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item>
<item name="moreKeysKeyboardLayout">@layout/more_keys_keyboard</item>
<item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item>
- <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
+ <item name="languageOnSpacebarTextRatio">@fraction/config_language_on_spacebar_text_ratio</item>
<item name="languageOnSpacebarFinalAlpha">@integer/config_language_on_spacebar_final_alpha</item>
<item name="languageOnSpacebarFadeoutAnimator">@anim/language_on_spacebar_fadeout</item>
<!-- Remove animations for now because it could drain a non-negligible amount of battery while typing.
@@ -104,6 +106,7 @@
<style
name="MainKeyboardView"
parent="KeyboardView" />
+ <style name="KeyPreviewTextView" />
<!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
for instance delete button, need themed {@link KeyboardView} attributes. -->
<style
@@ -118,14 +121,29 @@
parent="MainKeyboardView" />
<style name="MoreKeysKeyboardContainer" />
<style name="SuggestionStripView">
- <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item>
- <item name="centerSuggestionPercentile">@fraction/center_suggestion_percentile</item>
- <item name="maxMoreSuggestionsRow">@integer/max_more_suggestions_row</item>
- <item name="minMoreSuggestionsWidth">@fraction/min_more_suggestions_width</item>
+ <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
+ <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
+ <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
+ <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
+ </style>
+ <style name="SuggestionWord">
+ <item name="android:minWidth">@dimen/config_suggestion_min_width</item>
+ <item name="android:textSize">@dimen/config_suggestion_text_size</item>
+ <item name="android:gravity">center</item>
+ <item name="android:paddingLeft">@dimen/config_suggestion_text_horizontal_padding</item>
+ <item name="android:paddingTop">0dp</item>
+ <item name="android:paddingRight">@dimen/config_suggestion_text_horizontal_padding</item>
+ <item name="android:paddingBottom">0dp</item>
+ <!-- Provide a haptic feedback by ourselves based on the keyboard settings.
+ We just need to ignore the system's haptic feedback settings. -->
+ <item name="android:hapticFeedbackEnabled">false</item>
+ <item name="android:focusable">false</item>
+ <item name="android:clickable">false</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:ellipsize">none</item>
</style>
- <style name="SuggestionWord" />
<style name="MoreKeysKeyboardAnimation">
<item name="android:windowEnterAnimation">@anim/more_keys_keyboard_fadein</item>
<item name="android:windowExitAnimation">@anim/more_keys_keyboard_fadeout</item>
</style>
-</resources> \ No newline at end of file
+</resources>
diff --git a/java/res/values/themes-gb.xml b/java/res/values/themes-gb.xml
deleted file mode 100644
index f52695f55..000000000
--- a/java/res/values/themes-gb.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
- <style name="KeyboardTheme.GB" parent="KeyboardIcons.GB">
- <item name="keyboardStyle">@style/Keyboard.GB</item>
- <item name="keyboardViewStyle">@style/KeyboardView.GB</item>
- <item name="mainKeyboardViewStyle">@style/MainKeyboardView.GB</item>
- <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.GB</item>
- <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.GB</item>
- <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.GB</item>
- <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.GB</item>
- <item name="suggestionStripViewStyle">@style/SuggestionStripView.GB</item>
- <item name="suggestionWordStyle">@style/SuggestionWord.GB</item>
- </style>
- <style name="KeyboardIcons.GB">
- <!-- Keyboard icons -->
- <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo_dark</item>
- <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo_dark</item>
- <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo_dark</item>
- <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo_dark</item>
- <item name="iconEnterKey">@drawable/sym_keyboard_return_holo_dark</item>
- <item name="iconSearchKey">@drawable/sym_keyboard_search_holo_dark</item>
- <item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item>
- <item name="iconShortcutKey">@drawable/sym_keyboard_mic_holo_dark</item>
- <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo_dark</item>
- <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space</item>
- <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo_dark</item>
- <!-- TODO: Needs non-holo disabled shortcut icon drawable -->
- <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo_dark</item>
- <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item>
- <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_dark</item>
- <!-- TODO: Needs dedicated black theme ZWNJ and ZWJ icons -->
- <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo_dark</item>
- <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo_dark</item>
- <item name="iconEmojiKey">@drawable/sym_keyboard_smiley_holo_dark</item>
- </style>
- <style
- name="Keyboard.GB"
- parent="Keyboard"
- >
- <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
- <item name="themeId">1</item>
- <item name="touchPositionCorrectionData">@array/touch_position_correction_data_gb</item>
- <item name="keyboardTopPadding">@fraction/keyboard_top_padding_gb</item>
- <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_gb</item>
- <item name="horizontalGap">@fraction/key_horizontal_gap_gb</item>
- <item name="verticalGap">@fraction/key_bottom_gap_gb</item>
- </style>
- <style
- name="KeyboardView.GB"
- parent="KeyboardView"
- >
- <item name="android:background">@drawable/keyboard_background_gb</item>
- <item name="keyBackground">@drawable/btn_keyboard_key_gb</item>
- <item name="keyTypeface">bold</item>
- <item name="keyTextColor">@color/key_text_color_gb</item>
- <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_gb</item>
- <item name="keyHintLetterColor">@color/key_hint_letter_color_gb</item>
- <item name="keyHintLabelColor">@color/key_hint_label_color_gb</item>
- <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_gb</item>
- <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_gb</item>
- <item name="keyPreviewTextColor">@color/key_text_color_gb</item>
- <item name="keyTextShadowColor">@color/key_text_shadow_color_gb</item>
- <item name="keyTextShadowRadius">2.75</item>
- </style>
- <style
- name="MainKeyboardView.GB"
- parent="KeyboardView.GB"
- >
- <item name="keyPreviewLayout">@layout/key_preview_gb</item>
- <item name="keyPreviewOffset">@dimen/key_preview_offset_gb</item>
- <item name="gestureFloatingPreviewTextColor">@color/highlight_color_gb</item>
- <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_gb</item>
- <item name="gestureTrailColor">@color/highlight_color_gb</item>
- <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_gb</item>
- <item name="autoCorrectionSpacebarLedEnabled">true</item>
- <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_gb</item>
- <item name="spacebarTextColor">@color/spacebar_text_color_gb</item>
- <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_gb</item>
- </style>
- <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
- for instance delete button, need themed {@link KeyboardView} attributes. -->
- <style
- name="EmojiPalettesView.GB"
- parent="KeyboardView.GB"
- >
- <item name="keyBackground">@drawable/btn_keyboard_key_functional_gb</item>
- <item name="emojiTabLabelColor">@color/emoji_tab_label_color_gb</item>
- </style>
- <style
- name="MoreKeysKeyboard.GB"
- parent="Keyboard.GB"
- >
- <item name="keyboardTopPadding">0%p</item>
- <item name="keyboardBottomPadding">0%p</item>
- <item name="horizontalGap">0%p</item>
- <item name="touchPositionCorrectionData">@null</item>
- </style>
- <style
- name="MoreKeysKeyboardView.GB"
- parent="KeyboardView.GB"
- >
- <item name="android:background">@null</item>
- <item name="keyBackground">@drawable/btn_keyboard_key_popup_gb</item>
- <item name="keyTypeface">normal</item>
- <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_gb</item>
- </style>
- <style
- name="MoreKeysKeyboardContainer.GB"
- >
- <item name="android:background">@drawable/keyboard_popup_panel_background_gb</item>
- </style>
- <style
- name="SuggestionStripView.GB"
- parent="SuggestionStripView"
- >
- <item name="android:background">@drawable/keyboard_suggest_strip_gb</item>
- <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
- <item name="colorValidTypedWord">@color/highlight_color_gb</item>
- <item name="colorTypedWord">@color/typed_word_color_gb</item>
- <item name="colorAutoCorrect">@color/highlight_color_gb</item>
- <item name="colorSuggested">@color/highlight_color_gb</item>
- <item name="alphaObsoleted">50%</item>
- </style>
- <style name="SuggestionWord.GB">
- <item name="android:background">@drawable/btn_suggestion_gb</item>
- </style>
-</resources>
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index 432ad5122..720eda9ce 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -23,10 +23,10 @@
<item name="keyboardStyle">@style/Keyboard.ICS</item>
<item name="keyboardViewStyle">@style/KeyboardView.ICS</item>
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.ICS</item>
+ <item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.ICS</item>
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.ICS</item>
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item>
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.ICS</item>
- <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.ICS</item>
<item name="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item>
<item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
</style>
@@ -36,10 +36,10 @@
>
<!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
<item name="themeId">2</item>
- <item name="keyboardTopPadding">@fraction/keyboard_top_padding_holo</item>
- <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_holo</item>
- <item name="horizontalGap">@fraction/key_horizontal_gap_holo</item>
- <item name="verticalGap">@fraction/key_bottom_gap_holo</item>
+ <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item>
+ <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item>
+ <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item>
+ <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item>
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
</style>
<style
@@ -63,16 +63,22 @@
name="MainKeyboardView.ICS"
parent="KeyboardView.ICS"
>
- <item name="keyPreviewLayout">@layout/key_preview_ics</item>
- <item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item>
+ <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_ics</item>
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
<item name="gestureTrailColor">@color/highlight_color_ics</item>
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_ics</item>
<item name="autoCorrectionSpacebarLedEnabled">false</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
- <item name="spacebarTextColor">@color/spacebar_text_color_holo</item>
- <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
+ <item name="languageOnSpacebarTextColor">@color/spacebar_text_color_holo</item>
+ <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
+ <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_ics</item>
+ </style>
+ <style
+ name="KeyPreviewTextView.ICS"
+ parent="KeyPreviewTextView"
+ >
+ <item name="android:background">@drawable/keyboard_key_feedback_ics</item>
</style>
<!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
for instance delete button, need themed {@link KeyboardView} attributes. -->
@@ -96,29 +102,28 @@
name="MoreKeysKeyboardView.ICS"
parent="KeyboardView.ICS"
>
- <item name="android:background">@null</item>
+ <item name="android:background">@drawable/keyboard_popup_panel_background_ics</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
<item name="keyTypeface">normal</item>
- <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
- </style>
- <style
- name="MoreKeysKeyboardContainer.ICS"
- >
- <item name="android:background">@drawable/keyboard_popup_panel_background_ics</item>
+ <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
</style>
<style
name="SuggestionStripView.ICS"
parent="SuggestionStripView"
>
<item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
- <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
+ <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
<item name="colorValidTypedWord">@color/typed_word_color_ics</item>
<item name="colorTypedWord">@color/typed_word_color_ics</item>
<item name="colorAutoCorrect">@color/highlight_color_ics</item>
<item name="colorSuggested">@color/suggested_word_color_ics</item>
<item name="alphaObsoleted">70%</item>
</style>
- <style name="SuggestionWord.ICS">
+ <style
+ name="SuggestionWord.ICS"
+ parent="SuggestionWord"
+ >
<item name="android:background">@drawable/btn_suggestion_ics</item>
+ <item name="android:textColor">@color/highlight_color_ics</item>
</style>
</resources>
diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml
index a3730019d..830527171 100644
--- a/java/res/values/themes-klp.xml
+++ b/java/res/values/themes-klp.xml
@@ -23,10 +23,10 @@
<item name="keyboardStyle">@style/Keyboard.KLP</item>
<item name="keyboardViewStyle">@style/KeyboardView.KLP</item>
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.KLP</item>
+ <item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.KLP</item>
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.KLP</item>
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.KLP</item>
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.KLP</item>
- <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.KLP</item>
<item name="suggestionStripViewStyle">@style/SuggestionStripView.KLP</item>
<item name="suggestionWordStyle">@style/SuggestionWord.KLP</item>
</style>
@@ -36,10 +36,10 @@
>
<!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
<item name="themeId">0</item>
- <item name="keyboardTopPadding">@fraction/keyboard_top_padding_holo</item>
- <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_holo</item>
- <item name="horizontalGap">@fraction/key_horizontal_gap_holo</item>
- <item name="verticalGap">@fraction/key_bottom_gap_holo</item>
+ <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item>
+ <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item>
+ <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item>
+ <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item>
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
</style>
<style
@@ -63,16 +63,22 @@
name="MainKeyboardView.KLP"
parent="KeyboardView.KLP"
>
- <item name="keyPreviewLayout">@layout/key_preview_klp</item>
- <item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item>
+ <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_klp</item>
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
<item name="gestureTrailColor">@color/highlight_color_klp</item>
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_klp</item>
<item name="autoCorrectionSpacebarLedEnabled">false</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
- <item name="spacebarTextColor">@color/spacebar_text_color_holo</item>
- <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
+ <item name="languageOnSpacebarTextColor">@color/spacebar_text_color_holo</item>
+ <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
+ <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_klp</item>
+ </style>
+ <style
+ name="KeyPreviewTextView.KLP"
+ parent="KeyPreviewTextView"
+ >
+ <item name="android:background">@drawable/keyboard_key_feedback_klp</item>
</style>
<!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
for instance delete button, need themed {@link KeyboardView} attributes. -->
@@ -96,29 +102,28 @@
name="MoreKeysKeyboardView.KLP"
parent="KeyboardView.KLP"
>
- <item name="android:background">@null</item>
+ <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
<item name="keyTypeface">normal</item>
- <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
- </style>
- <style
- name="MoreKeysKeyboardContainer.KLP"
- >
- <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
+ <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
</style>
<style
name="SuggestionStripView.KLP"
parent="SuggestionStripView"
>
<item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
- <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
+ <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
<item name="colorValidTypedWord">@color/typed_word_color_klp</item>
<item name="colorTypedWord">@color/typed_word_color_klp</item>
<item name="colorAutoCorrect">@color/highlight_color_klp</item>
<item name="colorSuggested">@color/suggested_word_color_klp</item>
<item name="alphaObsoleted">70%</item>
</style>
- <style name="SuggestionWord.KLP">
+ <style
+ name="SuggestionWord.KLP"
+ parent="SuggestionWord"
+ >
<item name="android:background">@drawable/btn_suggestion_klp</item>
+ <item name="android:textColor">@color/highlight_color_klp</item>
</style>
</resources>
diff --git a/java/res/values/touch-position-correction.xml b/java/res/values/touch-position-correction.xml
index becec0e0a..e090d106b 100644
--- a/java/res/values/touch-position-correction.xml
+++ b/java/res/values/touch-position-correction.xml
@@ -37,26 +37,6 @@
</string-array>
<string-array
- name="touch_position_correction_data_gb"
- translatable="false"
- >
- <!-- First row -->
- <item>0.0091285</item>
- <item>0.1193203</item>
- <item>0.1622607</item>
-
- <!-- Second row -->
- <item>-0.0233128</item>
- <item>0.1379798</item>
- <item>0.1585229</item>
-
- <!-- Third row -->
- <item>-0.0080185</item>
- <item>0.1911477</item>
- <item>0.1570948</item>
- </string-array>
-
- <string-array
name="touch_position_correction_data_holo"
translatable="false"
>
diff --git a/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml b/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
index 4d8b446a2..c7d446014 100644
--- a/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
+++ b/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
@@ -20,7 +20,7 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="5%p"
- latin:rowHeight="@dimen/popup_key_height"
+ latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
style="?attr/moreKeysKeyboardStyle"
>
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
index d90a5884e..fbe8cfcc0 100644
--- a/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
+++ b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
@@ -20,7 +20,7 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="8%p"
- latin:rowHeight="@dimen/popup_key_height"
+ latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
style="?attr/moreKeysKeyboardStyle"
>
</Keyboard>
diff --git a/java/res/xml-sw600dp/key_f1.xml b/java/res/xml-sw600dp/key_f1.xml
index ac0053236..ba78a6430 100644
--- a/java/res/xml-sw600dp/key_f1.xml
+++ b/java/res/xml-sw600dp/key_f1.xml
@@ -23,37 +23,14 @@
>
<switch>
<case
- latin:keyboardLayoutSetElement="symbols"
- latin:mode="url"
- >
- <Key
- latin:keyLabel=":" />
- </case>
- <case
- latin:keyboardLayoutSetElement="symbols"
- >
- <Key
- latin:keyLabel="\@" />
- </case>
- <!-- keyboardLayoutSetElement != "symbols" -->
- <case
latin:mode="email"
>
<Key
- latin:keyLabel="\@" />
- </case>
- <case
- latin:mode="url"
- >
- <Key
- latin:keyLabel="/"
- latin:keyHintLabel=":"
- latin:moreKeys=":"
- latin:keyStyle="hasShiftedLetterHintStyle" />
+ latin:keySpec="\@" />
</case>
<default>
<Key
- latin:keyLabel="/" />
+ latin:keySpec="/" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/key_question_exclamation.xml b/java/res/xml-sw600dp/key_question_exclamation.xml
index 860a0be77..edee5c5dd 100644
--- a/java/res/xml-sw600dp/key_question_exclamation.xml
+++ b/java/res/xml-sw600dp/key_question_exclamation.xml
@@ -26,11 +26,11 @@
latin:mode="email|url"
>
<Key
- latin:keyLabel="-" />
+ latin:keySpec="-" />
</case>
<default>
<Key
- latin:keyLabel="\?"
+ latin:keySpec="\?"
latin:keyHintLabel="!"
latin:moreKeys="!"
latin:keyStyle="hasShiftedLetterHintStyle" />
diff --git a/java/res/xml-sw600dp/key_shortcut.xml b/java/res/xml-sw600dp/key_shortcut.xml
index 87fc75cd5..d24e81f73 100644
--- a/java/res/xml-sw600dp/key_shortcut.xml
+++ b/java/res/xml-sw600dp/key_shortcut.xml
@@ -23,29 +23,29 @@
>
<switch>
<case
- latin:shortcutKeyEnabled="true"
+ latin:supportsSwitchingToShortcutIme="true"
latin:clobberSettingsKey="false"
>
<Key
latin:keyStyle="shortcutKeyStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/settings_as_more_key" />
+ latin:moreKeys="!text/keyspec_settings" />
</case>
<case
- latin:shortcutKeyEnabled="true"
+ latin:supportsSwitchingToShortcutIme="true"
latin:clobberSettingsKey="true"
>
<Key
latin:keyStyle="shortcutKeyStyle" />
</case>
<case
- latin:shortcutKeyEnabled="false"
+ latin:supportsSwitchingToShortcutIme="false"
latin:clobberSettingsKey="false"
>
<Key
latin:keyStyle="settingsKeyStyle" />
</case>
- <!-- shortcutKeyEnabled="false" clobberSettingsKey="true" -->
+ <!-- supportsSwitchingToShortcutIme="false" clobberSettingsKey="true" -->
<default>
<Spacer />
</default>
diff --git a/java/res/xml-sw600dp/key_space_5kw.xml b/java/res/xml-sw600dp/key_space_5kw.xml
index 86af89f50..71ae5fd8f 100644
--- a/java/res/xml-sw600dp/key_space_5kw.xml
+++ b/java/res/xml-sw600dp/key_space_5kw.xml
@@ -23,7 +23,7 @@
>
<switch>
<case
- latin:languageCode="fa"
+ latin:languageCode="fa|ne"
latin:languageSwitchKeyEnabled="true"
>
<Key
@@ -35,7 +35,7 @@
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
- latin:languageCode="fa"
+ latin:languageCode="fa|ne"
latin:languageSwitchKeyEnabled="false"
>
<Key
diff --git a/java/res/xml-sw600dp/key_space_symbols.xml b/java/res/xml-sw600dp/key_space_symbols.xml
index 07aa7d179..b3cb5ac78 100644
--- a/java/res/xml-sw600dp/key_space_symbols.xml
+++ b/java/res/xml-sw600dp/key_space_symbols.xml
@@ -21,6 +21,7 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <include
- latin:keyboardLayout="@xml/key_space_5kw" />
+ <Key
+ latin:keyStyle="spaceKeyStyle"
+ latin:keyWidth="45.0%p" />
</merge>
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index d817add11..3d5556fe5 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -39,7 +39,6 @@
<!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
<key-style
latin:styleName="baseForShiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyActionFlags="noKeyPreview"
latin:keyLabelFlags="preserveCase"
latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" />
@@ -49,7 +48,7 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:keyIcon="!icon/shift_key_shifted"
+ latin:keySpec="!icon/shift_key_shifted|!code/key_shift"
latin:backgroundType="stickyOff"
latin:parentStyle="baseForShiftKeyStyle" />
</case>
@@ -58,77 +57,56 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:keyIcon="!icon/shift_key_shifted"
+ latin:keySpec="!icon/shift_key_shifted|!code/key_shift"
latin:backgroundType="stickyOn"
latin:parentStyle="baseForShiftKeyStyle" />
</case>
<default>
<key-style
latin:styleName="shiftKeyStyle"
- latin:keyIcon="!icon/shift_key"
+ latin:keySpec="!icon/shift_key|!code/key_shift"
latin:backgroundType="stickyOff"
latin:parentStyle="baseForShiftKeyStyle" />
</default>
</switch>
<key-style
latin:styleName="deleteKeyStyle"
- latin:code="!code/key_delete"
- latin:keyIcon="!icon/delete_key"
+ latin:keySpec="!icon/delete_key|!code/key_delete"
latin:keyActionFlags="isRepeatable|noKeyPreview"
latin:backgroundType="functional" />
<include
latin:keyboardLayout="@xml/key_styles_enter" />
- <!-- Override defaultEnterKeyStyle in key_styles_enter.xml -->
- <key-style
- latin:styleName="defaultEnterKeyStyle"
- latin:code="!code/key_enter"
- latin:keyIcon="!icon/enter_key"
- latin:keyLabelFlags="preserveCase|autoXScale|followKeyLargeLabelRatio"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="functional"
- latin:parentStyle="navigateMoreKeysStyle" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:code="!code/key_space"
+ latin:keySpec=" |!code/key_space"
latin:keyActionFlags="noKeyPreview|enableLongPress" />
<!-- U+200C: ZERO WIDTH NON-JOINER
U+200D: ZERO WIDTH JOINER -->
<key-style
latin:styleName="zwnjKeyStyle"
- latin:code="0x200C"
- latin:keyIcon="!icon/zwnj_key"
+ latin:keySpec="!icon/zwnj_key|&#x200C;"
latin:moreKeys="!icon/zwj_key|&#x200D;"
latin:keyLabelFlags="hasPopupHint"
latin:keyActionFlags="noKeyPreview" />
<key-style
- latin:styleName="smileyKeyStyle"
- latin:keyLabel=":-)"
- latin:keyOutputText=":-) "
- latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/more_keys_for_smiley" />
- <key-style
latin:styleName="shortcutKeyStyle"
- latin:code="!code/key_shortcut"
- latin:keyIcon="!icon/shortcut_key"
+ latin:keySpec="!icon/shortcut_key|!code/key_shortcut"
latin:keyIconDisabled="!icon/shortcut_key_disabled"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="languageSwitchKeyStyle"
- latin:code="!code/key_language_switch"
- latin:keyIcon="!icon/language_switch_key"
+ latin:keySpec="!icon/language_switch_key|!code/key_language_switch"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress"
latin:altCode="!code/key_space" />
<key-style
latin:styleName="emojiKeyStyle"
- latin:code="!code/key_emoji"
- latin:keyIcon="!icon/emoji_key"
+ latin:keySpec="!icon/emoji_key|!code/key_emoji"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="settingsKeyStyle"
- latin:code="!code/key_settings"
- latin:keyIcon="!icon/settings_key"
+ latin:keySpec="!icon/settings_key|!code/key_settings"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<switch>
@@ -138,8 +116,7 @@
>
<key-style
latin:styleName="tabKeyStyle"
- latin:code="!code/key_action_previous"
- latin:keyIcon="!icon/tab_key"
+ latin:keySpec="!icon/tab_key|!code/key_action_previous"
latin:keyIconPreview="!icon/tab_key_preview"
latin:backgroundType="functional" />
</case>
@@ -149,16 +126,14 @@
>
<key-style
latin:styleName="tabKeyStyle"
- latin:code="!code/key_action_next"
- latin:keyIcon="!icon/tab_key"
+ latin:keySpec="!icon/tab_key|!code/key_action_next"
latin:keyIconPreview="!icon/tab_key_preview"
latin:backgroundType="functional" />
</case>
<default>
<key-style
latin:styleName="tabKeyStyle"
- latin:code="!code/key_tab"
- latin:keyIcon="!icon/tab_key"
+ latin:keySpec="!icon/tab_key|!code/key_tab"
latin:keyIconPreview="!icon/tab_key_preview"
latin:backgroundType="functional" />
</default>
@@ -170,28 +145,23 @@
latin:backgroundType="functional" />
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:code="!code/key_switch_alpha_symbol"
- latin:keyLabel="!text/label_to_symbol_key"
+ latin:keySpec="!text/keylabel_to_symbol|!code/key_switch_alpha_symbol"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="toAlphaKeyStyle"
- latin:code="!code/key_switch_alpha_symbol"
- latin:keyLabel="!text/label_to_alpha_key"
+ latin:keySpec="!text/keylabel_to_alpha|!code/key_switch_alpha_symbol"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
- latin:code="!code/key_shift"
- latin:keyLabel="!text/label_to_more_symbol_for_tablet_key"
+ latin:keySpec="!text/keylabel_tablet_to_more_symbol|!code/key_shift"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
- latin:code="!code/key_shift"
- latin:keyLabel="!text/label_to_symbol_key"
+ latin:keySpec="!text/keylabel_to_symbol|!code/key_shift"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="comKeyStyle"
- latin:keyLabel="!text/keylabel_for_popular_domain"
+ latin:keySpec="!text/keyspec_popular_domain"
latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
- latin:keyOutputText="!text/keylabel_for_popular_domain"
- latin:moreKeys="!text/more_keys_for_popular_domain" />
+ latin:moreKeys="!text/morekeys_popular_domain" />
</merge>
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index 1d8ccfae3..0699e4527 100644
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ b/java/res/xml-sw600dp/key_styles_enter.xml
@@ -21,7 +21,7 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- TODO: Stop using many conditional cases for emoji_key_as_more_key. There are way too many to maintain. -->
+ <!-- TODO: Stop using many conditional cases for keyspec_emoji_key. There are way too many to maintain. -->
<!-- Navigate more keys style -->
<switch>
<!-- latin:passwordInput="true" -->
@@ -32,7 +32,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_previous_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_previous" />
</case>
<case
latin:imeAction="actionNext"
@@ -48,7 +48,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_next_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_next" />
</case>
<case
latin:imeAction="actionPrevious"
@@ -64,7 +64,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" />
+ latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" />
</case>
<case
latin:navigateNext="true"
@@ -73,7 +73,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_next_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_next" />
</case>
<case
latin:navigateNext="false"
@@ -82,7 +82,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_previous_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_previous" />
</case>
<case
latin:navigateNext="false"
@@ -99,22 +99,11 @@
<!-- Enter key style -->
<key-style
latin:styleName="defaultEnterKeyStyle"
- latin:code="!code/key_enter"
- latin:keyIcon="!icon/enter_key"
+ latin:keySpec="!icon/enter_key|!code/key_enter"
latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional"
latin:parentStyle="navigateMoreKeysStyle" />
- <key-style
- latin:styleName="shiftEnterKeyStyle"
- latin:code="!code/key_shift_enter"
- latin:parentStyle="defaultEnterKeyStyle" />
- <key-style
- latin:styleName="defaultActionEnterKeyStyle"
- latin:code="!code/key_enter"
- latin:keyIcon="!icon/undefined"
- latin:backgroundType="action"
- latin:parentStyle="defaultEnterKeyStyle" />
<switch>
<!-- Shift + Enter in textMultiLine field. -->
<case
@@ -123,63 +112,72 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:parentStyle="shiftEnterKeyStyle" />
+ latin:keySpec="!icon/enter_key|!code/key_shift_enter"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionGo"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_go_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!text/label_go_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionNext"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_next_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!text/label_next_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionPrevious"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_previous_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!text/label_previous_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionDone"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_done_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!text/label_done_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionSend"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_send_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!text/label_send_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyIcon="!icon/search_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!icon/search_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionCustomLabel"
>
<key-style
latin:styleName="enterKeyStyle"
+ latin:keySpec="dummy_label|!code/key_enter"
latin:keyLabelFlags="fromCustomActionLabel"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<!-- imeAction is either actionNone or actionUnspecified. -->
<default>
diff --git a/java/res/xml-sw600dp/keys_arabic3_left.xml b/java/res/xml-sw600dp/keys_arabic3_left.xml
index 0f2ccc0ac..9b4031e55 100644
--- a/java/res/xml-sw600dp/keys_arabic3_left.xml
+++ b/java/res/xml-sw600dp/keys_arabic3_left.xml
@@ -23,10 +23,10 @@
>
<!-- U+0630: "ذ" ARABIC LETTER THAL -->
<Key
- latin:keyLabel="&#x0630;"
+ latin:keySpec="&#x0630;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
<Key
- latin:keyLabel="&#x0626;"
+ latin:keySpec="&#x0626;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-sw600dp/keys_comma_period.xml b/java/res/xml-sw600dp/keys_comma_period.xml
index 7604e033d..23172cf18 100644
--- a/java/res/xml-sw600dp/keys_comma_period.xml
+++ b/java/res/xml-sw600dp/keys_comma_period.xml
@@ -21,83 +21,33 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
+ <Key
+ latin:keySpec="!text/keyspec_tablet_comma"
+ latin:keyHintLabel="!text/keyhintlabel_tablet_comma"
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="!text/morekeys_tablet_comma"
+ latin:backgroundType="functional"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
<switch>
<case
- latin:mode="email|url"
+ latin:languageCode="hi"
+ latin:keyboardLayoutSet="hindi_compact"
>
+ <!-- U+0964: "।" DEVANAGARI DANDA -->
<Key
- latin:keyLabel=","
- latin:keyHintLabel="-"
- latin:moreKeys="-"
- latin:backgroundType="functional"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="."
- latin:keyHintLabel="_"
- latin:moreKeys="_"
- latin:backgroundType="functional"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- </case>
- <case
- latin:languageCode="ar"
- >
- <Key
- latin:keyLabel="!text/keylabel_for_apostrophe"
- latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
- latin:moreKeys="!text/more_keys_for_apostrophe"
- latin:backgroundType="functional"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="."
- latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_arabic_diacritics"
- latin:backgroundType="functional"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- </case>
- <case
- latin:languageCode="fa"
- >
- <Key
- latin:keyLabel="!text/keylabel_for_apostrophe"
- latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_apostrophe"
- latin:backgroundType="functional"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="."
- latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
+ latin:keySpec="\u0964"
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_arabic_diacritics"
- latin:backgroundType="functional"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- </case>
- <case
- latin:languageCode="hy"
- >
- <!-- U+055D: "՝" ARMENIAN COMMA -->
- <Key
- latin:keyLabel="&#x055D;"
+ latin:moreKeys="!autoColumnOrder!8,\\,,.,',#,),(,/,;,@,:,-,&quot;,+,\\%,&amp;"
latin:backgroundType="functional" />
- <!-- U+0589: "։" ARMENIAN FULL STOP -->
- <Key
- latin:keyLabel="&#x0589;"
- latin:keyLabelFlags="hasPopupHint"
- latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_punctuation" />
</case>
<default>
<Key
- latin:keyLabel="!text/keylabel_for_tablet_comma"
- latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
- latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_tablet_comma" />
- <Key
- latin:keyLabel="."
- latin:keyHintLabel="!text/keyhintlabel_for_period"
+ latin:keySpec="!text/keyspec_tablet_period"
+ latin:keyHintLabel="!text/keyhintlabel_tablet_period"
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="!text/morekeys_tablet_period"
latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_period" />
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/keys_dvorak_123.xml b/java/res/xml-sw600dp/keys_dvorak_123.xml
index 58416abb4..91ceb1c43 100644
--- a/java/res/xml-sw600dp/keys_dvorak_123.xml
+++ b/java/res/xml-sw600dp/keys_dvorak_123.xml
@@ -26,31 +26,31 @@
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
- latin:keyLabel="&quot;"
+ latin:keySpec="&quot;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<Key
- latin:keyLabel="&lt;"
+ latin:keySpec="&lt;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<Key
- latin:keyLabel="&gt;"
+ latin:keySpec="&gt;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3" />
</case>
<default>
<Key
- latin:keyLabel="\'"
+ latin:keySpec="\'"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="!,&quot;" />
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="\?,&lt;" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys="&gt;" />
diff --git a/java/res/xml-sw600dp/keys_exclamation_question.xml b/java/res/xml-sw600dp/keys_exclamation_question.xml
index cd38282ee..97bd95d6a 100644
--- a/java/res/xml-sw600dp/keys_exclamation_question.xml
+++ b/java/res/xml-sw600dp/keys_exclamation_question.xml
@@ -22,7 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="!" />
+ latin:keySpec="!"
+ latin:moreKeys="!text/morekeys_exclamation" />
<Key
- latin:keyLabel="\?" />
+ latin:keySpec="\?"
+ latin:moreKeys="!text/morekeys_question" />
</merge>
diff --git a/java/res/xml-sw600dp/keys_farsi3_right.xml b/java/res/xml-sw600dp/keys_farsi3_right.xml
index 3c91ae92d..45d128628 100644
--- a/java/res/xml-sw600dp/keys_farsi3_right.xml
+++ b/java/res/xml-sw600dp/keys_farsi3_right.xml
@@ -23,10 +23,10 @@
>
<!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
- latin:keyLabel="&#x0622;"
+ latin:keySpec="&#x0622;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0686: "چ" ARABIC LETTER TCHEH -->
<Key
- latin:keyLabel="&#x0686;"
+ latin:keySpec="&#x0686;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
index 324e025ed..76ac6bbdd 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
@@ -23,20 +23,20 @@
>
<switch>
<case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
- latin:keyLabel="["
+ latin:keySpec="["
latin:keyHintLabel="{"
latin:additionalMoreKeys="{"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="]"
+ latin:keySpec="]"
latin:keyHintLabel="}"
latin:additionalMoreKeys="}"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="\\"
+ latin:keySpec="\\"
latin:keyHintLabel="|"
latin:additionalMoreKeys="\\|"
latin:keyStyle="hasShiftedLetterHintStyle" />
@@ -44,11 +44,11 @@
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<Key
- latin:keyLabel="{" />
+ latin:keySpec="{" />
<Key
- latin:keyLabel="}" />
+ latin:keySpec="}" />
<Key
- latin:keyLabel="|" />
+ latin:keySpec="|" />
</default>
</switch>
</merge> \ No newline at end of file
diff --git a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
index 254b5e571..f18fb507c 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
@@ -23,15 +23,15 @@
>
<switch>
<case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
- latin:keyLabel=";"
+ latin:keySpec=";"
latin:keyHintLabel=":"
latin:additionalMoreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="\'"
+ latin:keySpec="\'"
latin:keyHintLabel="&quot;"
latin:additionalMoreKeys="&quot;"
latin:keyStyle="hasShiftedLetterHintStyle"
@@ -40,9 +40,9 @@
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<Key
- latin:keyLabel=":" />
+ latin:keySpec=":" />
<Key
- latin:keyLabel="&quot;"
+ latin:keySpec="&quot;"
latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
</default>
</switch>
diff --git a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
index 774ff8d05..9ac718cd8 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
@@ -23,24 +23,24 @@
>
<switch>
<case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyHintLabel="&lt;"
latin:additionalMoreKeys="&lt;"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyHintLabel="&gt;"
latin:additionalMoreKeys="&gt;"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="/"
+ latin:keySpec="/"
latin:keyHintLabel="\?"
latin:additionalMoreKeys="\?"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_question" />
+ latin:moreKeys="!text/morekeys_question" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
@@ -51,14 +51,14 @@
U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
- latin:keyLabel="&lt;"
+ latin:keySpec="&lt;"
latin:moreKeys="!fixedColumnOrder!3,&#x2039;,&#x2264;,&#x00AB;" />
<Key
- latin:keyLabel="&gt;"
+ latin:keySpec="&gt;"
latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
<Key
- latin:keyLabel="\?"
- latin:moreKeys="!text/more_keys_for_symbols_question" />
+ latin:keySpec="\?"
+ latin:moreKeys="!text/morekeys_question" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/row_dvorak4.xml b/java/res/xml-sw600dp/row_dvorak4.xml
index 11b403452..2ba6a491b 100644
--- a/java/res/xml-sw600dp/row_dvorak4.xml
+++ b/java/res/xml-sw600dp/row_dvorak4.xml
@@ -39,7 +39,7 @@
<include
latin:keyboardLayout="@xml/key_question_exclamation" />
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:keyHintLabel="_"
latin:moreKeys="_"
latin:keyStyle="hasShiftedLetterHintStyle" />
diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml
index b854f1051..52b581ae6 100644
--- a/java/res/xml-sw600dp/row_pcqwerty5.xml
+++ b/java/res/xml-sw600dp/row_pcqwerty5.xml
@@ -24,37 +24,32 @@
<Row
latin:keyWidth="7.0%p"
>
+ <include
+ latin:keyWidth="9.0%p"
+ latin:keyboardLayout="@xml/key_shortcut" />
<switch>
<case
latin:languageSwitchKeyEnabled="true"
>
<Key
latin:keyStyle="languageSwitchKeyStyle"
- latin:keyWidth="9.0%p"
- latin:backgroundType="functional" />
- </case>
- </switch>
- <Key
- latin:keyStyle="spaceKeyStyle"
- latin:keyXPos="25.5%p"
- latin:keyWidth="49.0%p" />
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
- >
- <include
- latin:keyXPos="-9.0%p"
- latin:keyWidth="9.0%p"
- latin:keyboardLayout="@xml/key_shortcut" />
+ latin:keyXPos="22.0%p"
+ latin:keyWidth="9.0%p" />
+ <Key
+ latin:keyStyle="spaceKeyStyle"
+ latin:keyWidth="40.0%p" />
</case>
- <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
- <include
- latin:keyXPos="-9.0%p"
- latin:keyWidth="9.0%p"
- latin:backgroundType="functional"
- latin:keyboardLayout="@xml/key_f2" />
+ <Key
+ latin:keyStyle="spaceKeyStyle"
+ latin:keyXPos="29.0%p"
+ latin:keyWidth="42.0%p" />
</default>
</switch>
+ <include
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="9.0%p"
+ latin:backgroundType="functional"
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_dvorak3.xml b/java/res/xml-sw600dp/rowkeys_dvorak3.xml
index 2148bb2c7..e58d6dbef 100644
--- a/java/res/xml-sw600dp/rowkeys_dvorak3.xml
+++ b/java/res/xml-sw600dp/rowkeys_dvorak3.xml
@@ -22,26 +22,26 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="q" />
+ latin:keySpec="q" />
<Key
- latin:keyLabel="j"
- latin:moreKeys="!text/more_keys_for_j" />
+ latin:keySpec="j"
+ latin:moreKeys="!text/morekeys_j" />
<Key
- latin:keyLabel="k"
- latin:moreKeys="!text/more_keys_for_k" />
+ latin:keySpec="k"
+ latin:moreKeys="!text/morekeys_k" />
<Key
- latin:keyLabel="x" />
+ latin:keySpec="x" />
<Key
- latin:keyLabel="b" />
+ latin:keySpec="b" />
<Key
- latin:keyLabel="m" />
+ latin:keySpec="m" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="!text/more_keys_for_w" />
+ latin:keySpec="w"
+ latin:moreKeys="!text/morekeys_w" />
<Key
- latin:keyLabel="v"
- latin:moreKeys="!text/more_keys_for_v" />
+ latin:keySpec="v"
+ latin:moreKeys="!text/morekeys_v" />
<Key
- latin:keyLabel="z"
- latin:moreKeys="!text/more_keys_for_z" />
+ latin:keySpec="z"
+ latin:moreKeys="!text/morekeys_z" />
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
index 254d3fdba..e4b824f80 100644
--- a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
+++ b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
@@ -21,87 +21,98 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Key
- latin:keyLabel="`"
- latin:keyHintLabel="~"
- latin:additionalMoreKeys="~"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="1"
- latin:keyHintLabel="!"
- latin:additionalMoreKeys="!"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_exclamation,!text/more_keys_for_symbols_1" />
- <Key
- latin:keyLabel="2"
- latin:keyHintLabel="\@"
- latin:additionalMoreKeys="\@"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_2" />
- <Key
- latin:keyLabel="3"
- latin:keyHintLabel="\#"
- latin:additionalMoreKeys="\#"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_3" />
- <Key
- latin:keyLabel="4"
- latin:keyHintLabel="$"
- latin:additionalMoreKeys="$"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_4" />
- <Key
- latin:keyLabel="5"
- latin:keyHintLabel="%"
- latin:additionalMoreKeys="\\%"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_5" />
- <Key
- latin:keyLabel="6"
- latin:keyHintLabel="^"
- latin:additionalMoreKeys="^"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_6" />
- <Key
- latin:keyLabel="7"
- latin:keyHintLabel="&amp;"
- latin:additionalMoreKeys="&amp;"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_7" />
- <Key
- latin:keyLabel="8"
- latin:keyHintLabel="*"
- latin:additionalMoreKeys="*"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_8" />
- <Key
- latin:keyLabel="9"
- latin:keyHintLabel="("
- latin:additionalMoreKeys="("
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_9" />
- <Key
- latin:keyLabel="0"
- latin:keyHintLabel=")"
- latin:additionalMoreKeys=")"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_0" />
- <!-- U+2013: "–" EN DASH
- U+2014: "—" EM DASH
- U+00B7: "·" MIDDLE DOT -->
- <Key
- latin:keyLabel="-"
- latin:keyHintLabel="_"
- latin:additionalMoreKeys="_"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
- <!-- U+221E: "∞" INFINITY
- U+2260: "≠" NOT EQUAL TO
- U+2248: "≈" ALMOST EQUAL TO -->
- <Key
- latin:keyLabel="="
- latin:keyHintLabel="+"
- latin:additionalMoreKeys="+"
- latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="&#x221E;,&#x2260;,&#x2248;" />
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
+ >
+ <Key
+ latin:keySpec="`"
+ latin:keyHintLabel="~"
+ latin:additionalMoreKeys="~"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
+ <Key
+ latin:keySpec="1"
+ latin:keyHintLabel="!"
+ latin:additionalMoreKeys="!"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/morekeys_exclamation,!text/morekeys_symbols_1" />
+ <Key
+ latin:keySpec="2"
+ latin:keyHintLabel="\@"
+ latin:additionalMoreKeys="\@"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/morekeys_symbols_2" />
+ <Key
+ latin:keySpec="3"
+ latin:keyHintLabel="\#"
+ latin:additionalMoreKeys="\#"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/morekeys_symbols_3" />
+ <Key
+ latin:keySpec="4"
+ latin:keyHintLabel="$"
+ latin:additionalMoreKeys="$"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/morekeys_symbols_4" />
+ <Key
+ latin:keySpec="5"
+ latin:keyHintLabel="%"
+ latin:additionalMoreKeys="\\%"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/morekeys_symbols_5" />
+ <Key
+ latin:keySpec="6"
+ latin:keyHintLabel="^"
+ latin:additionalMoreKeys="^"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/morekeys_symbols_6" />
+ <Key
+ latin:keySpec="7"
+ latin:keyHintLabel="&amp;"
+ latin:additionalMoreKeys="&amp;"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/morekeys_symbols_7" />
+ <Key
+ latin:keySpec="8"
+ latin:keyHintLabel="*"
+ latin:additionalMoreKeys="*"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/morekeys_symbols_8" />
+ <Key
+ latin:keySpec="9"
+ latin:keyHintLabel="("
+ latin:additionalMoreKeys="("
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/morekeys_symbols_9" />
+ <Key
+ latin:keySpec="0"
+ latin:keyHintLabel=")"
+ latin:additionalMoreKeys=")"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/morekeys_symbols_0" />
+ <!-- U+2013: "–" EN DASH
+ U+2014: "—" EM DASH
+ U+00B7: "·" MIDDLE DOT -->
+ <Key
+ latin:keySpec="-"
+ latin:keyHintLabel="_"
+ latin:additionalMoreKeys="_"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
+ <!-- U+221E: "∞" INFINITY
+ U+2260: "≠" NOT EQUAL TO
+ U+2248: "≈" ALMOST EQUAL TO -->
+ <Key
+ latin:keySpec="="
+ latin:keyHintLabel="+"
+ latin:additionalMoreKeys="+"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="&#x221E;,&#x2260;,&#x2248;" />
+ </case>
+ <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" -->
+ <default>
+ <include
+ latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
+ </default>
+ </switch>
</merge>
diff --git a/java/res/xml-sw600dp/rows_colemak.xml b/java/res/xml-sw600dp/rows_colemak.xml
index ab059da83..7559bfb96 100644
--- a/java/res/xml-sw600dp/rows_colemak.xml
+++ b/java/res/xml-sw600dp/rows_colemak.xml
@@ -28,8 +28,6 @@
>
<include
latin:keyboardLayout="@xml/rowkeys_colemak1" />
- <include
- latin:keyboardLayout="@xml/key_colemak_colon" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml
index 066dc47fb..60ee478d8 100644
--- a/java/res/xml-sw600dp/rows_greek.xml
+++ b/java/res/xml-sw600dp/rows_greek.xml
@@ -27,8 +27,6 @@
latin:keyWidth="9.0%p"
>
<include
- latin:keyboardLayout="@xml/key_greek_semicolon" />
- <include
latin:keyboardLayout="@xml/rowkeys_greek1" />
<Key
latin:keyStyle="deleteKeyStyle"
diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
index 852e17683..86b34202f 100644
--- a/java/res/xml-sw600dp/rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -45,8 +45,10 @@
latin:keyWidth="9.0%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_hebrew3"
- latin:keyXPos="10.0%p" />
+ latin:keyboardLayout="@xml/rowkeys_hebrew3" />
+ <include
+ latin:keyboardLayout="@xml/keys_exclamation_question"
+ latin:keyWidth="9.5%p" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_hindi_compact.xml b/java/res/xml-sw600dp/rows_hindi_compact.xml
new file mode 100644
index 000000000..ac476eb3b
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_hindi_compact.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="8.182%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="8.182%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="8.182%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
+ <include
+ latin:keyboardLayout="@xml/keys_exclamation_question" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/rows_myanmar.xml b/java/res/xml-sw600dp/rows_myanmar.xml
new file mode 100644
index 000000000..8eedf9d2f
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_myanmar.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="9.0%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_myanmar1" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="9.0%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_myanmar2" />
+ </Row>
+ <Row
+ latin:keyWidth="9.0%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_myanmar3" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="9.0%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="10.0%p" />
+ <include
+ latin:keyboardLayout="@xml/rowkeys_myanmar4" />
+ <include
+ latin:keyboardLayout="@xml/keys_exclamation_question" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
index 37bf2e808..757e77933 100644
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -23,29 +23,29 @@
>
<Row>
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="+"
+ latin:keySpec="+"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="1"
+ latin:keySpec="1"
latin:keyStyle="numKeyStyle"
latin:keyXPos="31%p" />
<Key
- latin:keyLabel="2"
+ latin:keySpec="2"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="3"
+ latin:keySpec="3"
latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -58,7 +58,7 @@
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="/"
+ latin:keySpec="/"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
@@ -67,30 +67,30 @@
latin:mode="time|datetime"
>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_am_pm"
+ latin:moreKeys="!text/morekeys_am_pm"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</case>
<default>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</default>
</switch>
<Key
- latin:keyLabel="4"
+ latin:keySpec="4"
latin:keyStyle="numKeyStyle"
latin:keyXPos="31%p" />
<Key
- latin:keyLabel="5"
+ latin:keySpec="5"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="6"
+ latin:keySpec="6"
latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="enterKeyStyle"
@@ -99,12 +99,12 @@
</Row>
<Row>
<Key
- latin:keyLabel="("
+ latin:keySpec="("
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel=")"
+ latin:keySpec=")"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
@@ -113,28 +113,28 @@
latin:mode="time|datetime"
>
<Key
- latin:keyLabel=":"
+ latin:keySpec=":"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</case>
<default>
<Key
- latin:keyLabel="="
+ latin:keySpec="="
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</default>
</switch>
<Key
- latin:keyLabel="7"
+ latin:keySpec="7"
latin:keyStyle="numKeyStyle"
latin:keyXPos="31%p" />
<Key
- latin:keyLabel="8"
+ latin:keySpec="8"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="9"
+ latin:keySpec="9"
latin:keyStyle="numKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer />
@@ -148,10 +148,10 @@
latin:keyStyle="numStarKeyStyle"
latin:keyXPos="31%p" />
<Key
- latin:keyLabel="0"
+ latin:keySpec="0"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="\#"
+ latin:keySpec="\#"
latin:keyStyle="numKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
diff --git a/java/res/xml-sw600dp/rows_pcqwerty.xml b/java/res/xml-sw600dp/rows_pcqwerty.xml
index 8714815ef..73b7e473e 100644
--- a/java/res/xml-sw600dp/rows_pcqwerty.xml
+++ b/java/res/xml-sw600dp/rows_pcqwerty.xml
@@ -26,19 +26,8 @@
<Row
latin:keyWidth="7.0%p"
>
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
- >
- <include
- latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
- </case>
- <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
- <default>
- <include
- latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
- </default>
- </switch>
+ <include
+ latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
@@ -56,7 +45,7 @@
latin:keyWidth="7.0%p"
>
<Spacer
- latin:keyWidth="12.0%p" />
+ latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty3" />
<Key
diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
index c4799bbcd..9022bc532 100644
--- a/java/res/xml-sw600dp/rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -27,12 +27,12 @@
latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="+"
+ latin:keySpec="+"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
@@ -54,12 +54,12 @@
</Row>
<Row>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
@@ -81,17 +81,17 @@
</Row>
<Row>
<Key
- latin:keyLabel="("
+ latin:keySpec="("
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel=")"
+ latin:keySpec=")"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="N"
+ latin:keySpec="N"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
@@ -116,7 +116,7 @@
<Key
latin:keyStyle="num0KeyStyle" />
<Key
- latin:keyLabel="\#"
+ latin:keySpec="\#"
latin:keyStyle="numKeyStyle" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/rows_swiss.xml b/java/res/xml-sw600dp/rows_swiss.xml
new file mode 100644
index 000000000..4f4ca85b4
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_swiss.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="8.182%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_swiss1" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="8.182%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_swiss2" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="8.182%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="10.0%p" />
+ <Spacer
+ latin:keyWidth="3.181%p" />
+ <include
+ latin:keyboardLayout="@xml/rowkeys_qwertz3" />
+ <include
+ latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyXPos="-10.0%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
index cf94b06ed..a915c3351 100644
--- a/java/res/xml-sw600dp/rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -51,9 +51,9 @@
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="10.0%p" />
<Key
- latin:keyLabel="\\" />
+ latin:keySpec="\\" />
<Key
- latin:keyLabel="=" />
+ latin:keySpec="=" />
<include
latin:keyboardLayout="@xml/rowkeys_symbols3" />
<Key
@@ -62,6 +62,7 @@
</Row>
<Row
latin:keyWidth="9.0%p"
+ latin:backgroundType="functional"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index 92299f65d..7ead4d5b1 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -54,16 +54,17 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<Key
- latin:keyLabel="&#x00A1;" />
+ latin:keySpec="&#x00A1;" />
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<Key
- latin:keyLabel="&#x00BF;" />
+ latin:keySpec="&#x00BF;" />
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="9.0%p"
+ latin:backgroundType="functional"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
new file mode 100644
index 000000000..71439d68c
--- /dev/null
+++ b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- The code point U+25CC for key label is needed because the font rendering system prior to
+ API version 16 can't automatically render dotted circle for incomplete combining letter
+ of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
+ counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <switch>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
+ U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
+ U+093C: "़" DEVANAGARI SIGN NUKTA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignAnusvara"
+ latin:moreKeys="&#x0903;,&#x0901;,&#x093C;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariSignAnusvara" />
+ </default>
+ </switch>
+ <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
+ <key-style
+ latin:styleName="baseKeyDevanagariSignAnusvara"
+ latin:parentStyle="moreKeysDevanagariSignAnusvara"
+ latin:keySpec="&#x0902;"
+ latin:keyLabelFlags="fontNormal" />
+</merge>
diff --git a/java/res/xml-v16/key_devanagari_sign_candrabindu.xml b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
index 03017dd78..6198d01a9 100644
--- a/java/res/xml-v16/key_devanagari_sign_candrabindu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
@@ -29,8 +29,7 @@
<case
latin:keyboardLayoutSet="hindi"
>
- <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
+ <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
<key-style
latin:styleName="moreKeysDevanagariSignCandrabindu"
latin:moreKeys="&#x0945;" />
@@ -41,8 +40,9 @@
</default>
</switch>
<!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
- <Key
- latin:keyStyle="moreKeysDevanagariSignCandrabindu"
- latin:keyLabel="&#x0901;"
+ <key-style
+ latin:styleName="baseKeyDevanagariSignCandrabindu"
+ latin:parentStyle="moreKeysDevanagariSignCandrabindu"
+ latin:keySpec="&#x0901;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/key_devanagari_sign_nukta.xml b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
index 09c347706..e0b47bb6f 100644
--- a/java/res/xml-v16/key_devanagari_sign_nukta.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
@@ -36,14 +36,23 @@
latin:styleName="moreKeysDevanagariSignNukta"
latin:moreKeys="&#x097D;,&#x0970;,&#x093D;" />
</case>
+ <case
+ latin:keyboardLayoutSet="nepali_romanized"
+ >
+ <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignNukta"
+ latin:moreKeys="&#x093C;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariSignNukta" />
</default>
</switch>
<!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
- <Key
- latin:keyStyle="moreKeysDevanagariSignNukta"
- latin:keyLabel="&#x093C;"
+ <key-style
+ latin:styleName="baseKeyDevanagariSignNukta"
+ latin:parentStyle="moreKeysDevanagariSignNukta"
+ latin:keySpec="&#x093C;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
index a2fbf53d3..0c3a29b16 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
@@ -25,9 +25,24 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
+ <switch>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignVirama"
+ latin:moreKeys="&#x094D;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariSignVirama" />
+ </default>
+ </switch>
<!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
<key-style
latin:styleName="baseKeyDevanagariSignVirama"
- latin:keyLabel="&#x094D;"
+ latin:parentStyle="moreKeysDevanagariSignVirama"
+ latin:keySpec="&#x094D;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
index ac56cb77b..b047893a6 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
@@ -28,6 +28,6 @@
<!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
<key-style
latin:styleName="baseKeyDevanagariSignVisarga"
- latin:keyLabel="&#x0903;"
+ latin:keySpec="&#x0903;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
index 8e256032c..5bb0351ec 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
@@ -35,6 +35,14 @@
latin:styleName="moreKeysDevanagariVowelSignAa"
latin:moreKeys="&#x093E;&#x0902;,&#x093E;&#x0901;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAa"
+ latin:moreKeys="&#x093E;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignAa" />
@@ -44,6 +52,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignAa"
latin:parentStyle="moreKeysDevanagariVowelSignAa"
- latin:keyLabel="&#x093E;"
+ latin:keySpec="&#x093E;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
index e79033971..8edf6eb1c 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
@@ -35,6 +35,14 @@
latin:moreKeys="&#x0948;&#x0902;,%" />
</case>
<case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAi"
+ latin:moreKeys="&#x0948;,%" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
@@ -51,6 +59,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignAi"
latin:parentStyle="moreKeysDevanagariVowelSignAi"
- latin:keyLabel="&#x0948;"
+ latin:keySpec="&#x0948;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
index 43387a388..212e058d1 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
@@ -34,6 +34,14 @@
latin:styleName="moreKeysDevanagariVowelSignAu"
latin:moreKeys="&#x094C;&#x0902;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAu"
+ latin:moreKeys="&#x094C;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignAu" />
@@ -43,6 +51,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignAu"
latin:parentStyle="moreKeysDevanagariVowelSignAu"
- latin:keyLabel="&#x094C;"
+ latin:keySpec="&#x094C;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/key_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
index 27c7bff5a..ef2c3f14b 100644
--- a/java/res/xml-v16/key_devanagari_sign_anusvara.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2013, The Android Open Source Project
+** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -25,8 +25,18 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
- <Key
- latin:keyLabel="&#x0902;"
- latin:keyLabelFlags="fontNormal" />
+ <switch>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraE"
+ latin:moreKeys="&#x0945;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraE" />
+ </default>
+ </switch>
</merge>
diff --git a/java/res/xml-v16/key_devanagari_vowel_sign_candra_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
index 0316a7bde..ac01d37b7 100644
--- a/java/res/xml-v16/key_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -25,8 +25,24 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
+ <switch>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraO"
+ latin:moreKeys="&#x0949;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraO" />
+ </default>
+ </switch>
<!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
- <Key
- latin:keyLabel="&#x0949;"
+ <key-style
+ latin:styleName="baseKeyDevanagariVowelSignCandraO"
+ latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
+ latin:keySpec="&#x0949;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
index c70d9d944..77d6eb5e0 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
@@ -35,6 +35,14 @@
latin:moreKeys="&#x0947;&#x0902;" />
</case>
<case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignE"
+ latin:moreKeys="&#x0947;" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
@@ -52,6 +60,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignE"
latin:parentStyle="moreKeysDevanagariVowelSignE"
- latin:keyLabel="&#x0947;"
+ latin:keySpec="&#x0947;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
index 845c1b02e..d79447be5 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
@@ -34,6 +34,14 @@
latin:styleName="moreKeysDevanagariVowelSignI"
latin:moreKeys="&#x093F;&#x0902;" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignI"
+ latin:moreKeys="&#x093F;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignI" />
@@ -43,6 +51,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignI"
latin:parentStyle="moreKeysDevanagariVowelSignI"
- latin:keyLabel="&#x093F;"
+ latin:keySpec="&#x093F;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
index 0de9650be..0e10f3172 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
@@ -34,6 +34,14 @@
latin:styleName="moreKeysDevanagariVowelSignIi"
latin:moreKeys="&#x0940;&#x0902;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignIi"
+ latin:moreKeys="&#x0940;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignIi" />
@@ -43,6 +51,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignIi"
latin:parentStyle="moreKeysDevanagariVowelSignIi"
- latin:keyLabel="&#x0940;"
+ latin:keySpec="&#x0940;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
index 06f07fac9..47ca906ce 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
@@ -29,13 +29,21 @@
<case
latin:keyboardLayoutSet="hindi"
>
- <!-- U+094B/U+0902: "қं" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
+ <!-- U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O -->
<key-style
latin:styleName="moreKeysDevanagariVowelSignO"
latin:moreKeys="&#x094B;&#x0902;,&#x0949;,&#x094A;" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignO"
+ latin:moreKeys="&#x094B;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignO" />
@@ -45,6 +53,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignO"
latin:parentStyle="moreKeysDevanagariVowelSignO"
- latin:keyLabel="&#x094B;"
+ latin:keySpec="&#x094B;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
index 469a27bdf..694e4abe7 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
@@ -35,6 +35,14 @@
latin:styleName="moreKeysDevanagariVowelSignU"
latin:moreKeys="&#x0941;&#x0902;,&#x0941;&#x0901;" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignU"
+ latin:moreKeys="&#x0941;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignU" />
@@ -44,6 +52,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignU"
latin:parentStyle="moreKeysDevanagariVowelSignU"
- latin:keyLabel="&#x0941;"
+ latin:keySpec="&#x0941;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
index 25867c086..f17489e3a 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
@@ -35,6 +35,14 @@
latin:styleName="moreKeysDevanagariVowelSignUu"
latin:moreKeys="&#x0942;&#x0902;,&#x0942;&#x0901;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignUu"
+ latin:moreKeys="&#x0942;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignUu" />
@@ -44,6 +52,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignUu"
latin:parentStyle="moreKeysDevanagariVowelSignUu"
- latin:keyLabel="&#x0942;"
+ latin:keySpec="&#x0942;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/key_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 4dd3e85cc..27098466d 100644
--- a/java/res/xml-v16/key_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -35,6 +35,15 @@
latin:moreKeys="&#x0944;" />
</case>
<case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
+ U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignVocalicR"
+ latin:moreKeys="&#x090B;,&#x0943;" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0913: "ओ" DEVANAGARI LETTER O -->
@@ -48,8 +57,9 @@
</default>
</switch>
<!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
- <Key
- latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
- latin:keyLabel="&#x0943;"
+ <key-style
+ latin:styleName="baseKeyDevanagariVowelSignVocalicR"
+ latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
+ latin:keySpec="&#x0943;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/kbd_armenian_phonetic.xml b/java/res/xml/kbd_armenian_phonetic.xml
index 1eb3c7e7d..da12870ed 100644
--- a/java/res/xml/kbd_armenian_phonetic.xml
+++ b/java/res/xml/kbd_armenian_phonetic.xml
@@ -21,9 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
- latin:verticalGap="@fraction/key_bottom_gap_5row"
- latin:keyLetterSize="@fraction/key_letter_ratio_5row"
- latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row"
+ latin:verticalGap="@fraction/config_key_vertical_gap_5row"
+ latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
+ latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
>
<include
diff --git a/java/res/xml/kbd_emoji_category1.xml b/java/res/xml/kbd_emoji_category1.xml
index c11a83017..5145ea9d3 100644
--- a/java/res/xml/kbd_emoji_category1.xml
+++ b/java/res/xml/kbd_emoji_category1.xml
@@ -20,9 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="@fraction/emoji_keyboard_key_width"
+ latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p"
- latin:rowHeight="@fraction/emoji_keyboard_row_height"
+ latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
>
<GridRows
latin:codesArray="@array/emoji_faces"
diff --git a/java/res/xml/kbd_emoji_category2.xml b/java/res/xml/kbd_emoji_category2.xml
index d3e5890ea..ac8784f4b 100644
--- a/java/res/xml/kbd_emoji_category2.xml
+++ b/java/res/xml/kbd_emoji_category2.xml
@@ -20,9 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="@fraction/emoji_keyboard_key_width"
+ latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p"
- latin:rowHeight="@fraction/emoji_keyboard_row_height"
+ latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
>
<GridRows
latin:codesArray="@array/emoji_objects"
diff --git a/java/res/xml/kbd_emoji_category3.xml b/java/res/xml/kbd_emoji_category3.xml
index 0efafa814..88c4db92b 100644
--- a/java/res/xml/kbd_emoji_category3.xml
+++ b/java/res/xml/kbd_emoji_category3.xml
@@ -20,9 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="@fraction/emoji_keyboard_key_width"
+ latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p"
- latin:rowHeight="@fraction/emoji_keyboard_row_height"
+ latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
>
<GridRows
latin:codesArray="@array/emoji_nature"
diff --git a/java/res/xml/kbd_emoji_category4.xml b/java/res/xml/kbd_emoji_category4.xml
index e5291207f..262384d80 100644
--- a/java/res/xml/kbd_emoji_category4.xml
+++ b/java/res/xml/kbd_emoji_category4.xml
@@ -20,9 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="@fraction/emoji_keyboard_key_width"
+ latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p"
- latin:rowHeight="@fraction/emoji_keyboard_row_height"
+ latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
>
<GridRows
latin:codesArray="@array/emoji_places"
diff --git a/java/res/xml/kbd_emoji_category5.xml b/java/res/xml/kbd_emoji_category5.xml
index 1836879d6..bf823f978 100644
--- a/java/res/xml/kbd_emoji_category5.xml
+++ b/java/res/xml/kbd_emoji_category5.xml
@@ -20,9 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="@fraction/emoji_keyboard_key_width"
+ latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p"
- latin:rowHeight="@fraction/emoji_keyboard_row_height"
+ latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
>
<GridRows
latin:codesArray="@array/emoji_symbols"
diff --git a/java/res/xml/kbd_emoji_category6.xml b/java/res/xml/kbd_emoji_category6.xml
index b47ebfec0..edb82fc64 100644
--- a/java/res/xml/kbd_emoji_category6.xml
+++ b/java/res/xml/kbd_emoji_category6.xml
@@ -20,10 +20,10 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="@fraction/emoji_keyboard_key_width"
+ latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p"
latin:keyLabelSize="60%p"
- latin:rowHeight="@fraction/emoji_keyboard_row_height"
+ latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
>
<GridRows
latin:textsArray="@array/emoji_emoticons"
diff --git a/java/res/xml/kbd_emoji_recents.xml b/java/res/xml/kbd_emoji_recents.xml
index 73926ecc0..edf3872c1 100644
--- a/java/res/xml/kbd_emoji_recents.xml
+++ b/java/res/xml/kbd_emoji_recents.xml
@@ -20,10 +20,10 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="@fraction/emoji_keyboard_key_width"
- latin:keyLetterSize="@fraction/emoji_keyboard_key_letter_size"
+ latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
+ latin:keyLetterSize="@fraction/config_emoji_keyboard_key_letter_size"
latin:keyLabelSize="60%p"
- latin:rowHeight="@fraction/emoji_keyboard_row_height"
+ latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
>
<GridRows
latin:codesArray="@array/emoji_recents"
diff --git a/java/res/xml-sw600dp/key_colemak_colon.xml b/java/res/xml/kbd_hindi_compact.xml
index a5a6e9526..7502bba9e 100644
--- a/java/res/xml-sw600dp/key_colemak_colon.xml
+++ b/java/res/xml/kbd_hindi_compact.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2012, The Android Open Source Project
+** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -18,12 +18,9 @@
*/
-->
-<merge
+<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Key
- latin:keyLabel=":"
- latin:keyHintLabel=";"
- latin:moreKeys=";"
- latin:keyStyle="hasShiftedLetterHintStyle" />
-</merge>
+ <include
+ latin:keyboardLayout="@xml/rows_hindi_compact" />
+</Keyboard>
diff --git a/java/res/xml/kbd_khmer.xml b/java/res/xml/kbd_khmer.xml
index 7a2337a48..d703e78f7 100644
--- a/java/res/xml/kbd_khmer.xml
+++ b/java/res/xml/kbd_khmer.xml
@@ -21,9 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
- latin:verticalGap="@fraction/key_bottom_gap_5row"
- latin:keyLetterSize="@fraction/key_letter_ratio_5row"
- latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row"
+ latin:verticalGap="@fraction/config_key_vertical_gap_5row"
+ latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
+ latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
>
<include
diff --git a/java/res/xml/kbd_lao.xml b/java/res/xml/kbd_lao.xml
index 2bba330de..6f7709562 100644
--- a/java/res/xml/kbd_lao.xml
+++ b/java/res/xml/kbd_lao.xml
@@ -21,9 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
- latin:verticalGap="@fraction/key_bottom_gap_5row"
- latin:keyLetterSize="@fraction/key_letter_ratio_5row"
- latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row"
+ latin:verticalGap="@fraction/config_key_vertical_gap_5row"
+ latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
+ latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
>
<include
diff --git a/java/res/xml/kbd_more_keys_keyboard_template.xml b/java/res/xml/kbd_more_keys_keyboard_template.xml
index 537973d03..7104ec7e0 100644
--- a/java/res/xml/kbd_more_keys_keyboard_template.xml
+++ b/java/res/xml/kbd_more_keys_keyboard_template.xml
@@ -20,7 +20,7 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="10%p"
- latin:rowHeight="@dimen/popup_key_height"
+ latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
style="?attr/moreKeysKeyboardStyle"
>
</Keyboard>
diff --git a/java/res/xml/kbd_myanmar.xml b/java/res/xml/kbd_myanmar.xml
new file mode 100644
index 000000000..af997b1c8
--- /dev/null
+++ b/java/res/xml/kbd_myanmar.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:rowHeight="20%p"
+ latin:verticalGap="@fraction/config_key_vertical_gap_5row"
+ latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
+ latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
+ latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_myanmar" />
+</Keyboard>
diff --git a/java/res/xml/kbd_pcqwerty.xml b/java/res/xml/kbd_pcqwerty.xml
index 5155bc510..045696451 100644
--- a/java/res/xml/kbd_pcqwerty.xml
+++ b/java/res/xml/kbd_pcqwerty.xml
@@ -21,9 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
- latin:verticalGap="@fraction/key_bottom_gap_5row"
- latin:keyLetterSize="@fraction/key_letter_ratio_5row"
- latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row"
+ latin:verticalGap="@fraction/config_key_vertical_gap_5row"
+ latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
+ latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
>
<include
diff --git a/java/res/xml/kbd_suggestions_pane_template.xml b/java/res/xml/kbd_suggestions_pane_template.xml
index 21316e6bb..5b4f60673 100644
--- a/java/res/xml/kbd_suggestions_pane_template.xml
+++ b/java/res/xml/kbd_suggestions_pane_template.xml
@@ -20,6 +20,6 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="10%p"
- latin:rowHeight="@dimen/more_suggestions_row_height"
+ latin:rowHeight="@dimen/config_more_suggestions_row_height"
>
</Keyboard>
diff --git a/java/res/xml-sw600dp/key_azerty3_right.xml b/java/res/xml/kbd_swiss.xml
index a5a6e9526..c64ad1103 100644
--- a/java/res/xml-sw600dp/key_azerty3_right.xml
+++ b/java/res/xml/kbd_swiss.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2012, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -18,12 +18,9 @@
*/
-->
-<merge
+<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Key
- latin:keyLabel=":"
- latin:keyHintLabel=";"
- latin:moreKeys=";"
- latin:keyStyle="hasShiftedLetterHintStyle" />
-</merge>
+ <include
+ latin:keyboardLayout="@xml/rows_swiss" />
+</Keyboard>
diff --git a/java/res/xml/kbd_thai.xml b/java/res/xml/kbd_thai.xml
index 294bffb5b..7e65217f9 100644
--- a/java/res/xml/kbd_thai.xml
+++ b/java/res/xml/kbd_thai.xml
@@ -21,9 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
- latin:verticalGap="@fraction/key_bottom_gap_5row"
- latin:keyLetterSize="@fraction/key_letter_ratio_5row"
- latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row"
+ latin:verticalGap="@fraction/config_key_vertical_gap_5row"
+ latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
+ latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
>
<include
diff --git a/java/res/xml/key_armenian_sha.xml b/java/res/xml/key_armenian_sha.xml
index 3865c1984..b6418f26f 100644
--- a/java/res/xml/key_armenian_sha.xml
+++ b/java/res/xml/key_armenian_sha.xml
@@ -23,6 +23,6 @@
>
<!-- U+0577: "շ" ARMENIAN SMALL LETTER SHA -->
<Key
- latin:keyLabel="&#x0577;"
+ latin:keySpec="&#x0577;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/key_armenian_xeh.xml b/java/res/xml/key_armenian_xeh.xml
index 007a5802d..cfc5bc0f9 100644
--- a/java/res/xml/key_armenian_xeh.xml
+++ b/java/res/xml/key_armenian_xeh.xml
@@ -23,6 +23,6 @@
>
<!-- U+056D: "խ" ARMENIAN SMALL LETTER XEH -->
<Key
- latin:keyLabel="&#x056D;"
+ latin:keySpec="&#x056D;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/key_colemak_colon.xml b/java/res/xml/key_colemak_colon.xml
deleted file mode 100644
index 307b4ebca..000000000
--- a/java/res/xml/key_colemak_colon.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
- >
- <Key
- latin:keyLabel=";"
- latin:keyHintLabel="0"
- latin:additionalMoreKeys="0" />
- </case>
- <default>
- <Key
- latin:keyLabel=":"
- latin:keyHintLabel="0"
- latin:additionalMoreKeys="0"
- latin:moreKeys=";" />
- </default>
- </switch>
-</merge>
diff --git a/java/res/xml/key_f1.xml b/java/res/xml/key_f1.xml
index 72e38cb1a..c96ddcac1 100644
--- a/java/res/xml/key_f1.xml
+++ b/java/res/xml/key_f1.xml
@@ -26,17 +26,26 @@
latin:mode="url"
>
<Key
- latin:keyLabel="/"
+ latin:keySpec="/"
latin:keyStyle="f1MoreKeysStyle" />
</case>
<case
latin:mode="email"
>
<Key
- latin:keyLabel="\@"
+ latin:keySpec="\@"
latin:keyStyle="f1MoreKeysStyle" />
</case>
<case
+ latin:supportsSwitchingToShortcutIme="false"
+ >
+ <Key
+ latin:keySpec="!text/keyspec_comma"
+ latin:keyLabelFlags="hasPopupHint"
+ latin:keyStyle="f1MoreKeysStyle" />
+ </case>
+ <!-- latin:supportsSwitchingToShortcutIme="true" -->
+ <case
latin:hasShortcutKey="true"
>
<Key
@@ -45,9 +54,9 @@
<!-- latin:hasShortcutKey="false" -->
<default>
<Key
- latin:keyLabel="!text/keylabel_for_comma"
+ latin:keySpec="!text/keyspec_comma"
latin:keyLabelFlags="hasPopupHint"
- latin:additionalMoreKeys="!text/more_keys_for_comma,!text/shortcut_as_more_key"
+ latin:additionalMoreKeys="!text/keyspec_shortcut"
latin:keyStyle="f1MoreKeysStyle" />
</default>
</switch>
diff --git a/java/res/xml/key_greek_semicolon.xml b/java/res/xml/key_greek_semicolon.xml
deleted file mode 100644
index ae73a59f6..000000000
--- a/java/res/xml/key_greek_semicolon.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
- >
- <Key
- latin:keyLabel=":"
- latin:keyHintLabel="1"
- latin:moreKeys=";"
- latin:additionalMoreKeys="1" />
- </case>
- <default>
- <Key
- latin:keyLabel=";"
- latin:keyHintLabel="1"
- latin:moreKeys=":"
- latin:additionalMoreKeys="1" />
- </default>
- </switch>
-</merge>
diff --git a/java/res/xml/key_nepali_traditional_period.xml b/java/res/xml/key_period.xml
index 1c389b009..e1d4bbdf7 100644
--- a/java/res/xml/key_nepali_traditional_period.xml
+++ b/java/res/xml/key_period.xml
@@ -18,32 +18,42 @@
*/
-->
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
- API version 16 can't automatically render dotted circle for incomplete combining letter
- of Hindi. The files named res/xml/{key,keys}_nepali*.xml have this U+25CC hack, although the
- counterpart files named res/xml-v16/{key,keys}_nepali*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
<case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+ latin:languageCode="hi"
+ latin:keyboardLayoutSet="hindi_compact"
>
+ <!-- U+0964: "।" DEVANAGARI DANDA -->
<Key
- latin:keyLabel=","
+ latin:keySpec="\u0964"
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="!autoColumnOrder!9,\\,,.,?,!,#,),(,/,;,',@,:,-,&quot;,+,\\%,&amp;"
latin:backgroundType="functional" />
</case>
- <default>
+ <case
+ latin:languageCode="ne"
+ latin:keyboardLayoutSet="nepali_traditional"
+ >
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
- <!-- U+002E: "." FULL STOP -->
<Key
latin:keyStyle="baseKeyDevanagariSignVirama"
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!fixedColumnOrder!9,&#x002E;,!text/more_keys_for_punctuation"
+ latin:moreKeys="!text/morekeys_punctuation"
+ latin:backgroundType="functional" />
+ </case>
+ <default>
+ <Key
+ latin:keySpec="!text/keyspec_period"
+ latin:keyHintLabel="!text/keyhintlabel_period"
+ latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
+ latin:moreKeys="!text/morekeys_period"
latin:backgroundType="functional" />
</default>
</switch>
diff --git a/java/res/xml/key_space_3kw.xml b/java/res/xml/key_space_3kw.xml
deleted file mode 100644
index 20ec882df..000000000
--- a/java/res/xml/key_space_3kw.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <switch>
- <case
- latin:languageSwitchKeyEnabled="true"
- >
- <Key
- latin:keyStyle="languageSwitchKeyStyle" />
- <Key
- latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="20%p" />
- </case>
- <!-- languageSwitchKeyEnabled="false" -->
- <default>
- <Key
- latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="30%p" />
- </default>
- </switch>
-</merge>
diff --git a/java/res/xml/key_space_symbols.xml b/java/res/xml/key_space_symbols.xml
index 1efc4ff4e..0ce522889 100644
--- a/java/res/xml/key_space_symbols.xml
+++ b/java/res/xml/key_space_symbols.xml
@@ -21,6 +21,8 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <include
- latin:keyboardLayout="@xml/key_space_3kw" />
+ <Key
+ latin:backgroundType="normal"
+ latin:keyStyle="spaceKeyStyle"
+ latin:keyWidth="30%p" />
</merge>
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index c9d87bfd4..78e030132 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -42,7 +42,6 @@
<!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
<key-style
latin:styleName="baseForShiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyActionFlags="noKeyPreview"
latin:keyLabelFlags="preserveCase"
latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" />
@@ -52,7 +51,7 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:keyIcon="!icon/shift_key_shifted"
+ latin:keySpec="!icon/shift_key_shifted|!code/key_shift"
latin:backgroundType="stickyOff"
latin:parentStyle="baseForShiftKeyStyle" />
</case>
@@ -61,155 +60,97 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:keyIcon="!icon/shift_key_shifted"
+ latin:keySpec="!icon/shift_key_shifted|!code/key_shift"
latin:backgroundType="stickyOn"
latin:parentStyle="baseForShiftKeyStyle" />
</case>
<default>
<key-style
latin:styleName="shiftKeyStyle"
- latin:keyIcon="!icon/shift_key"
+ latin:keySpec="!icon/shift_key|!code/key_shift"
latin:backgroundType="stickyOff"
latin:parentStyle="baseForShiftKeyStyle" />
</default>
</switch>
<key-style
latin:styleName="deleteKeyStyle"
- latin:code="!code/key_delete"
- latin:keyIcon="!icon/delete_key"
+ latin:keySpec="!icon/delete_key|!code/key_delete"
latin:keyActionFlags="isRepeatable|noKeyPreview"
latin:backgroundType="functional" />
+ <!-- emojiKeyStyle must be defined before including @xml/key_syles_enter. -->
+ <key-style
+ latin:styleName="emojiKeyStyle"
+ latin:keySpec="!icon/emoji_key|!code/key_emoji"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="functional" />
<include
latin:keyboardLayout="@xml/key_styles_enter" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:code="!code/key_space"
+ latin:keySpec=" |!code/key_space"
latin:keyActionFlags="noKeyPreview|enableLongPress" />
<!-- U+200C: ZERO WIDTH NON-JOINER
U+200D: ZERO WIDTH JOINER -->
<key-style
latin:styleName="zwnjKeyStyle"
- latin:code="0x200C"
- latin:keyIcon="!icon/zwnj_key"
+ latin:keySpec="!icon/zwnj_key|&#x200C;"
latin:moreKeys="!icon/zwj_key|&#x200D;"
latin:keyLabelFlags="hasPopupHint"
latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="shortcutKeyStyle"
- latin:code="!code/key_shortcut"
- latin:keyIcon="!icon/shortcut_key"
+ latin:keySpec="!icon/shortcut_key|!code/key_shortcut"
latin:keyIconDisabled="!icon/shortcut_key_disabled"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:altCode="!code/key_space"
latin:parentStyle="f1MoreKeysStyle" />
<key-style
latin:styleName="settingsKeyStyle"
- latin:code="!code/key_settings"
- latin:keyIcon="!icon/settings_key"
+ latin:keySpec="!icon/settings_key|!code/key_settings"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:altCode="!code/key_space"
latin:backgroundType="functional" />
<key-style
latin:styleName="languageSwitchKeyStyle"
- latin:code="!code/key_language_switch"
- latin:keyIcon="!icon/language_switch_key"
+ latin:keySpec="!icon/language_switch_key|!code/key_language_switch"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress"
latin:altCode="!code/key_space" />
<key-style
- latin:styleName="emojiKeyStyle"
- latin:code="!code/key_emoji"
- latin:keyIcon="!icon/emoji_key"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="functional" />
- <!-- Overriding EnterKeyStyle here -->
- <switch>
- <!-- Shift + Enter in textMultiLine field. -->
- <case
- latin:isMultiLine="true"
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
- >
- <key-style
- latin:styleName="enterKeyStyle"
- latin:parentStyle="shiftEnterKeyStyle" />
- </case>
- <!-- Smiley in textShortMessage field.
- Overrides common enter key style. -->
- <case
- latin:mode="im"
- >
- <key-style
- latin:styleName="enterKeyStyle"
- latin:parentStyle="emojiKeyStyle" />
- </case>
- </switch>
- <key-style
latin:styleName="tabKeyStyle"
- latin:code="!code/key_tab"
- latin:keyIcon="!icon/tab_key"
+ latin:keySpec="!icon/tab_key|!code/key_tab"
latin:keyIconPreview="!icon/tab_key_preview"
latin:backgroundType="functional" />
<!-- Note: This key style is not for functional tab key. This is used for the tab key which is
laid out as normal letter key. -->
<key-style
latin:styleName="nonSpecialBackgroundTabKeyStyle"
- latin:code="!code/key_tab"
- latin:keyIcon="!icon/tab_key"
+ latin:keySpec="!icon/tab_key|!code/key_tab"
latin:keyIconPreview="!icon/tab_key_preview" />
<key-style
latin:styleName="baseForLayoutSwitchKeyStyle"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
- <switch>
- <!-- When this qwerty keyboard has no shortcut keys but shortcut key is enabled, then symbol
- keyboard will have a shortcut key. That means we should use label_to_symbol_key label
- and shortcut_for_label icon. -->
- <case
- latin:shortcutKeyOnSymbols="true"
- >
- <key-style
- latin:styleName="baseForToSymbolKeyStyle"
- latin:keyIcon="!icon/shortcut_for_label"
- latin:keyLabel="!text/label_to_symbol_with_microphone_key"
- latin:keyLabelFlags="withIconRight|preserveCase"
- latin:parentStyle="baseForLayoutSwitchKeyStyle" />
- </case>
- <default>
- <key-style
- latin:styleName="baseForToSymbolKeyStyle"
- latin:keyLabel="!text/label_to_symbol_key"
- latin:parentStyle="baseForLayoutSwitchKeyStyle" />
- </default>
- </switch>
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:code="!code/key_switch_alpha_symbol"
- latin:parentStyle="baseForToSymbolKeyStyle" />
+ latin:keySpec="!text/keylabel_to_symbol|!code/key_switch_alpha_symbol"
+ latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="toAlphaKeyStyle"
- latin:code="!code/key_switch_alpha_symbol"
- latin:keyLabel="!text/label_to_alpha_key"
+ latin:keySpec="!text/keylabel_to_alpha|!code/key_switch_alpha_symbol"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
- latin:code="!code/key_shift"
- latin:keyLabel="!text/label_to_more_symbol_key"
+ latin:keySpec="!text/keylabel_to_more_symbol|!code/key_shift"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
- latin:code="!code/key_shift"
- latin:parentStyle="baseForToSymbolKeyStyle" />
- <key-style
- latin:styleName="punctuationKeyStyle"
- latin:keyLabel="."
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_punctuation"
- latin:backgroundType="functional" />
+ latin:keySpec="!text/keylabel_to_symbol|!code/key_shift"
+ latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="comKeyStyle"
- latin:keyLabel="!text/keylabel_for_popular_domain"
+ latin:keySpec="!text/keyspec_popular_domain"
latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
- latin:keyOutputText="!text/keylabel_for_popular_domain"
- latin:moreKeys="!text/more_keys_for_popular_domain"
+ latin:moreKeys="!text/morekeys_popular_domain"
latin:backgroundType="functional" />
</merge>
diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_styles_currency.xml
index 84c2abc08..0bb2bb408 100644
--- a/java/res/xml/key_styles_currency.xml
+++ b/java/res/xml/key_styles_currency.xml
@@ -50,7 +50,7 @@
19. San Marino (it_SM)
20. Slovakia (sk_SK)
21. Slovenia (sl_SI)
- 22. Spain (es_ES, ca_ES)
+ 22. Spain (es_ES, ca_ES, eu_ES, gl_ES)
23. Vatican City (it_VA) -->
<case
latin:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA"
@@ -113,21 +113,47 @@
U+00A2: "¢" CENT SIGN -->
<key-style
latin:styleName="currencyKeyStyle"
- latin:keyLabel="!text/keylabel_for_currency"
- latin:moreKeys="!text/more_keys_for_currency" />
+ latin:keySpec="!text/keyspec_currency"
+ latin:moreKeys="!text/morekeys_currency" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
- latin:keyLabel="&#x00A3;" />
+ latin:keySpec="&#x00A3;" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
- latin:keyLabel="&#x20AC;" />
+ latin:keySpec="&#x20AC;" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
- latin:keyLabel="$"
+ latin:keySpec="$"
latin:moreKeys="&#x00A2;" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
- latin:keyLabel="&#x00A2;" />
+ latin:keySpec="&#x00A2;" />
+ </case>
+ <!-- IN: India (Rupee) -->
+ <case
+ latin:countryCode="IN"
+ >
+ <!-- U+20B9: "₹" INDIAN RUPEE SIGN
+ U+00A3: "£" POUND SIGN
+ U+20AC: "€" EURO SIGN
+ U+00A2: "¢" CENT SIGN -->
+ <key-style
+ latin:styleName="currencyKeyStyle"
+ latin:keySpec="&#x20B9;"
+ latin:moreKeys="!text/morekeys_currency" />
+ <key-style
+ latin:styleName="moreCurrency1KeyStyle"
+ latin:keySpec="&#x00A3;" />
+ <key-style
+ latin:styleName="moreCurrency2KeyStyle"
+ latin:keySpec="&#x20AC;" />
+ <key-style
+ latin:styleName="moreCurrency3KeyStyle"
+ latin:keySpec="$"
+ latin:moreKeys="&#x00A2;" />
+ <key-style
+ latin:styleName="moreCurrency4KeyStyle"
+ latin:keySpec="&#x00A2;" />
</case>
<!-- GB: United Kingdom (Pound) -->
<case
@@ -140,21 +166,21 @@
U+20B1: "₱" PESO SIGN -->
<key-style
latin:styleName="currencyKeyStyle"
- latin:keyLabel="&#x00A3;"
+ latin:keySpec="&#x00A3;"
latin:moreKeys="&#x00A2;,$,&#x20AC;,&#x00A5;,&#x20B1;" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
- latin:keyLabel="&#x20AC;" />
+ latin:keySpec="&#x20AC;" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
- latin:keyLabel="&#x00A5;" />
+ latin:keySpec="&#x00A5;" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
- latin:keyLabel="$"
+ latin:keySpec="$"
latin:moreKeys="&#x00A2;" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
- latin:keyLabel="&#x00A2;" />
+ latin:keySpec="&#x00A2;" />
</case>
<!-- ar: Arabic (Dollar and Rial) -->
<default>
diff --git a/java/res/xml/key_styles_currency_dollar.xml b/java/res/xml/key_styles_currency_dollar.xml
index 674a3966d..d3211bd69 100644
--- a/java/res/xml/key_styles_currency_dollar.xml
+++ b/java/res/xml/key_styles_currency_dollar.xml
@@ -25,18 +25,18 @@
U+00A5: "¥" YEN SIGN -->
<key-style
latin:styleName="currencyKeyStyle"
- latin:keyLabel="$"
- latin:moreKeys="!text/more_keys_for_currency_dollar" />
+ latin:keySpec="$"
+ latin:moreKeys="!text/morekeys_currency_dollar" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
- latin:keyLabel="&#x00A3;" />
+ latin:keySpec="&#x00A3;" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
- latin:keyLabel="&#x00A2;" />
+ latin:keySpec="&#x00A2;" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
- latin:keyLabel="&#x20AC;" />
+ latin:keySpec="&#x20AC;" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
- latin:keyLabel="&#x00A5;" />
+ latin:keySpec="&#x00A5;" />
</merge>
diff --git a/java/res/xml/key_styles_currency_euro.xml b/java/res/xml/key_styles_currency_euro.xml
index c1b5e0384..c2ae87bea 100644
--- a/java/res/xml/key_styles_currency_euro.xml
+++ b/java/res/xml/key_styles_currency_euro.xml
@@ -26,19 +26,19 @@
U+20B1: "₱" PESO SIGN -->
<key-style
latin:styleName="currencyKeyStyle"
- latin:keyLabel="&#x20AC;"
+ latin:keySpec="&#x20AC;"
latin:moreKeys="&#x00A2;,&#x00A3;,$,&#x00A5;,&#x20B1;" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
- latin:keyLabel="&#x00A3;" />
+ latin:keySpec="&#x00A3;" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
- latin:keyLabel="&#x00A5;" />
+ latin:keySpec="&#x00A5;" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
- latin:keyLabel="$"
+ latin:keySpec="$"
latin:moreKeys="&#x00A2;" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
- latin:keyLabel="&#x00A2;" />
+ latin:keySpec="&#x00A2;" />
</merge>
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index 083e6a67d..acb27abb1 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -21,7 +21,7 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- TODO: Stop using many conditional cases for emoji_key_as_more_key. There are way too many to maintain. -->
+ <!-- TODO: Stop using many conditional cases for keyspec_emoji_key. There are way too many to maintain. -->
<!-- Navigate more keys style -->
<switch>
<!-- latin:passwordInput="true" -->
@@ -33,7 +33,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_previous_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_previous" />
</case>
<case
latin:imeAction="actionNext"
@@ -51,7 +51,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_next_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_next" />
</case>
<case
latin:imeAction="actionPrevious"
@@ -69,7 +69,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" />
+ latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" />
</case>
<case
latin:navigateNext="true"
@@ -79,7 +79,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_next_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_next" />
</case>
<case
latin:navigateNext="false"
@@ -89,7 +89,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_previous_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_previous" />
</case>
<case
latin:navigateNext="false"
@@ -108,7 +108,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_previous_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_previous" />
</case>
<case
latin:imeAction="actionNext"
@@ -126,7 +126,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_next_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_next" />
</case>
<case
latin:imeAction="actionPrevious"
@@ -144,7 +144,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" />
+ latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" />
</case>
<case
latin:navigateNext="true"
@@ -154,7 +154,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_next_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_next" />
</case>
<case
latin:navigateNext="false"
@@ -164,7 +164,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_previous_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_previous" />
</case>
<case
latin:navigateNext="false"
@@ -182,7 +182,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_previous_as_more_key" />
+ latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_previous" />
</case>
<case
latin:imeAction="actionNext"
@@ -191,7 +191,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/emoji_key_as_more_key" />
+ latin:moreKeys="!text/keyspec_emoji_key" />
</case>
<case
latin:imeAction="actionPrevious"
@@ -200,7 +200,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_next_as_more_key" />
+ latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_next" />
</case>
<case
latin:imeAction="actionPrevious"
@@ -209,7 +209,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/emoji_key_as_more_key" />
+ latin:moreKeys="!text/keyspec_emoji_key" />
</case>
<case
latin:navigateNext="true"
@@ -218,7 +218,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!text/emoji_key_as_more_key,!text/action_previous_as_more_key,!text/action_next_as_more_key" />
+ latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_previous,!text/keyspec_action_next" />
</case>
<case
latin:navigateNext="true"
@@ -227,7 +227,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_next_as_more_key" />
+ latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_next" />
</case>
<case
latin:navigateNext="false"
@@ -236,7 +236,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_previous_as_more_key" />
+ latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_previous" />
</case>
<case
latin:navigateNext="false"
@@ -245,7 +245,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/emoji_key_as_more_key" />
+ latin:moreKeys="!text/keyspec_emoji_key" />
</case>
<default>
<key-style
@@ -255,21 +255,13 @@
<!-- Enter key style -->
<key-style
latin:styleName="defaultEnterKeyStyle"
- latin:code="!code/key_enter"
- latin:keyIcon="!icon/enter_key"
latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional"
latin:parentStyle="navigateMoreKeysStyle" />
<key-style
latin:styleName="shiftEnterKeyStyle"
- latin:code="!code/key_shift_enter"
- latin:parentStyle="defaultEnterKeyStyle" />
- <key-style
- latin:styleName="defaultActionEnterKeyStyle"
- latin:code="!code/key_enter"
- latin:keyIcon="!icon/undefined"
- latin:backgroundType="action"
+ latin:keySpec="!icon/enter_key|!code/key_shift_enter"
latin:parentStyle="defaultEnterKeyStyle" />
<switch>
<!-- Shift + Enter in textMultiLine field. -->
@@ -281,66 +273,84 @@
latin:styleName="enterKeyStyle"
latin:parentStyle="shiftEnterKeyStyle" />
</case>
+ <!-- Smiley in textShortMessage field.
+ This <case> should be after Shift + Enter <case> and before any of action <case>. -->
+ <case
+ latin:mode="im"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:parentStyle="emojiKeyStyle" />
+ </case>
<case
latin:imeAction="actionGo"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_go_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!text/label_go_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionNext"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_next_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!text/label_next_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionPrevious"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_previous_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!text/label_previous_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionDone"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_done_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!text/label_done_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionSend"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_send_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!text/label_send_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyIcon="!icon/search_key"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:keySpec="!icon/search_key|!code/key_enter"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionCustomLabel"
>
<key-style
latin:styleName="enterKeyStyle"
+ latin:keySpec="dummy_label|!code/key_enter"
latin:keyLabelFlags="fromCustomActionLabel"
- latin:parentStyle="defaultActionEnterKeyStyle" />
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
</case>
<!-- imeAction is either actionNone or actionUnspecified. -->
<default>
<key-style
latin:styleName="enterKeyStyle"
+ latin:keySpec="!icon/enter_key|!code/key_enter"
latin:parentStyle="defaultEnterKeyStyle" />
</default>
</switch>
diff --git a/java/res/xml/key_styles_f1.xml b/java/res/xml/key_styles_f1.xml
index 8dfc3cb84..8a07827fa 100644
--- a/java/res/xml/key_styles_f1.xml
+++ b/java/res/xml/key_styles_f1.xml
@@ -36,7 +36,7 @@
<key-style
latin:styleName="f1MoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/settings_as_more_key"
+ latin:moreKeys="!text/keyspec_settings"
latin:backgroundType="functional" />
</default>
</switch>
diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
index 2e5a601b0..5c108cf58 100644
--- a/java/res/xml/key_styles_number.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -43,82 +43,74 @@
latin:parentStyle="numKeyStyle" />
<key-style
latin:styleName="num0KeyStyle"
- latin:keyLabel="0"
+ latin:keySpec="0"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num1KeyStyle"
- latin:keyLabel="1"
+ latin:keySpec="1"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num2KeyStyle"
- latin:keyLabel="2"
+ latin:keySpec="2"
latin:keyHintLabel="ABC"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num3KeyStyle"
- latin:keyLabel="3"
+ latin:keySpec="3"
latin:keyHintLabel="DEF"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num4KeyStyle"
- latin:keyLabel="4"
+ latin:keySpec="4"
latin:keyHintLabel="GHI"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num5KeyStyle"
- latin:keyLabel="5"
+ latin:keySpec="5"
latin:keyHintLabel="JKL"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num6KeyStyle"
- latin:keyLabel="6"
+ latin:keySpec="6"
latin:keyHintLabel="MNO"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num7KeyStyle"
- latin:keyLabel="7"
+ latin:keySpec="7"
latin:keyHintLabel="PQRS"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num8KeyStyle"
- latin:keyLabel="8"
+ latin:keySpec="8"
latin:keyHintLabel="TUV"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num9KeyStyle"
- latin:keyLabel="9"
+ latin:keySpec="9"
latin:keyHintLabel="WXYZ"
latin:parentStyle="numberKeyStyle" />
- <!-- U+002A: "*" ASTERISK
- U+FF0A: "*" FULLWIDTH ASTERISK -->
+ <!-- U+FF0A: "*" FULLWIDTH ASTERISK -->
<key-style
latin:styleName="numStarKeyStyle"
- latin:code="0x002A"
- latin:keyLabel="&#xFF0A;"
+ latin:keySpec="&#xFF0A;|*"
latin:parentStyle="numKeyStyle" />
<!-- Only for non-tablet device -->
<key-style
latin:styleName="numPhoneToSymbolKeyStyle"
- latin:code="!code/key_switch_alpha_symbol"
- latin:keyLabel="!text/label_to_phone_symbols_key"
+ latin:keySpec="!text/keylabel_to_phone_symbols|!code/key_switch_alpha_symbol"
latin:parentStyle="numModeKeyStyle" />
<key-style
latin:styleName="numPhoneToNumericKeyStyle"
- latin:code="!code/key_switch_alpha_symbol"
- latin:keyLabel="!text/label_to_phone_numeric_key"
+ latin:keySpec="!text/keylabel_to_phone_numeric|!code/key_switch_alpha_symbol"
latin:parentStyle="numModeKeyStyle" />
- <!-- U+002C: "," COMMA -->
<key-style
latin:styleName="numPauseKeyStyle"
- latin:code="0x002C"
- latin:keyLabel="!text/label_pause_key"
+ latin:keySpec="!text/label_pause_key|,"
latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"
latin:parentStyle="numKeyBaseStyle" />
- <!-- U+003B: ";" SEMICOLON -->
<key-style
latin:styleName="numWaitKeyStyle"
- latin:code="0x003B"
- latin:keyLabel="!text/label_wait_key"
+ latin:keySpec="!text/label_wait_key|;"
latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"
latin:parentStyle="numKeyBaseStyle" />
<key-style
@@ -127,15 +119,13 @@
latin:parentStyle="tabKeyStyle" />
<key-style
latin:styleName="numSpaceKeyStyle"
- latin:code="!code/key_space"
- latin:keyIcon="!icon/space_key_for_number_layout"
+ latin:keySpec="!icon/space_key_for_number_layout|!code/key_space"
latin:keyActionFlags="enableLongPress"
latin:parentStyle="numKeyBaseStyle" />
<!-- Override defaultEnterKeyStyle in key_styles_enter.xml -->
<key-style
latin:styleName="defaultEnterKeyStyle"
- latin:code="!code/key_enter"
- latin:keyIcon="!icon/enter_key"
+ latin:keySpec="!icon/enter_key|!code/key_enter"
latin:keyLabelFlags="preserveCase|autoXScale|followKeyLargeLabelRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional"
diff --git a/java/res/xml/key_symbols_period.xml b/java/res/xml/key_symbols_period.xml
deleted file mode 100644
index 6efc9dee3..000000000
--- a/java/res/xml/key_symbols_period.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <!-- U+2105: "℅" CARE OF
- U+2122: "™" TRADE MARK SIGN
- U+00AE: "®" REGISTERED SIGN
- U+00A9: "©" COPYRIGHT SIGN
- U+00A7: "§" SECTION SIGN
- U+00B6: "¶" PILCROW SIGN
- U+002C: "," COMMA
- U+2022: "•" BULLET -->
- <!-- U+00B0: "°" DEGREE SIGN
- U+2032: "′" PRIME
- U+2033: "″" DOUBLE PRIME
- U+2191: "↑" UPWARDS ARROW
- U+2193: "↓" DOWNWARDS ARROW
- U+2190: "←" LEFTWARDS ARROW
- U+2192: "→" RIGHTWARDS ARROW
- U+2026: "…" HORIZONTAL ELLIPSIS -->
- <!-- U+0394: "Δ" GREEK CAPITAL LETTER DELTA
- U+03A0: "Π" GREEK CAPITAL LETTER PI
- U+03C0: "π" GREEK SMALL LETTER PI -->
- <Key
- latin:keyLabel="."
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!fixedColumnOrder!8,&#x2105;,&#x2122;,&#x00AE;,&#x00A9;,&#x00A7;,&#x00B6;,\\,,&#x2022;,&#x00B0;,&#x2032;,&#x2033;,&#x2191;,&#x2193;,&#x2190;,&#x2192;,&#x2026;,!text/more_keys_for_bullet,&#x0394;,&#x03A0;,&#x03C0;" />
-</merge>
diff --git a/java/res/xml/key_thai_kho_khuat.xml b/java/res/xml/key_thai_kho_khuat.xml
index 0ffd0f924..84988f870 100644
--- a/java/res/xml/key_thai_kho_khuat.xml
+++ b/java/res/xml/key_thai_kho_khuat.xml
@@ -27,13 +27,13 @@
>
<!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON -->
<Key
- latin:keyLabel="&#x0E05;"
+ latin:keySpec="&#x0E05;"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT -->
<Key
- latin:keyLabel="&#x0E03;"
+ latin:keySpec="&#x0E03;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/keyboard_layout_set_hindi_compact.xml b/java/res/xml/keyboard_layout_set_hindi_compact.xml
new file mode 100644
index 000000000..77d02fbbc
--- /dev/null
+++ b/java/res/xml/keyboard_layout_set_hindi_compact.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<KeyboardLayoutSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_hindi_compact"
+ latin:enableProximityCharsCorrection="true" />
+ <Element
+ latin:elementName="symbols"
+ latin:elementKeyboard="@xml/kbd_symbols" />
+ <Element
+ latin:elementName="symbolsShifted"
+ latin:elementKeyboard="@xml/kbd_symbols_shift" />
+ <Element
+ latin:elementName="phone"
+ latin:elementKeyboard="@xml/kbd_phone" />
+ <Element
+ latin:elementName="phoneSymbols"
+ latin:elementKeyboard="@xml/kbd_phone_symbols" />
+ <Element
+ latin:elementName="number"
+ latin:elementKeyboard="@xml/kbd_number" />
+</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_myanmar.xml b/java/res/xml/keyboard_layout_set_myanmar.xml
new file mode 100644
index 000000000..5c823b263
--- /dev/null
+++ b/java/res/xml/keyboard_layout_set_myanmar.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<KeyboardLayoutSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_myanmar"
+ latin:enableProximityCharsCorrection="true" />
+ <Element
+ latin:elementName="alphabetAutomaticShifted"
+ latin:elementKeyboard="@xml/kbd_myanmar"
+ latin:enableProximityCharsCorrection="true" />
+ <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
+ because the letters on these layouts aren't the ones in different case of the above
+ unshifted layouts. -->
+ <Element
+ latin:elementName="alphabetManualShifted"
+ latin:elementKeyboard="@xml/kbd_myanmar" />
+ <Element
+ latin:elementName="alphabetShiftLocked"
+ latin:elementKeyboard="@xml/kbd_myanmar" />
+ <Element
+ latin:elementName="alphabetShiftLockShifted"
+ latin:elementKeyboard="@xml/kbd_myanmar" />
+ <Element
+ latin:elementName="symbols"
+ latin:elementKeyboard="@xml/kbd_symbols" />
+ <Element
+ latin:elementName="symbolsShifted"
+ latin:elementKeyboard="@xml/kbd_symbols_shift" />
+ <Element
+ latin:elementName="phone"
+ latin:elementKeyboard="@xml/kbd_phone" />
+ <Element
+ latin:elementName="phoneSymbols"
+ latin:elementKeyboard="@xml/kbd_phone_symbols" />
+ <Element
+ latin:elementName="number"
+ latin:elementKeyboard="@xml/kbd_number" />
+</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_swiss.xml b/java/res/xml/keyboard_layout_set_swiss.xml
new file mode 100644
index 000000000..e17a5ab8b
--- /dev/null
+++ b/java/res/xml/keyboard_layout_set_swiss.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<KeyboardLayoutSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_swiss"
+ latin:enableProximityCharsCorrection="true" />
+ <Element
+ latin:elementName="symbols"
+ latin:elementKeyboard="@xml/kbd_symbols" />
+ <Element
+ latin:elementName="symbolsShifted"
+ latin:elementKeyboard="@xml/kbd_symbols_shift" />
+ <Element
+ latin:elementName="phone"
+ latin:elementKeyboard="@xml/kbd_phone" />
+ <Element
+ latin:elementName="phoneSymbols"
+ latin:elementKeyboard="@xml/kbd_phone_symbols" />
+ <Element
+ latin:elementName="number"
+ latin:elementKeyboard="@xml/kbd_number" />
+</KeyboardLayoutSet>
diff --git a/java/res/xml/keys_arabic3_left.xml b/java/res/xml/keys_arabic3_left.xml
index 157af4a52..2b3e12c03 100644
--- a/java/res/xml/keys_arabic3_left.xml
+++ b/java/res/xml/keys_arabic3_left.xml
@@ -23,6 +23,6 @@
>
<!-- U+0630: "ذ" ARABIC LETTER THAL -->
<Key
- latin:keyLabel="&#x0630;"
+ latin:keySpec="&#x0630;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/keys_comma_period.xml b/java/res/xml/keys_comma_period.xml
deleted file mode 100644
index 1b51e45ed..000000000
--- a/java/res/xml/keys_comma_period.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <switch>
- <case
- latin:languageCode="ar"
- >
- <Key
- latin:keyLabel="!text/keylabel_for_apostrophe"
- latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
- latin:moreKeys="!text/more_keys_for_apostrophe"
- latin:backgroundType="functional"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="."
- latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_arabic_diacritics"
- latin:backgroundType="functional"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- </case>
- <case
- latin:languageCode="fa"
- >
- <Key
- latin:keyLabel="!text/keylabel_for_apostrophe"
- latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_apostrophe"
- latin:backgroundType="functional"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="."
- latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_arabic_diacritics"
- latin:backgroundType="functional"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- </case>
- <case
- latin:languageCode="hy"
- >
- <!-- U+055D: "՝" ARMENIAN COMMA -->
- <Key
- latin:keyLabel="&#x055D;"
- latin:backgroundType="functional" />
- <!-- U+0589: "։" ARMENIAN FULL STOP -->
- <Key
- latin:keyLabel="&#x0589;"
- latin:keyLabelFlags="hasPopupHint"
- latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_punctuation" />
- </case>
- <default>
- <Key
- latin:keyLabel="!text/keylabel_for_tablet_comma"
- latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
- latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_tablet_comma" />
- <Key
- latin:keyLabel="."
- latin:keyHintLabel="!text/keyhintlabel_for_period"
- latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_period" />
- </default>
- </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/key_greek_semicolon.xml b/java/res/xml/keys_comma_period_symbols.xml
index 3f09419b1..843595c27 100644
--- a/java/res/xml-sw600dp/key_greek_semicolon.xml
+++ b/java/res/xml/keys_comma_period_symbols.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2012, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -22,8 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel=";"
- latin:keyHintLabel=":"
- latin:moreKeys=":"
- latin:keyStyle="hasShiftedLetterHintStyle" />
+ latin:keySpec="!text/keyspec_comma" />
+ <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
+ <Key
+ latin:keySpec="."
+ latin:moreKeys="&#x2026;" />
</merge>
diff --git a/java/res/xml/keys_curly_brackets.xml b/java/res/xml/keys_curly_brackets.xml
index 6a4b1a945..596516af3 100644
--- a/java/res/xml/keys_curly_brackets.xml
+++ b/java/res/xml/keys_curly_brackets.xml
@@ -22,9 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="{"
- latin:code="!code/key_left_curly_bracket" />
+ latin:keySpec="!text/keyspec_left_curly_bracket" />
<Key
- latin:keyLabel="}"
- latin:code="!code/key_right_curly_bracket" />
+ latin:keySpec="!text/keyspec_right_curly_bracket" />
</merge>
diff --git a/java/res/xml/keys_dvorak_123.xml b/java/res/xml/keys_dvorak_123.xml
index fa94f1f28..6efc7f2c5 100644
--- a/java/res/xml/keys_dvorak_123.xml
+++ b/java/res/xml/keys_dvorak_123.xml
@@ -26,7 +26,7 @@
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
- latin:keyLabel="&quot;"
+ latin:keySpec="&quot;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
</case>
@@ -34,7 +34,7 @@
latin:mode="url"
>
<Key
- latin:keyLabel="/"
+ latin:keySpec="/"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
</case>
@@ -42,13 +42,13 @@
latin:mode="email"
>
<Key
- latin:keyLabel="\@"
+ latin:keySpec="\@"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
</case>
<default>
<Key
- latin:keyLabel="\'"
+ latin:keySpec="\'"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="!,&quot;" />
@@ -59,22 +59,22 @@
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
- latin:keyLabel="&lt;"
+ latin:keySpec="&lt;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<Key
- latin:keyLabel="&gt;"
+ latin:keySpec="&gt;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3" />
</case>
<default>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="\?,&lt;" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys="&gt;" />
diff --git a/java/res/xml/keys_farsi3_right.xml b/java/res/xml/keys_farsi3_right.xml
index 77efb0a21..2618e478c 100644
--- a/java/res/xml/keys_farsi3_right.xml
+++ b/java/res/xml/keys_farsi3_right.xml
@@ -23,6 +23,6 @@
>
<!-- U+0686: "چ" ARABIC LETTER TCHEH -->
<Key
- latin:keyLabel="&#x0686;"
+ latin:keySpec="&#x0686;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/keys_less_greater.xml b/java/res/xml/keys_less_greater.xml
index 56d0727dd..778de02a1 100644
--- a/java/res/xml/keys_less_greater.xml
+++ b/java/res/xml/keys_less_greater.xml
@@ -25,30 +25,24 @@
<case
latin:languageCode="fa"
>
- <!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
- U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
- latin:keyLabel="&#x00AB;"
- latin:code="0x00BB"
+ latin:keySpec="!text/keyspec_left_double_angle_quote"
latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_less_than" />
+ latin:moreKeys="!text/morekeys_less_than" />
<Key
- latin:keyLabel="&#x00BB;"
- latin:code="0x00AB"
+ latin:keySpec="!text/keyspec_right_double_angle_quote"
latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_greater_than" />
+ latin:moreKeys="!text/morekeys_greater_than" />
</case>
<default>
<Key
- latin:keyLabel="&lt;"
- latin:code="!code/key_less_than"
+ latin:keySpec="!text/keyspec_less_than"
latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_less_than" />
+ latin:moreKeys="!text/morekeys_less_than" />
<Key
- latin:keyLabel="&gt;"
- latin:code="!code/key_greater_than"
+ latin:keySpec="!text/keyspec_greater_than"
latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_greater_than" />
+ latin:moreKeys="!text/morekeys_greater_than" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/keys_parentheses.xml b/java/res/xml/keys_parentheses.xml
index 25e89c930..320b109a8 100644
--- a/java/res/xml/keys_parentheses.xml
+++ b/java/res/xml/keys_parentheses.xml
@@ -22,11 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="("
- latin:code="!code/key_left_parenthesis"
- latin:moreKeys="!text/more_keys_for_left_parenthesis" />
+ latin:keySpec="!text/keyspec_left_parenthesis"
+ latin:moreKeys="!text/morekeys_left_parenthesis" />
<Key
- latin:keyLabel=")"
- latin:code="!code/key_right_parenthesis"
- latin:moreKeys="!text/more_keys_for_right_parenthesis" />
+ latin:keySpec="!text/keyspec_right_parenthesis"
+ latin:moreKeys="!text/morekeys_right_parenthesis" />
</merge>
diff --git a/java/res/xml/keys_pcqwerty2_right3.xml b/java/res/xml/keys_pcqwerty2_right3.xml
index 6f86477da..b188cffab 100644
--- a/java/res/xml/keys_pcqwerty2_right3.xml
+++ b/java/res/xml/keys_pcqwerty2_right3.xml
@@ -23,26 +23,26 @@
>
<switch>
<case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
- latin:keyLabel="["
+ latin:keySpec="["
latin:additionalMoreKeys="{" />
<Key
- latin:keyLabel="]"
+ latin:keySpec="]"
latin:additionalMoreKeys="}" />
<Key
- latin:keyLabel="\\"
+ latin:keySpec="\\"
latin:additionalMoreKeys="\\|" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<Key
- latin:keyLabel="{" />
+ latin:keySpec="{" />
<Key
- latin:keyLabel="}" />
+ latin:keySpec="}" />
<Key
- latin:keyLabel="|" />
+ latin:keySpec="|" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/keys_pcqwerty3_right2.xml b/java/res/xml/keys_pcqwerty3_right2.xml
index 8da145b20..8a1f60fae 100644
--- a/java/res/xml/keys_pcqwerty3_right2.xml
+++ b/java/res/xml/keys_pcqwerty3_right2.xml
@@ -23,22 +23,22 @@
>
<switch>
<case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
- latin:keyLabel=";"
+ latin:keySpec=";"
latin:additionalMoreKeys=":" />
<Key
- latin:keyLabel="\'"
+ latin:keySpec="\'"
latin:additionalMoreKeys="&quot;"
latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,%,!text/single_quotes" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<Key
- latin:keyLabel=":" />
+ latin:keySpec=":" />
<Key
- latin:keyLabel="&quot;"
+ latin:keySpec="&quot;"
latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
</default>
</switch>
diff --git a/java/res/xml/keys_pcqwerty4_right3.xml b/java/res/xml/keys_pcqwerty4_right3.xml
index e6084cb45..a87f550f7 100644
--- a/java/res/xml/keys_pcqwerty4_right3.xml
+++ b/java/res/xml/keys_pcqwerty4_right3.xml
@@ -23,18 +23,18 @@
>
<switch>
<case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:additionalMoreKeys="&lt;" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:additionalMoreKeys="&gt;" />
<Key
- latin:keyLabel="/"
+ latin:keySpec="/"
latin:additionalMoreKeys="\?"
- latin:moreKeys="!text/more_keys_for_symbols_question" />
+ latin:moreKeys="!text/morekeys_question" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
@@ -45,14 +45,14 @@
U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
- latin:keyLabel="&lt;"
+ latin:keySpec="&lt;"
latin:moreKeys="!fixedColumnOrder!3,&#x2039;,&#x2264;,&#x00AB;" />
<Key
- latin:keyLabel="&gt;"
+ latin:keySpec="&gt;"
latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
<Key
- latin:keyLabel="\?"
- latin:moreKeys="!text/more_keys_for_symbols_question" />
+ latin:keySpec="\?"
+ latin:moreKeys="!text/morekeys_question" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/keys_square_brackets.xml b/java/res/xml/keys_square_brackets.xml
index 5c128fd0c..076b2c2d9 100644
--- a/java/res/xml/keys_square_brackets.xml
+++ b/java/res/xml/keys_square_brackets.xml
@@ -22,9 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="["
- latin:code="!code/key_left_square_bracket" />
+ latin:keySpec="!text/keyspec_left_square_bracket" />
<Key
- latin:keyLabel="]"
- latin:code="!code/key_right_square_bracket" />
+ latin:keySpec="!text/keyspec_right_square_bracket" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_anusvara.xml b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
new file mode 100644
index 000000000..6dc9b7e3a
--- /dev/null
+++ b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- The code point U+25CC for key label is needed because the font rendering system prior to
+ API version 16 can't automatically render dotted circle for incomplete combining letter
+ of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
+ counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <switch>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0903: "ः‍" DEVANAGARI SIGN VISARGA
+ U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
+ U+093C: "़" DEVANAGARI SIGN NUKTA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignAnusvara"
+ latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x25CC;&#x0901;|&#x0901;,&#x25CC;&#x093C;|&#x093C;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariSignAnusvara" />
+ </default>
+ </switch>
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
+ <key-style
+ latin:styleName="baseKeyDevanagariSignAnusvara"
+ latin:parentStyle="moreKeysDevanagariSignAnusvara"
+ latin:keySpec="&#x25CC;&#x0902;|&#x0902;"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+</merge>
diff --git a/java/res/xml/key_devanagari_sign_candrabindu.xml b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
index df0c4e054..24cb44ba8 100644
--- a/java/res/xml/key_devanagari_sign_candrabindu.xml
+++ b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
@@ -42,9 +42,9 @@
</switch>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
- <Key
- latin:keyStyle="moreKeysDevanagariSignCandrabindu"
- latin:keyLabel="&#x25CC;&#x0901;"
- latin:code="0x0901"
+ <key-style
+ latin:styleName="baseKeyDevanagariSignCandrabindu"
+ latin:parentStyle="moreKeysDevanagariSignCandrabindu"
+ latin:keySpec="&#x25CC;&#x0901;|&#x0901;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/key_devanagari_sign_nukta.xml b/java/res/xml/keystyle_devanagari_sign_nukta.xml
index f7a03ee90..41da555ce 100644
--- a/java/res/xml/key_devanagari_sign_nukta.xml
+++ b/java/res/xml/keystyle_devanagari_sign_nukta.xml
@@ -37,6 +37,15 @@
latin:styleName="moreKeysDevanagariSignNukta"
latin:moreKeys="&#x25CC;&#x097D;|&#x097D;,&#x25CC;&#x0970;|&#x0970;,&#x25CC;&#x093D;|&#x093D;" />
</case>
+ <case
+ latin:keyboardLayoutSet="nepali_romanized"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+093C: "़" DEVANAGARI SIGN NUKTA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignNukta"
+ latin:moreKeys="&#x25CC;&#x093C;|&#x093C;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariSignNukta" />
@@ -44,9 +53,9 @@
</switch>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+093C: "़" DEVANAGARI SIGN NUKTA -->
- <Key
- latin:keyStyle="moreKeysDevanagariSignNukta"
- latin:keyLabel="&#x25CC;&#x093C;"
- latin:code="0x093C"
+ <key-style
+ latin:styleName="baseKeyDevanagariSignNukta"
+ latin:parentStyle="moreKeysDevanagariSignNukta"
+ latin:keySpec="&#x25CC;&#x093C;|&#x093C;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_virama.xml b/java/res/xml/keystyle_devanagari_sign_virama.xml
index b22fbe842..96506e2fc 100644
--- a/java/res/xml/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml/keystyle_devanagari_sign_virama.xml
@@ -25,11 +25,26 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
+ <switch>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+094D: "्" DEVANAGARI SIGN VIRAMA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignVirama"
+ latin:moreKeys="&#x25CC;&#x094D;|&#x094D;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariSignVirama" />
+ </default>
+ </switch>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+094D: "्" DEVANAGARI SIGN VIRAMA -->
<key-style
latin:styleName="baseKeyDevanagariSignVirama"
- latin:keyLabel="&#x25CC;&#x094D;"
- latin:code="0x094D"
+ latin:parentStyle="moreKeysDevanagariSignVirama"
+ latin:keySpec="&#x25CC;&#x094D;|&#x094D;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_visarga.xml b/java/res/xml/keystyle_devanagari_sign_visarga.xml
index cb294951f..45f519a43 100644
--- a/java/res/xml/keystyle_devanagari_sign_visarga.xml
+++ b/java/res/xml/keystyle_devanagari_sign_visarga.xml
@@ -29,7 +29,6 @@
U+0903: "ः" DEVANAGARI SIGN VISARGA -->
<key-style
latin:styleName="baseKeyDevanagariSignVisarga"
- latin:keyLabel="&#x25CC;&#x0903;"
- latin:code="0x0903"
+ latin:keySpec="&#x25CC;&#x0903;|&#x0903;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
index 2e78c53ec..4b876505a 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
@@ -36,6 +36,15 @@
latin:styleName="moreKeysDevanagariVowelSignAa"
latin:moreKeys="&#x25CC;&#x093E;&#x0902;|&#x093E;&#x0902;,&#x25CC;&#x093E;&#x0901;|&#x093E;&#x0901;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAa"
+ latin:moreKeys="&#x25CC;&#x093E;|&#x093E;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignAa" />
@@ -46,7 +55,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignAa"
latin:parentStyle="moreKeysDevanagariVowelSignAa"
- latin:keyLabel="&#x25CC;&#x093E;"
- latin:code="0x093E"
+ latin:keySpec="&#x25CC;&#x093E;|&#x093E;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
index 0554c0e15..050a7ce0e 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
@@ -36,6 +36,15 @@
latin:moreKeys="&#x25CC;&#x0948;&#x0902;|&#x0948;&#x0902;,%" />
</case>
<case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAi"
+ latin:moreKeys="&#x25CC;&#x0948;|&#x0948;,%" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
@@ -53,7 +62,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignAi"
latin:parentStyle="moreKeysDevanagariVowelSignAi"
- latin:keyLabel="&#x25CC;&#x0948;"
- latin:code="0x0948"
+ latin:keySpec="&#x25CC;&#x0948;|&#x0948;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
index 29a11a82e..49e67da38 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
@@ -30,11 +30,20 @@
latin:keyboardLayoutSet="hindi"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
- U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
+ U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
<key-style
latin:styleName="moreKeysDevanagariVowelSignAu"
latin:moreKeys="&#x25CC;&#x094C;&#x0902;|&#x094C;&#x0902;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAu"
+ latin:moreKeys="&#x25CC;&#x094C;|&#x094C;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignAu" />
@@ -44,7 +53,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignAu"
latin:parentStyle="moreKeysDevanagariVowelSignAu"
- latin:keyLabel="&#x25CC;&#x094C;"
- latin:code="0x094C"
+ latin:keySpec="&#x25CC;&#x094C;|&#x094C;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/key_devanagari_sign_anusvara.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
index 0acd3bcd4..86f68d355 100644
--- a/java/res/xml/key_devanagari_sign_anusvara.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2013, The Android Open Source Project
+** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -25,10 +25,19 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- U+25CC: "◌" DOTTED CIRCLE
- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
- <Key
- latin:keyLabel="&#x25CC;&#x0902;"
- latin:code="0x0902"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <switch>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraE"
+ latin:moreKeys="&#x25CC;&#x0945;|&#x0945;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraE" />
+ </default>
+ </switch>
</merge>
diff --git a/java/res/xml/key_devanagari_vowel_sign_candra_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
index 370fc5405..fd711e049 100644
--- a/java/res/xml/key_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -25,10 +25,26 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
+ <switch>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraO"
+ latin:moreKeys="&#x25CC;&#x0949;|&#x0949;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraO" />
+ </default>
+ </switch>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
- <Key
- latin:keyLabel="&#x25CC;&#x0949;"
- latin:code="0x0949"
+ <key-style
+ latin:styleName="baseKeyDevanagariVowelSignCandraO"
+ latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
+ latin:keySpec="&#x25CC;&#x0949;|&#x0949;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
index edd29c791..88f6a74f4 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
@@ -36,6 +36,15 @@
latin:moreKeys="&#x25CC;&#x0947;&#x0902;|&#x0947;&#x0902;" />
</case>
<case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0947: "े" DEVANAGARI VOWEL SIGN E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignE"
+ latin:moreKeys="&#x25CC;&#x0947;|&#x0947;" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
@@ -53,7 +62,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignE"
latin:parentStyle="moreKeysDevanagariVowelSignE"
- latin:keyLabel="&#x25CC;&#x0947;"
- latin:code="0x0947"
+ latin:keySpec="&#x25CC;&#x0947;|&#x0947;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
index 200fed29f..a84fdb4a9 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
@@ -35,6 +35,15 @@
latin:styleName="moreKeysDevanagariVowelSignI"
latin:moreKeys="&#x093F;&#x25CC;&#x0902;|&#x093F;&#x0902;" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignI"
+ latin:moreKeys="&#x25CC;&#x093F;|&#x093F;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignI" />
@@ -45,7 +54,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignI"
latin:parentStyle="moreKeysDevanagariVowelSignI"
- latin:keyLabel="&#x25CC;&#x093F;"
- latin:code="0x093F"
+ latin:keySpec="&#x25CC;&#x093F;|&#x093F;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
index 6dc9951df..6f6eb0f15 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
@@ -29,12 +29,21 @@
<case
latin:keyboardLayoutSet="hindi"
>
- <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II
+ <!-- U+25CC: "◌" DOTTED CIRCLE
U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
<key-style
latin:styleName="moreKeysDevanagariVowelSignIi"
latin:moreKeys="&#x25CC;&#x0940;&#x0902;|&#x0940;&#x0902;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignIi"
+ latin:moreKeys="&#x25CC;&#x0940;|&#x0940;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignIi" />
@@ -45,7 +54,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignIi"
latin:parentStyle="moreKeysDevanagariVowelSignIi"
- latin:keyLabel="&#x25CC;&#x0940;"
- latin:code="0x0940"
+ latin:keySpec="&#x25CC;&#x0940;|&#x0940;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
index 233ac8609..68b176a43 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
@@ -30,13 +30,22 @@
latin:keyboardLayoutSet="hindi"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
- U+094B/U+0902: "қं" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
+ U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O -->
<key-style
latin:styleName="moreKeysDevanagariVowelSignO"
latin:moreKeys="&#x25CC;&#x094B;&#x0902;|&#x094B;&#x0902;,&#x25CC;&#x0949;|&#x0949;,&#x25CC;&#x094A;|&#x094A;" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignO"
+ latin:moreKeys="&#x25CC;&#x094B;|&#x094B;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignO" />
@@ -47,7 +56,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignO"
latin:parentStyle="moreKeysDevanagariVowelSignO"
- latin:keyLabel="&#x25CC;&#x094B;"
- latin:code="0x094B"
+ latin:keySpec="&#x25CC;&#x094B;|&#x094B;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
index 7291b7099..7c058b174 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
@@ -36,6 +36,15 @@
latin:styleName="moreKeysDevanagariVowelSignU"
latin:moreKeys="&#x25CC;&#x0941;&#x0902;|&#x0941;&#x0902;,&#x25CC;&#x0941;&#x0901;|&#x0941;&#x0901;" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignU"
+ latin:moreKeys="&#x25CC;&#x0941;|&#x0941;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignU" />
@@ -46,7 +55,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignU"
latin:parentStyle="moreKeysDevanagariVowelSignU"
- latin:keyLabel="&#x25CC;&#x0941;"
- latin:code="0x0941"
+ latin:keySpec="&#x25CC;&#x0941;|&#x0941;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
index a95ab822d..73ab63c89 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
@@ -36,6 +36,15 @@
latin:styleName="moreKeysDevanagariVowelSignUu"
latin:moreKeys="&#x25CC;&#x0942;&#x0902;|&#x0942;&#x0902;,&#x25CC;&#x0942;&#x0901;|&#x0942;&#x0901;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignUu"
+ latin:moreKeys="&#x25CC;&#x0942;|&#x0942;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignUu" />
@@ -46,7 +55,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignUu"
latin:parentStyle="moreKeysDevanagariVowelSignUu"
- latin:keyLabel="&#x25CC;&#x0942;"
- latin:code="0x0942"
+ latin:keySpec="&#x25CC;&#x0942;|&#x0942;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/key_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
index f150d7ed9..29b083eb3 100644
--- a/java/res/xml/key_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -36,6 +36,16 @@
latin:moreKeys="&#x25CC;&#x0944;|&#x0944;" />
</case>
<case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
+ U+25CC: "◌" DOTTED CIRCLE
+ U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignVocalicR"
+ latin:moreKeys="&#x090B;,&#x25CC;&#x0943;|&#x0943;" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0913: "ओ" DEVANAGARI LETTER O -->
@@ -50,9 +60,9 @@
</switch>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
- <Key
- latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
- latin:keyLabel="&#x25CC;&#x0943;"
- latin:code="0x0943"
+ <key-style
+ latin:styleName="baseKeyDevanagariVowelSignVocalicR"
+ latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
+ latin:keySpec="&#x25CC;&#x0943;|&#x0943;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 0a27da93f..28eceb8db 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -24,52 +24,60 @@
keyboard_locale: script_name/keyboard_layout_set
af: Afrikaans/qwerty
ar: Arabic/arabic
- (az: Azerbaijani/qwerty) # disabled temporarily. waiting for string resources.
- be: Belarusian/east_slavic
+ az_AZ: Azerbaijani (Azerbaijan)/qwerty
+ be_BY: Belarusian (Belarus)/east_slavic
bg: Bulgarian/bulgarian
bg: Bulgarian/bulgarian_bds
ca: Catalan/spanish
cs: Czech/qwertz
da: Danish/nordic
de: German/qwertz
+ de_CH: German (Switzerland)/swiss
el: Greek/greek
- en_US: English United States/qwerty
- en_GB: English Great Britain/qwerty
+ en_IN: English (India)/qwerty
+ en_US: English (United States)/qwerty
+ en_GB: English (Great Britain)/qwerty
eo: Esperanto/spanish
es: Spanish/spanish
- es_US: Spanish United States/spanish
- (es_419: Spanish Latin America/qwerty)
- et_EE: Estonian/nordic
- fa: Persian/arabic
+ es_US: Spanish (United States)/spanish
+ es_419: Spanish (Latin America)/spanish
+ et_EE: Estonian (Estonia)/nordic
+ eu_ES: Basque (Spain)/spanish
+ fa: Persian/farsi
fi: Finnish/nordic
fr: French/azerty
- fr_CA: French Canada/qwerty
+ fr_CA: French (Canada)/qwerty
+ fr_CH: French (Switzerland)/swiss
+ gl_ES: Galician (Spain)/spanish
hi: Hindi/hindi
+ (hi: Hindi/hindi_compact) # This is a preliminary keyboard layout.
hr: Croatian/qwertz
hu: Hungarian/qwertz
- hy_AM: Armenian Phonetic/armenian_phonetic
- in: Indonesian/qwerty # "id" is official language code of Indonesian.
+ hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic
+ in: Indonesian/qwerty # "id" is the official language code of Indonesian.
is: Icelandic/qwerty
it: Italian/qwerty
- iw: Hebrew/hebrew # "he" is official language code of Hebrew.
- ka_GE: Georgian/georgian
- (kk: Kazakh/east_slavic) # disabled temporarily. waiting for string resources.
- km_KH: Khmer/khmer
+ it_CH: Italian (Switzerland)/swiss
+ iw: Hebrew/hebrew # "he" is the official language code of Hebrew.
+ ka_GE: Georgian (Georgia)/georgian
+ kk: Kazakh/east_slavic
+ km_KH: Khmer (Cambodia)/khmer
ky: Kyrgyz/east_slavic
- lo_LA: Lao/lao
+ lo_LA: Lao (Laos)/lao
lt: Lithuanian/qwerty
lv: Latvian/qwerty
mk: Macedonian/south_slavic
- mn_MN: Mongolian/mongolian
- ms_MY: Malay/qwerty
+ mn_MN: Mongolian (Mongolia)/mongolian
+ ms_MY: Malay (Malaysia)/qwerty
+ (my_MM: Myanmar (Myanmar)/myanmar) # This is a preliminary keyboard layout.
nb: Norwegian Bokmål/nordic
- (ne: Nepali Romanized/nepali_romanized) # disabled temporarily
- (ne: Nepali Traditional/nepali_traditional) # disabled temporarily
+ ne_NP: Nepali (Nepal) Romanized/nepali_romanized
+ ne_NP: Nepali (Nepal) Traditional/nepali_traditional
nl: Dutch/qwerty
- nl_BE: Dutch Belgium/azerty
+ nl_BE: Dutch (Belgium)/azerty
pl: Polish/qwerty
- pt_BR: Portuguese Brazil/qwerty
- pt_PT: Portuguese Portugal/qwerty
+ pt_BR: Portuguese (Brazil)/qwerty
+ pt_PT: Portuguese (Portugal)/qwerty
ro: Romanian/qwerty
ru: Russian/east_slavic
sk: Slovak/qwerty
@@ -88,19 +96,22 @@
(zz: Emoji/emoji)
-->
<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
+<!-- TODO: Remove "AsciiCapable" from the extra values when we can stop supporting JB-MR1 -->
<!-- Note: SupportTouchPositionCorrection extra value is obsolete and maintained for backward
compatibility. -->
<!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
subtype.-->
<input-method xmlns:android="http://schemas.android.com/apk/res/android"
android:settingsActivity="com.android.inputmethod.latin.settings.SettingsActivity"
- android:isDefault="@bool/im_is_default">
+ android:isDefault="@bool/im_is_default"
+ android:supportsSwitchingToNextInputMethod="true">
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_en_US"
android:subtypeId="0xc9194f98"
android:imeSubtypeLocale="en_US"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_en_GB"
@@ -108,6 +119,7 @@
android:imeSubtypeLocale="en_GB"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -115,6 +127,7 @@
android:imeSubtypeLocale="af"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -122,22 +135,23 @@
android:imeSubtypeLocale="ar"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="false"
/>
- <!--
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x70b0f974"
- android:imeSubtypeLocale="az"
+ android:imeSubtypeLocale="az_AZ"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
- -->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x1dc3a859"
- android:imeSubtypeLocale="be"
+ android:imeSubtypeLocale="be_BY"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -145,6 +159,7 @@
android:imeSubtypeLocale="bg"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_bulgarian_bds"
@@ -152,6 +167,7 @@
android:imeSubtypeLocale="bg"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -159,6 +175,7 @@
android:imeSubtypeLocale="ca"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -166,6 +183,7 @@
android:imeSubtypeLocale="cs"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -173,6 +191,7 @@
android:imeSubtypeLocale="da"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -180,6 +199,15 @@
android:imeSubtypeLocale="de"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
+ />
+ <subtype android:icon="@drawable/ic_ime_switcher_dark"
+ android:label="@string/subtype_generic"
+ android:subtypeId="0x7acfd0aa"
+ android:imeSubtypeLocale="de_CH"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -187,6 +215,15 @@
android:imeSubtypeLocale="el"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=greek,EmojiCapable"
+ android:isAsciiCapable="false"
+ />
+ <subtype android:icon="@drawable/ic_ime_switcher_dark"
+ android:label="@string/subtype_generic"
+ android:subtypeId="0x8d58fc2d"
+ android:imeSubtypeLocale="en_IN"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -194,6 +231,7 @@
android:imeSubtypeLocale="eo"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -201,6 +239,7 @@
android:imeSubtypeLocale="es"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_es_US"
@@ -208,22 +247,31 @@
android:imeSubtypeLocale="es_US"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
- <!--
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
- android:subtypeId="0x623f9286"
+ android:subtypeId="0xa23e5d19"
android:imeSubtypeLocale="es_419"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
- -->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0xec2d3955"
android:imeSubtypeLocale="et_EE"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=nordic,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
+ />
+ <subtype android:icon="@drawable/ic_ime_switcher_dark"
+ android:label="@string/subtype_generic"
+ android:subtypeId="0x070e5c07"
+ android:imeSubtypeLocale="eu_ES"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -231,6 +279,7 @@
android:imeSubtypeLocale="fa"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=farsi,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -238,6 +287,7 @@
android:imeSubtypeLocale="fi"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -245,6 +295,7 @@
android:imeSubtypeLocale="fr"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -252,6 +303,23 @@
android:imeSubtypeLocale="fr_CA"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
+ />
+ <subtype android:icon="@drawable/ic_ime_switcher_dark"
+ android:label="@string/subtype_generic"
+ android:subtypeId="0xeadc55f5"
+ android:imeSubtypeLocale="fr_CH"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
+ />
+ <subtype android:icon="@drawable/ic_ime_switcher_dark"
+ android:label="@string/subtype_generic"
+ android:subtypeId="0xb939573c"
+ android:imeSubtypeLocale="gl_ES"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -259,6 +327,17 @@
android:imeSubtypeLocale="hi"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi,EmojiCapable"
+ android:isAsciiCapable="false"
+ />
+ <!-- TODO: This hindi_compact keyboard is a preliminary layout.
+ This isn't based on the final specification. -->
+ <subtype android:icon="@drawable/ic_ime_switcher_dark"
+ android:label="@string/subtype_generic_compact"
+ android:subtypeId="0xe49c89a1"
+ android:imeSubtypeLocale="hi"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi_compact,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -266,6 +345,7 @@
android:imeSubtypeLocale="hr"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -273,6 +353,7 @@
android:imeSubtypeLocale="hu"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -280,6 +361,7 @@
android:imeSubtypeLocale="hy_AM"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=armenian_phonetic,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<!-- Java uses the deprecated "in" code instead of the standard "id" code for Indonesian. -->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
@@ -288,6 +370,7 @@
android:imeSubtypeLocale="in"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -295,6 +378,7 @@
android:imeSubtypeLocale="is"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -302,6 +386,15 @@
android:imeSubtypeLocale="it"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
+ />
+ <subtype android:icon="@drawable/ic_ime_switcher_dark"
+ android:label="@string/subtype_generic"
+ android:subtypeId="0xd914fe1a"
+ android:imeSubtypeLocale="it_CH"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. -->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
@@ -310,6 +403,7 @@
android:imeSubtypeLocale="iw"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -317,22 +411,23 @@
android:imeSubtypeLocale="ka_GE"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=georgian,EmojiCapable"
+ android:isAsciiCapable="false"
/>
- <!--
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x2d73d2f6"
android:imeSubtypeLocale="kk"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
+ android:isAsciiCapable="false"
/>
- -->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x1365683a"
android:imeSubtypeLocale="km_KH"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=khmer,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -340,6 +435,7 @@
android:imeSubtypeLocale="ky"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -347,6 +443,7 @@
android:imeSubtypeLocale="lo_LA"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=lao,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -354,6 +451,7 @@
android:imeSubtypeLocale="lt"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -361,6 +459,7 @@
android:imeSubtypeLocale="lv"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -368,6 +467,7 @@
android:imeSubtypeLocale="mk"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=south_slavic,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -375,6 +475,7 @@
android:imeSubtypeLocale="mn_MN"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -382,6 +483,17 @@
android:imeSubtypeLocale="ms_MY"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
+ />
+ <!-- TODO: This Myanmar keyboard is a preliminary layout.
+ This isn't based on the final specification. -->
+ <subtype android:icon="@drawable/ic_ime_switcher_dark"
+ android:label="@string/subtype_generic"
+ android:subtypeId="0xea266ea4"
+ android:imeSubtypeLocale="my_MM"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=myanmar,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -389,29 +501,31 @@
android:imeSubtypeLocale="nb"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
- <!--
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0xd80a4cee"
- android:imeSubtypeLocale="ne"
+ android:imeSubtypeLocale="ne_NP"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_romanized,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
- android:label="@string/subtype_nepali_traditional"
+ android:label="@string/subtype_generic_traditional"
android:subtypeId="0x5fafea88"
- android:imeSubtypeLocale="ne"
+ android:imeSubtypeLocale="ne_NP"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_traditional,EmojiCapable"
+ android:isAsciiCapable="false"
/>
- -->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x3f9fd91e"
android:imeSubtypeLocale="nl"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -419,6 +533,7 @@
android:imeSubtypeLocale="nl_BE"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=azerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -426,6 +541,7 @@
android:imeSubtypeLocale="pl"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -433,6 +549,7 @@
android:imeSubtypeLocale="pt_BR"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -440,6 +557,7 @@
android:imeSubtypeLocale="pt_PT"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -447,6 +565,7 @@
android:imeSubtypeLocale="ro"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -454,6 +573,7 @@
android:imeSubtypeLocale="ru"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -461,6 +581,7 @@
android:imeSubtypeLocale="sk"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -468,6 +589,7 @@
android:imeSubtypeLocale="sl"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -475,6 +597,7 @@
android:imeSubtypeLocale="sr"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<!-- TODO: Uncomment once we can handle IETF language tag with script name specified.
<subtype android:icon="@drawable/ic_ime_switcher_dark"
@@ -483,6 +606,7 @@
android:imeSubtypeLocale="sr"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_serbian_latin"
@@ -490,6 +614,7 @@
android:imeSubtypeLocale="sr-Latn"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
-->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
@@ -498,6 +623,7 @@
android:imeSubtypeLocale="sv"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -505,6 +631,7 @@
android:imeSubtypeLocale="sw"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -512,6 +639,7 @@
android:imeSubtypeLocale="th"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=thai,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -519,6 +647,7 @@
android:imeSubtypeLocale="tl"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -526,6 +655,7 @@
android:imeSubtypeLocale="tr"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -533,6 +663,7 @@
android:imeSubtypeLocale="uk"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
+ android:isAsciiCapable="false"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -540,6 +671,7 @@
android:imeSubtypeLocale="vi"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
@@ -547,6 +679,7 @@
android:imeSubtypeLocale="zu"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_no_language_qwerty"
@@ -554,6 +687,7 @@
android:imeSubtypeLocale="zz"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
/>
<!-- Emoji subtype has to be an addtional subtype added at boot time because ICS doesn't
support Emoji. -->
@@ -564,6 +698,7 @@
android:imeSubtypeLocale="zz"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=emoji,EmojiCapable"
+ android:isAsciiCapable="false"
/>
-->
</input-method>
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index bf3b62353..7d86dbd5d 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -89,6 +89,12 @@
android:entryValues="@array/prefs_suggestion_visibility_values"
android:entries="@array/prefs_suggestion_visibilities"
android:defaultValue="@string/prefs_suggestion_visibility_default_value" />
+ <CheckBoxPreference
+ android:key="pref_key_use_personalized_dicts"
+ android:title="@string/use_personalized_dicts"
+ android:summary="@string/use_personalized_dicts_summary"
+ android:persistent="true"
+ android:defaultValue="true" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/gesture_typing_category"
@@ -151,34 +157,22 @@
android:summary="@string/include_other_imes_in_language_switch_list_summary"
android:persistent="true"
android:defaultValue="false" />
- <!-- Values for popup dismiss delay are added programmatically -->
- <CheckBoxPreference
- android:key="pref_sliding_key_input_preview"
- android:title="@string/sliding_key_input_preview"
- android:summary="@string/sliding_key_input_preview_summary"
- android:persistent="true"
- android:defaultValue="true" />
<ListPreference
android:key="pref_keyboard_layout_20110916"
android:title="@string/keyboard_color_scheme"
android:persistent="true"
- android:entryValues="@array/keyboard_color_schemes_values"
- android:entries="@array/keyboard_color_schemes"
- android:defaultValue="@string/config_default_keyboard_theme_index" />
+ android:entryValues="@array/keyboard_theme_ids"
+ android:entries="@array/keyboard_theme_names"
+ android:defaultValue="@string/config_default_keyboard_theme_id" />
<PreferenceScreen
android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings"
android:key="custom_input_styles"
android:title="@string/custom_input_styles_title" />
+ <!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. -->
<ListPreference
android:key="pref_key_preview_popup_dismiss_delay"
android:title="@string/key_preview_popup_dismiss_delay" />
<com.android.inputmethod.latin.settings.SeekBarDialogPreference
- android:key="pref_key_longpress_timeout"
- android:title="@string/prefs_key_longpress_timeout_settings"
- latin:minValue="@integer/config_min_longpress_timeout"
- latin:maxValue="@integer/config_max_longpress_timeout"
- latin:stepValue="@integer/config_longpress_timeout_step" />
- <com.android.inputmethod.latin.settings.SeekBarDialogPreference
android:key="pref_vibration_duration_settings"
android:title="@string/prefs_keypress_vibration_duration_settings"
latin:maxValue="@integer/config_max_vibration_duration" />
diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml
index 8d9508e38..c333b0751 100644
--- a/java/res/xml/prefs_for_debug.xml
+++ b/java/res/xml/prefs_for_debug.xml
@@ -14,51 +14,74 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/prefs_debug_mode"
- android:key="english_ime_debug_settings">
-
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ android:title="@string/prefs_debug_mode"
+ android:key="english_ime_debug_settings"
+>
<CheckBoxPreference
- android:key="enable_logging"
- android:title="@string/prefs_enable_log"
- android:summary="@string/prefs_description_log"
- android:persistent="true"
- android:defaultValue="false" />
-
- <ListPreference
- android:key="pref_keyboard_layout_20110916"
- android:title="@string/keyboard_layout"
- android:summary="%s"
- android:persistent="true"
- android:entryValues="@array/keyboard_layout_modes_values"
- android:entries="@array/keyboard_layout_modes"
- android:defaultValue="@string/config_default_keyboard_theme_index" />
-
+ android:key="enable_logging"
+ android:title="@string/prefs_enable_log"
+ android:summary="@string/prefs_description_log"
+ android:persistent="true"
+ android:defaultValue="false" />
<CheckBoxPreference
- android:key="debug_mode"
- android:title="@string/prefs_debug_mode"
- android:persistent="true"
- android:defaultValue="false" />
-
+ android:key="debug_mode"
+ android:title="@string/prefs_debug_mode"
+ android:persistent="true"
+ android:defaultValue="false" />
<CheckBoxPreference
- android:key="force_non_distinct_multitouch"
- android:title="@string/prefs_force_non_distinct_multitouch"
- android:persistent="true"
- android:defaultValue="false" />
-
+ android:key="force_non_distinct_multitouch"
+ android:title="@string/prefs_force_non_distinct_multitouch"
+ android:persistent="true"
+ android:defaultValue="false" />
<CheckBoxPreference
- android:key="usability_study_mode"
- android:title="@string/prefs_usability_study_mode"
- android:persistent="true"
- android:defaultValue="false" />
-
+ android:key="usability_study_mode"
+ android:title="@string/prefs_usability_study_mode"
+ android:persistent="true"
+ android:defaultValue="false" />
<CheckBoxPreference
- android:defaultValue="false"
- android:key="use_only_personalization_dictionary_for_debug"
+ android:key="pref_sliding_key_input_preview"
+ android:title="@string/sliding_key_input_preview"
+ android:summary="@string/sliding_key_input_preview_summary"
android:persistent="true"
- android:title="@string/prefs_use_only_personalization_dictionary" />
-
+ android:defaultValue="true" />
+ <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+ android:key="pref_key_longpress_timeout"
+ android:title="@string/prefs_key_longpress_timeout_settings"
+ latin:minValue="@integer/config_min_longpress_timeout"
+ latin:maxValue="@integer/config_max_longpress_timeout"
+ latin:stepValue="@integer/config_longpress_timeout_step" />
+ <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+ android:key="pref_key_preview_show_up_start_scale"
+ android:title="@string/prefs_key_popup_show_up_start_scale_settings"
+ latin:maxValue="100" /> <!-- percent -->
+ <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+ android:key="pref_key_preview_dismiss_end_scale"
+ android:title="@string/prefs_key_popup_dismiss_end_scale_settings"
+ latin:maxValue="100" /> <!-- percent -->
+ <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+ android:key="pref_key_preview_show_up_duration"
+ android:title="@string/prefs_key_popup_show_up_duration_settings"
+ latin:maxValue="100" /> <!-- milliseconds -->
+ <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+ android:key="pref_key_preview_dismiss_duration"
+ android:title="@string/prefs_key_popup_dismiss_duration_settings"
+ latin:maxValue="100" /> <!-- milliseconds -->
<PreferenceScreen
android:key="read_external_dictionary"
android:title="@string/prefs_read_external_dictionary" />
+ <PreferenceScreen
+ android:key="dump_contacts_dict"
+ android:title="@string/prefs_dump_contacts_dict" />
+ <PreferenceScreen
+ android:key="dump_user_dict"
+ android:title="@string/prefs_dump_user_dict" />
+ <PreferenceScreen
+ android:key="dump_user_history_dict"
+ android:title="@string/prefs_dump_user_history_dict" />
+ <PreferenceScreen
+ android:key="dump_personalization_dict"
+ android:title="@string/prefs_dump_personalization_dict" />
</PreferenceScreen>
diff --git a/java/res/xml/row_dvorak4.xml b/java/res/xml/row_dvorak4.xml
index b78872fe4..91462cb9c 100644
--- a/java/res/xml/row_dvorak4.xml
+++ b/java/res/xml/row_dvorak4.xml
@@ -28,17 +28,17 @@
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="15%p" />
<Key
- latin:keyLabel="q"
+ latin:keySpec="q"
latin:backgroundType="normal"
- latin:additionalMoreKeys="!text/shortcut_as_more_key"
+ latin:additionalMoreKeys="!text/keyspec_shortcut"
latin:keyStyle="f1MoreKeysStyle" />
<include
latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space_5kw" />
<Key
- latin:keyLabel="z"
+ latin:keySpec="z"
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_punctuation,!text/more_keys_for_z" />
+ latin:moreKeys="!text/morekeys_punctuation,!text/morekeys_z" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml/row_pcqwerty5.xml b/java/res/xml/row_pcqwerty5.xml
index 4ec908ba1..3782763a8 100644
--- a/java/res/xml/row_pcqwerty5.xml
+++ b/java/res/xml/row_pcqwerty5.xml
@@ -24,23 +24,21 @@
<Row
latin:keyWidth="7.692%p"
>
- <Spacer
- latin:keyWidth="11.538%p" />
<switch>
<case
- latin:shortcutKeyEnabled="true"
+ latin:hasShortcutKey="true"
>
<Key
latin:keyStyle="shortcutKeyStyle"
latin:keyWidth="11.538%p" />
- </case>
+ </case>
<case
latin:clobberSettingsKey="false"
>
<Key
latin:keyStyle="settingsKeyStyle"
latin:keyWidth="11.538%p" />
- </case>
+ </case>
</switch>
<switch>
<case
@@ -48,33 +46,23 @@
>
<Key
latin:keyStyle="languageSwitchKeyStyle"
+ latin:keyXPos="19.231%p"
latin:keyWidth="11.538%p" />
<Key
latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="38.464%p" />
- </case>
+ latin:keyWidth="42.308%p" />
+ </case>
<!-- languageSwitchKeyEnabled="false" -->
<default>
<Key
latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="50.002%p" />
+ latin:keyXPos="26.923%p"
+ latin:keyWidth="46.154%p" />
</default>
</switch>
<Key
- latin:keyStyle="defaultEnterKeyStyle"
- latin:keyWidth="15.384%p" />
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
- >
- <Spacer />
- </case>
- <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
- <default>
- <Key
- latin:keyStyle="emojiKeyStyle"
- latin:keyWidth="fillRight" />
- </default>
- </switch>
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-19.231%p"
+ latin:keyWidth="fillRight" />
</Row>
</merge>
diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml
index 578bc1234..509092d96 100644
--- a/java/res/xml/row_qwerty4.xml
+++ b/java/res/xml/row_qwerty4.xml
@@ -32,36 +32,8 @@
<include
latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space_5kw" />
- <switch>
- <case
- latin:languageCode="ar|fa"
- >
- <Key
- latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
- latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
- latin:moreKeys="!text/more_keys_for_arabic_diacritics"
- latin:keyStyle="punctuationKeyStyle" />
- </case>
- <case
- latin:languageCode="ne"
- latin:keyboardLayoutSet="nepali_traditional"
- >
- <include
- latin:keyboardLayout="@xml/key_nepali_traditional_period" />
- </case>
- <case
- latin:languageCode="hy"
- >
- <!-- U+0589: "։" ARMENIAN FULL STOP -->
- <Key
- latin:keyLabel="&#x0589;"
- latin:keyStyle="punctuationKeyStyle" />
- </case>
- <default>
- <Key
- latin:keyStyle="punctuationKeyStyle" />
- </default>
- </switch>
+ <include
+ latin:keyboardLayout="@xml/key_period" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml
index fbfdc5f72..09f6b628c 100644
--- a/java/res/xml/row_symbols4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -19,24 +19,12 @@
-->
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
-
<Key
- latin:backgroundType="functional"
- latin:keyLabel="_" />
+ latin:keySpec="_" />
<Key
- latin:backgroundType="functional"
- latin:keyLabel="/" />
-
- <switch>
- <case latin:hasShortcutKey="true" >
- <Key latin:keyStyle="shortcutKeyStyle" />
- </case>
- <!-- latin:hasShortcutKey="false" -->
- <default>
- </default>
- </switch>
-
- <include latin:keyboardLayout="@xml/key_space_symbols" />
- <include latin:keyboardLayout="@xml/keys_comma_period" />
-
+ latin:keySpec="/" />
+ <include
+ latin:keyboardLayout="@xml/key_space_symbols" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period_symbols" />
</merge>
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index 0909374f4..f75575bc6 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -22,5 +22,5 @@
<include latin:keyboardLayout="@xml/keys_less_greater" />
<include
latin:keyboardLayout="@xml/key_space_symbols" />
- <include latin:keyboardLayout="@xml/keys_comma_period" />
+ <include latin:keyboardLayout="@xml/keys_comma_period_symbols" />
</merge>
diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml
index 3c0acf112..266bba407 100644
--- a/java/res/xml/rowkeys_arabic1.xml
+++ b/java/res/xml/rowkeys_arabic1.xml
@@ -24,43 +24,43 @@
<!-- U+0636: "ض" ARABIC LETTER DAD
U+0661: "١" ARABIC-INDIC DIGIT ONE -->
<Key
- latin:keyLabel="&#x0636;"
+ latin:keySpec="&#x0636;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1,&#x0661;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0635: "ص" ARABIC LETTER SAD
U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
<Key
- latin:keyLabel="&#x0635;"
+ latin:keySpec="&#x0635;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2,&#x0662;"
latin:keyLabelFlags="fontNormal" />
<!-- U+062B: "ث" ARABIC LETTER THEH
U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
<Key
- latin:keyLabel="&#x062B;"
+ latin:keySpec="&#x062B;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3,&#x0663;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0642: "ق" ARABIC LETTER QAF
- U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE
- U+0664: "٤" ARABIC-INDIC DIGIT FOUR -->
+ U+0664: "٤" ARABIC-INDIC DIGIT FOUR
+ U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
<!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
<Key
- latin:keyLabel="&#x0642;"
+ latin:keySpec="&#x0642;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4,&#x0664;"
latin:moreKeys="&#x06A8;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0641: "ف" ARABIC LETTER FEH
+ U+0665: "٥" ARABIC-INDIC DIGIT FIVE
U+06A4: "ڤ" ARABIC LETTER VEH
U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
- U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW
- U+0665: "٥" ARABIC-INDIC DIGIT FIVE -->
+ U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW -->
<!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
<!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
<Key
- latin:keyLabel="&#x0641;"
+ latin:keySpec="&#x0641;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5,&#x0665;"
latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;"
@@ -68,23 +68,23 @@
<!-- U+063A: "غ" ARABIC LETTER GHAIN
U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
<Key
- latin:keyLabel="&#x063A;"
+ latin:keySpec="&#x063A;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6,&#x0666;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0639: "ع" ARABIC LETTER AIN
U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
<Key
- latin:keyLabel="&#x0639;"
+ latin:keySpec="&#x0639;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7,&#x0667;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0647: "ه" ARABIC LETTER HEH
+ U+0668: "٨" ARABIC-INDIC DIGIT EIGHT
U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
- U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
- U+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
+ U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
<Key
- latin:keyLabel="&#x0647;"
+ latin:keySpec="&#x0647;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8,&#x0668;"
latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;"
@@ -92,21 +92,21 @@
<!-- U+062E: "خ" ARABIC LETTER KHAH
U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
<Key
- latin:keyLabel="&#x062E;"
+ latin:keySpec="&#x062E;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9,&#x0669;"
latin:keyLabelFlags="fontNormal" />
<!-- U+062D: "ح" ARABIC LETTER HAH
U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
<Key
- latin:keyLabel="&#x062D;"
+ latin:keySpec="&#x062D;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0,&#x0660;"
latin:keyLabelFlags="fontNormal" />
<!-- U+062C: "ج" ARABIC LETTER JEEM
U+0686: "چ" ARABIC LETTER TCHEH -->
<Key
- latin:keyLabel="&#x062C;"
+ latin:keySpec="&#x062C;"
latin:moreKeys="&#x0686;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml
index 4f8090d01..9bc91e8c7 100644
--- a/java/res/xml/rowkeys_arabic2.xml
+++ b/java/res/xml/rowkeys_arabic2.xml
@@ -25,24 +25,24 @@
U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
<!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
<Key
- latin:keyLabel="&#x0634;"
+ latin:keySpec="&#x0634;"
latin:moreKeys="&#x069C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0633: "س" ARABIC LETTER SEEN -->
<Key
- latin:keyLabel="&#x0633;"
+ latin:keySpec="&#x0633;"
latin:keyLabelFlags="fontNormal" />
<!-- U+064A: "ي" ARABIC LETTER YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
- latin:keyLabel="&#x064A;"
+ latin:keySpec="&#x064A;"
latin:moreKeys="&#x0626;,&#x0649;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0628: "ب" ARABIC LETTER BEH
U+067E: "پ" ARABIC LETTER PEH -->
<Key
- latin:keyLabel="&#x0628;"
+ latin:keySpec="&#x0628;"
latin:moreKeys="&#x067E;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0644: "ل" ARABIC LETTER LAM
@@ -55,7 +55,7 @@
U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
- latin:keyLabel="&#x0644;"
+ latin:keySpec="&#x0644;"
latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0627: "ا" ARABIC LETTER ALEF
@@ -65,30 +65,30 @@
U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
U+0671: "ٱ" ARABIC LETTER ALEF WASLA -->
<Key
- latin:keyLabel="&#x0627;"
+ latin:keySpec="&#x0627;"
latin:moreKeys="!fixedColumnOrder!5,&#x0622;,&#x0621;,&#x0623;,&#x0625;,&#x0671;"
latin:keyLabelFlags="fontNormal" />
<!-- U+062A: "ت" ARABIC LETTER TEH -->
<Key
- latin:keyLabel="&#x062A;"
+ latin:keySpec="&#x062A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0646: "ن" ARABIC LETTER NOON -->
<Key
- latin:keyLabel="&#x0646;"
+ latin:keySpec="&#x0646;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0645: "م" ARABIC LETTER MEEM -->
<Key
- latin:keyLabel="&#x0645;"
+ latin:keySpec="&#x0645;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0643: "ك" ARABIC LETTER KAF
U+06AF: "گ" ARABIC LETTER GAF
U+06A9: "ک" ARABIC LETTER KEHEH -->
<Key
- latin:keyLabel="&#x0643;"
+ latin:keySpec="&#x0643;"
latin:moreKeys="&#x06AF;,&#x06A9;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0637: "ط" ARABIC LETTER TAH -->
<Key
- latin:keyLabel="&#x0637;"
+ latin:keySpec="&#x0637;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_arabic3.xml b/java/res/xml/rowkeys_arabic3.xml
index 8a17b4b98..0bfc66a7d 100644
--- a/java/res/xml/rowkeys_arabic3.xml
+++ b/java/res/xml/rowkeys_arabic3.xml
@@ -25,42 +25,42 @@
latin:keyboardLayout="@xml/keys_arabic3_left" />
<!-- U+0621: "ء" ARABIC LETTER HAMZA -->
<Key
- latin:keyLabel="&#x0621;"
+ latin:keySpec="&#x0621;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
<Key
- latin:keyLabel="&#x0624;"
+ latin:keySpec="&#x0624;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
- latin:keyLabel="&#x0631;"
+ latin:keySpec="&#x0631;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
<Key
- latin:keyLabel="&#x0649;"
+ latin:keySpec="&#x0649;"
latin:moreKeys="&#x0626;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
<Key
- latin:keyLabel="&#x0629;"
+ latin:keySpec="&#x0629;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0648: "و" ARABIC LETTER WAW -->
<Key
- latin:keyLabel="&#x0648;"
+ latin:keySpec="&#x0648;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0632: "ز" ARABIC LETTER ZAIN
U+0698: "ژ" ARABIC LETTER JEH -->
<Key
- latin:keyLabel="&#x0632;"
+ latin:keySpec="&#x0632;"
latin:moreKeys="&#x0698;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0638: "ظ" ARABIC LETTER ZAH -->
<Key
- latin:keyLabel="&#x0638;"
+ latin:keySpec="&#x0638;"
latin:keyLabelFlags="fontNormal" />
<!-- U+062F: "د" ARABIC LETTER DAL -->
<Key
- latin:keyLabel="&#x062F;"
+ latin:keySpec="&#x062F;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic1.xml b/java/res/xml/rowkeys_armenian_phonetic1.xml
index 1984fae8a..8ca78dab4 100644
--- a/java/res/xml/rowkeys_armenian_phonetic1.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic1.xml
@@ -23,61 +23,61 @@
>
<!-- U+0567: "է" ARMENIAN SMALL LETTER EH -->
<Key
- latin:keyLabel="&#x0567;"
+ latin:keySpec="&#x0567;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:keyLabelFlags="fontNormal" />
<!-- U+0569: "թ" ARMENIAN SMALL LETTER TO -->
<Key
- latin:keyLabel="&#x0569;"
+ latin:keySpec="&#x0569;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:keyLabelFlags="fontNormal" />
<!-- U+0583: "փ" ARMENIAN SMALL LETTER PIWR -->
<Key
- latin:keyLabel="&#x0583;"
+ latin:keySpec="&#x0583;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:keyLabelFlags="fontNormal" />
<!-- U+0571: "ձ" ARMENIAN SMALL LETTER JA -->
<Key
- latin:keyLabel="&#x0571;"
+ latin:keySpec="&#x0571;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
latin:keyLabelFlags="fontNormal" />
<!-- U+057B: "ջ" ARMENIAN SMALL LETTER JHEH -->
<Key
- latin:keyLabel="&#x057B;"
+ latin:keySpec="&#x057B;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
latin:keyLabelFlags="fontNormal" />
<!-- U+0580: "ր" ARMENIAN SMALL LETTER REH -->
<Key
- latin:keyLabel="&#x0580;"
+ latin:keySpec="&#x0580;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
latin:keyLabelFlags="fontNormal" />
<!-- U+0579: "չ" ARMENIAN SMALL LETTER CHA -->
<Key
- latin:keyLabel="&#x0579;"
+ latin:keySpec="&#x0579;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
latin:keyLabelFlags="fontNormal" />
<!-- U+0573: "ճ" ARMENIAN SMALL LETTER CHEH -->
<Key
- latin:keyLabel="&#x0573;"
+ latin:keySpec="&#x0573;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:keyLabelFlags="fontNormal" />
<!-- U+056A: "ժ" ARMENIAN SMALL LETTER ZHE -->
<Key
- latin:keyLabel="&#x056A;"
+ latin:keySpec="&#x056A;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
latin:keyLabelFlags="fontNormal" />
<!-- U+056E: "ծ" ARMENIAN SMALL LETTER CA -->
<Key
- latin:keyLabel="&#x056E;"
+ latin:keySpec="&#x056E;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0"
latin:keyLabelFlags="fontNormal" />
diff --git a/java/res/xml/rowkeys_armenian_phonetic2.xml b/java/res/xml/rowkeys_armenian_phonetic2.xml
index 5dcabc301..9991f739d 100644
--- a/java/res/xml/rowkeys_armenian_phonetic2.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic2.xml
@@ -23,44 +23,45 @@
>
<!-- U+0584: "ք" ARMENIAN SMALL LETTER KEH -->
<Key
- latin:keyLabel="&#x0584;"
+ latin:keySpec="&#x0584;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0578: "ո" ARMENIAN SMALL LETTER VO -->
<Key
- latin:keyLabel="&#x0578;"
+ latin:keySpec="&#x0578;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0565: "ե" ARMENIAN SMALL LETTER ECH
U+0587: "և" ARMENIAN SMALL LIGATURE ECH YIWN -->
<Key
- latin:keyLabel="&#x0565;"
+ latin:keySpec="&#x0565;"
latin:moreKeys="&#x0587;"
+ latin:keyHintLabel="&#x0587;"
latin:keyLabelFlags="fontNormal" />
<!-- U+057C: "ռ" ARMENIAN SMALL LETTER RA -->
<Key
- latin:keyLabel="&#x057C;"
+ latin:keySpec="&#x057C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+057F: "տ" ARMENIAN SMALL LETTER TIWN -->
<Key
- latin:keyLabel="&#x057F;"
+ latin:keySpec="&#x057F;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0568: "ը" ARMENIAN SMALL LETTER ET -->
<Key
- latin:keyLabel="&#x0568;"
+ latin:keySpec="&#x0568;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0582: "ւ" ARMENIAN SMALL LETTER YIWN -->
<Key
- latin:keyLabel="&#x0582;"
+ latin:keySpec="&#x0582;"
latin:keyLabelFlags="fontNormal" />
<!-- U+056B: "ի" ARMENIAN SMALL LETTER INI -->
<Key
- latin:keyLabel="&#x056B;"
+ latin:keySpec="&#x056B;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0585: "օ" ARMENIAN SMALL LETTER OH -->
<Key
- latin:keyLabel="&#x0585;"
+ latin:keySpec="&#x0585;"
latin:keyLabelFlags="fontNormal" />
<!-- U+057A: "պ" ARMENIAN SMALL LETTER PEH -->
<Key
- latin:keyLabel="&#x057A;"
+ latin:keySpec="&#x057A;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic3.xml b/java/res/xml/rowkeys_armenian_phonetic3.xml
index 3116811b3..2b79386ac 100644
--- a/java/res/xml/rowkeys_armenian_phonetic3.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic3.xml
@@ -23,38 +23,38 @@
>
<!-- U+0561: "ա" ARMENIAN SMALL LETTER AYB -->
<Key
- latin:keyLabel="&#x0561;"
+ latin:keySpec="&#x0561;"
latin:keyLabelFlags="fontNormal" />
<!-- U+057D: "ս" ARMENIAN SMALL LETTER SEH -->
<Key
- latin:keyLabel="&#x057D;"
+ latin:keySpec="&#x057D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0564: "դ" ARMENIAN SMALL LETTER DA -->
<Key
- latin:keyLabel="&#x0564;"
+ latin:keySpec="&#x0564;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0586: "ֆ" ARMENIAN SMALL LETTER FEH -->
<Key
- latin:keyLabel="&#x0586;"
+ latin:keySpec="&#x0586;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0563: "գ" ARMENIAN SMALL LETTER GIM -->
<Key
- latin:keyLabel="&#x0563;"
+ latin:keySpec="&#x0563;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0570: "հ" ARMENIAN SMALL LETTER HO -->
<Key
- latin:keyLabel="&#x0570;"
+ latin:keySpec="&#x0570;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0575: "յ" ARMENIAN SMALL LETTER YI -->
<Key
- latin:keyLabel="&#x0575;"
+ latin:keySpec="&#x0575;"
latin:keyLabelFlags="fontNormal" />
<!-- U+056F: "կ" ARMENIAN SMALL LETTER KEN -->
<Key
- latin:keyLabel="&#x056F;"
+ latin:keySpec="&#x056F;"
latin:keyLabelFlags="fontNormal" />
<!-- U+056C: "լ" ARMENIAN SMALL LETTER LIWN -->
<Key
- latin:keyLabel="&#x056C;"
+ latin:keySpec="&#x056C;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic4.xml b/java/res/xml/rowkeys_armenian_phonetic4.xml
index 922481add..f8cdd1221 100644
--- a/java/res/xml/rowkeys_armenian_phonetic4.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic4.xml
@@ -23,30 +23,30 @@
>
<!-- U+0566: "զ" ARMENIAN SMALL LETTER ZA -->
<Key
- latin:keyLabel="&#x0566;"
+ latin:keySpec="&#x0566;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0572: "ղ" ARMENIAN SMALL LETTER GHAD -->
<Key
- latin:keyLabel="&#x0572;"
+ latin:keySpec="&#x0572;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0581: "ց" ARMENIAN SMALL LETTER CO -->
<Key
- latin:keyLabel="&#x0581;"
+ latin:keySpec="&#x0581;"
latin:keyLabelFlags="fontNormal" />
<!-- U+057E: "վ" ARMENIAN SMALL LETTER VEW -->
<Key
- latin:keyLabel="&#x057E;"
+ latin:keySpec="&#x057E;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0562: "բ" ARMENIAN SMALL LETTER BEN -->
<Key
- latin:keyLabel="&#x0562;"
+ latin:keySpec="&#x0562;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0576: "ն" ARMENIAN SMALL LETTER NOW -->
<Key
- latin:keyLabel="&#x0576;"
+ latin:keySpec="&#x0576;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0574: "մ" ARMENIAN SMALL LETTER MEN -->
<Key
- latin:keyLabel="&#x0574;"
+ latin:keySpec="&#x0574;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_azerty1.xml b/java/res/xml/rowkeys_azerty1.xml
index 42b27463f..67be342c0 100644
--- a/java/res/xml/rowkeys_azerty1.xml
+++ b/java/res/xml/rowkeys_azerty1.xml
@@ -22,52 +22,52 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="a"
+ latin:keySpec="a"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
- latin:moreKeys="!text/more_keys_for_a" />
+ latin:moreKeys="!text/morekeys_a" />
<Key
- latin:keyLabel="z"
+ latin:keySpec="z"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
- latin:moreKeys="!text/more_keys_for_z" />
+ latin:moreKeys="!text/morekeys_z" />
<Key
- latin:keyLabel="e"
+ latin:keySpec="e"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="!text/more_keys_for_e" />
+ latin:moreKeys="!text/morekeys_e" />
<Key
- latin:keyLabel="r"
+ latin:keySpec="r"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
- latin:moreKeys="!text/more_keys_for_r" />
+ latin:moreKeys="!text/morekeys_r" />
<Key
- latin:keyLabel="t"
+ latin:keySpec="t"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
- latin:moreKeys="!text/more_keys_for_t" />
+ latin:moreKeys="!text/morekeys_t" />
<Key
- latin:keyLabel="y"
+ latin:keySpec="y"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="!text/more_keys_for_y" />
+ latin:moreKeys="!text/morekeys_y" />
<Key
- latin:keyLabel="u"
+ latin:keySpec="u"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
- latin:moreKeys="!text/more_keys_for_u" />
+ latin:moreKeys="!text/morekeys_u" />
<Key
- latin:keyLabel="i"
+ latin:keySpec="i"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="!text/more_keys_for_i" />
+ latin:moreKeys="!text/morekeys_i" />
<Key
- latin:keyLabel="o"
+ latin:keySpec="o"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
- latin:moreKeys="!text/more_keys_for_o" />
+ latin:moreKeys="!text/morekeys_o" />
<Key
- latin:keyLabel="p"
+ latin:keySpec="p"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
</merge>
diff --git a/java/res/xml/rowkeys_azerty2.xml b/java/res/xml/rowkeys_azerty2.xml
index 2eee214e5..116417f08 100644
--- a/java/res/xml/rowkeys_azerty2.xml
+++ b/java/res/xml/rowkeys_azerty2.xml
@@ -22,30 +22,30 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="q" />
+ latin:keySpec="q" />
<Key
- latin:keyLabel="s"
- latin:moreKeys="!text/more_keys_for_s" />
+ latin:keySpec="s"
+ latin:moreKeys="!text/morekeys_s" />
<Key
- latin:keyLabel="d"
- latin:moreKeys="!text/more_keys_for_d" />
+ latin:keySpec="d"
+ latin:moreKeys="!text/morekeys_d" />
<Key
- latin:keyLabel="f" />
+ latin:keySpec="f" />
<Key
- latin:keyLabel="g"
- latin:moreKeys="!text/more_keys_for_g" />
+ latin:keySpec="g"
+ latin:moreKeys="!text/morekeys_g" />
<Key
- latin:keyLabel="h"
- latin:moreKeys="!text/more_keys_for_h" />
+ latin:keySpec="h"
+ latin:moreKeys="!text/morekeys_h" />
<Key
- latin:keyLabel="j"
- latin:moreKeys="!text/more_keys_for_j" />
+ latin:keySpec="j"
+ latin:moreKeys="!text/morekeys_j" />
<Key
- latin:keyLabel="k"
- latin:moreKeys="!text/more_keys_for_k" />
+ latin:keySpec="k"
+ latin:moreKeys="!text/morekeys_k" />
<Key
- latin:keyLabel="l"
- latin:moreKeys="!text/more_keys_for_l" />
+ latin:keySpec="l"
+ latin:moreKeys="!text/morekeys_l" />
<Key
- latin:keyLabel="m" />
+ latin:keySpec="m" />
</merge>
diff --git a/java/res/xml/rowkeys_azerty3.xml b/java/res/xml/rowkeys_azerty3.xml
index 2643f3283..48d3a5280 100644
--- a/java/res/xml/rowkeys_azerty3.xml
+++ b/java/res/xml/rowkeys_azerty3.xml
@@ -22,21 +22,32 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="w"
- latin:moreKeys="!text/more_keys_for_w" />
+ latin:keySpec="w"
+ latin:moreKeys="!text/morekeys_w" />
<Key
- latin:keyLabel="x" />
+ latin:keySpec="x" />
<Key
- latin:keyLabel="c"
- latin:moreKeys="!text/more_keys_for_c" />
+ latin:keySpec="c"
+ latin:moreKeys="!text/morekeys_c" />
<Key
- latin:keyLabel="v"
- latin:moreKeys="!text/more_keys_for_v" />
+ latin:keySpec="v"
+ latin:moreKeys="!text/morekeys_v" />
<Key
- latin:keyLabel="b" />
+ latin:keySpec="b" />
<Key
- latin:keyLabel="n"
- latin:moreKeys="!text/more_keys_for_n" />
- <include
- latin:keyboardLayout="@xml/key_azerty3_right" />
+ latin:keySpec="n"
+ latin:moreKeys="!text/morekeys_n" />
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+ >
+ <Key
+ latin:keySpec="\?" />
+ </case>
+ <default>
+ <Key
+ latin:keySpec="\'"
+ latin:moreKeys="!text/morekeys_single_quote" />
+ </default>
+ </switch>
</merge>
diff --git a/java/res/xml/rowkeys_bulgarian1.xml b/java/res/xml/rowkeys_bulgarian1.xml
index 441b079f1..e84719302 100644
--- a/java/res/xml/rowkeys_bulgarian1.xml
+++ b/java/res/xml/rowkeys_bulgarian1.xml
@@ -23,57 +23,57 @@
>
<!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
<Key
- latin:keyLabel="&#x044F;"
+ latin:keySpec="&#x044F;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
<Key
- latin:keyLabel="&#x0432;"
+ latin:keySpec="&#x0432;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
<Key
- latin:keyLabel="&#x0435;"
+ latin:keySpec="&#x0435;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3" />
<!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
<Key
- latin:keyLabel="&#x0440;"
+ latin:keySpec="&#x0440;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
<Key
- latin:keyLabel="&#x0442;"
+ latin:keySpec="&#x0442;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5" />
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<Key
- latin:keyLabel="&#x044A;"
+ latin:keySpec="&#x044A;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6" />
<!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
<Key
- latin:keyLabel="&#x0443;"
+ latin:keySpec="&#x0443;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7" />
<!-- U+0438: "и" CYRILLIC SMALL LETTER I
U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
<Key
- latin:keyLabel="&#x0438;"
+ latin:keySpec="&#x0438;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:moreKeys="&#x045D;" />
<!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
<Key
- latin:keyLabel="&#x043E;"
+ latin:keySpec="&#x043E;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9" />
<!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
<Key
- latin:keyLabel="&#x043F;"
+ latin:keySpec="&#x043F;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
<!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
<Key
- latin:keyLabel="&#x0447;" />
+ latin:keySpec="&#x0447;" />
</merge>
diff --git a/java/res/xml/rowkeys_bulgarian2.xml b/java/res/xml/rowkeys_bulgarian2.xml
index a4e93d862..e572a221d 100644
--- a/java/res/xml/rowkeys_bulgarian2.xml
+++ b/java/res/xml/rowkeys_bulgarian2.xml
@@ -23,35 +23,35 @@
>
<!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
<Key
- latin:keyLabel="&#x0430;" />
+ latin:keySpec="&#x0430;" />
<!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
<Key
- latin:keyLabel="&#x0441;" />
+ latin:keySpec="&#x0441;" />
<!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
<Key
- latin:keyLabel="&#x0434;" />
+ latin:keySpec="&#x0434;" />
<!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
<Key
- latin:keyLabel="&#x0444;" />
+ latin:keySpec="&#x0444;" />
<!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
<Key
- latin:keyLabel="&#x0433;" />
+ latin:keySpec="&#x0433;" />
<!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
<Key
- latin:keyLabel="&#x0445;" />
+ latin:keySpec="&#x0445;" />
<!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
<Key
- latin:keyLabel="&#x0439;" />
+ latin:keySpec="&#x0439;" />
<!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
<Key
- latin:keyLabel="&#x043A;" />
+ latin:keySpec="&#x043A;" />
<!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
<Key
- latin:keyLabel="&#x043B;" />
+ latin:keySpec="&#x043B;" />
<!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
<Key
- latin:keyLabel="&#x0448;" />
+ latin:keySpec="&#x0448;" />
<!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
<Key
- latin:keyLabel="&#x0449;" />
+ latin:keySpec="&#x0449;" />
</merge>
diff --git a/java/res/xml/rowkeys_bulgarian3.xml b/java/res/xml/rowkeys_bulgarian3.xml
index 258219c27..2509793b2 100644
--- a/java/res/xml/rowkeys_bulgarian3.xml
+++ b/java/res/xml/rowkeys_bulgarian3.xml
@@ -23,26 +23,26 @@
>
<!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
<Key
- latin:keyLabel="&#x0437;" />
+ latin:keySpec="&#x0437;" />
<!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
<Key
- latin:keyLabel="&#x044C;" />
+ latin:keySpec="&#x044C;" />
<!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
<Key
- latin:keyLabel="&#x0446;" />
+ latin:keySpec="&#x0446;" />
<!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
<Key
- latin:keyLabel="&#x0436;" />
+ latin:keySpec="&#x0436;" />
<!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
<Key
- latin:keyLabel="&#x0431;" />
+ latin:keySpec="&#x0431;" />
<!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
<Key
- latin:keyLabel="&#x043D;" />
+ latin:keySpec="&#x043D;" />
<!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
<Key
- latin:keyLabel="&#x043C;" />
+ latin:keySpec="&#x043C;" />
<!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
<Key
- latin:keyLabel="&#x044E;" />
+ latin:keySpec="&#x044E;" />
</merge>
diff --git a/java/res/xml/rowkeys_bulgarian_bds1.xml b/java/res/xml/rowkeys_bulgarian_bds1.xml
index eed1fcb8f..9d6428268 100644
--- a/java/res/xml/rowkeys_bulgarian_bds1.xml
+++ b/java/res/xml/rowkeys_bulgarian_bds1.xml
@@ -23,57 +23,57 @@
>
<!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
<Key
- latin:keyLabel="&#x0443;"
+ latin:keySpec="&#x0443;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
<Key
- latin:keyLabel="&#x0435;"
+ latin:keySpec="&#x0435;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<!-- U+0438: "и" CYRILLIC SMALL LETTER I
U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
<Key
- latin:keyLabel="&#x0438;"
+ latin:keySpec="&#x0438;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys="&#x045D;" />
<!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
<Key
- latin:keyLabel="&#x0448;"
+ latin:keySpec="&#x0448;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
<Key
- latin:keyLabel="&#x0449;"
+ latin:keySpec="&#x0449;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5" />
<!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
<Key
- latin:keyLabel="&#x043A;"
+ latin:keySpec="&#x043A;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6" />
<!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
<Key
- latin:keyLabel="&#x0441;"
+ latin:keySpec="&#x0441;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7" />
<!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
<Key
- latin:keyLabel="&#x0434;"
+ latin:keySpec="&#x0434;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8" />
<!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
<Key
- latin:keyLabel="&#x0437;"
+ latin:keySpec="&#x0437;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9" />
<!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
<Key
- latin:keyLabel="&#x0446;"
+ latin:keySpec="&#x0446;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
<!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
<Key
- latin:keyLabel="&#x0431;" />
+ latin:keySpec="&#x0431;" />
</merge>
diff --git a/java/res/xml/rowkeys_bulgarian_bds2.xml b/java/res/xml/rowkeys_bulgarian_bds2.xml
index ff1bff895..e078ae7d3 100644
--- a/java/res/xml/rowkeys_bulgarian_bds2.xml
+++ b/java/res/xml/rowkeys_bulgarian_bds2.xml
@@ -23,35 +23,35 @@
>
<!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
<Key
- latin:keyLabel="&#x044C;" />
+ latin:keySpec="&#x044C;" />
<!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
<Key
- latin:keyLabel="&#x044F;" />
+ latin:keySpec="&#x044F;" />
<!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
<Key
- latin:keyLabel="&#x0430;" />
+ latin:keySpec="&#x0430;" />
<!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
<Key
- latin:keyLabel="&#x043E;" />
+ latin:keySpec="&#x043E;" />
<!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
<Key
- latin:keyLabel="&#x0436;" />
+ latin:keySpec="&#x0436;" />
<!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
<Key
- latin:keyLabel="&#x0433;" />
+ latin:keySpec="&#x0433;" />
<!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
<Key
- latin:keyLabel="&#x0442;" />
+ latin:keySpec="&#x0442;" />
<!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
<Key
- latin:keyLabel="&#x043D;" />
+ latin:keySpec="&#x043D;" />
<!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
<Key
- latin:keyLabel="&#x0432;" />
+ latin:keySpec="&#x0432;" />
<!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
<Key
- latin:keyLabel="&#x043C;" />
+ latin:keySpec="&#x043C;" />
<!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
<Key
- latin:keyLabel="&#x0447;" />
+ latin:keySpec="&#x0447;" />
</merge>
diff --git a/java/res/xml/rowkeys_bulgarian_bds3.xml b/java/res/xml/rowkeys_bulgarian_bds3.xml
index 7bb780ac7..8302d6922 100644
--- a/java/res/xml/rowkeys_bulgarian_bds3.xml
+++ b/java/res/xml/rowkeys_bulgarian_bds3.xml
@@ -23,29 +23,29 @@
>
<!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
<Key
- latin:keyLabel="&#x044E;" />
+ latin:keySpec="&#x044E;" />
<!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
<Key
- latin:keyLabel="&#x0439;" />
+ latin:keySpec="&#x0439;" />
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<Key
- latin:keyLabel="&#x044A;" />
+ latin:keySpec="&#x044A;" />
<!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
<Key
- latin:keyLabel="&#x044D;" />
+ latin:keySpec="&#x044D;" />
<!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
<Key
- latin:keyLabel="&#x0444;" />
+ latin:keySpec="&#x0444;" />
<!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
<Key
- latin:keyLabel="&#x0445;" />
+ latin:keySpec="&#x0445;" />
<!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
<Key
- latin:keyLabel="&#x043F;" />
+ latin:keySpec="&#x043F;" />
<!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
<Key
- latin:keyLabel="&#x0440;" />
+ latin:keySpec="&#x0440;" />
<!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
<Key
- latin:keyLabel="&#x043B;" />
+ latin:keySpec="&#x043B;" />
</merge>
diff --git a/java/res/xml/rowkeys_colemak1.xml b/java/res/xml/rowkeys_colemak1.xml
index f1c30756b..199d285f9 100644
--- a/java/res/xml/rowkeys_colemak1.xml
+++ b/java/res/xml/rowkeys_colemak1.xml
@@ -22,45 +22,62 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="q"
+ latin:keySpec="q"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<Key
- latin:keyLabel="w"
+ latin:keySpec="w"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
- latin:moreKeys="!text/more_keys_for_w" />
+ latin:moreKeys="!text/morekeys_w" />
<Key
- latin:keyLabel="f"
+ latin:keySpec="f"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3" />
<Key
- latin:keyLabel="p"
+ latin:keySpec="p"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<Key
- latin:keyLabel="g"
+ latin:keySpec="g"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
- latin:moreKeys="!text/more_keys_for_g" />
+ latin:moreKeys="!text/morekeys_g" />
<Key
- latin:keyLabel="j"
+ latin:keySpec="j"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="!text/more_keys_for_j" />
+ latin:moreKeys="!text/morekeys_j" />
<Key
- latin:keyLabel="l"
+ latin:keySpec="l"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
- latin:moreKeys="!text/more_keys_for_l" />
+ latin:moreKeys="!text/morekeys_l" />
<Key
- latin:keyLabel="u"
+ latin:keySpec="u"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="!text/more_keys_for_u" />
+ latin:moreKeys="!text/morekeys_u" />
<Key
- latin:keyLabel="y"
+ latin:keySpec="y"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
- latin:moreKeys="!text/more_keys_for_y" />
+ latin:moreKeys="!text/morekeys_y" />
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+ >
+ <Key
+ latin:keySpec=":"
+ latin:keyHintLabel="0"
+ latin:additionalMoreKeys="0" />
+ </case>
+ <default>
+ <Key
+ latin:keySpec=";"
+ latin:keyHintLabel="0"
+ latin:additionalMoreKeys="0"
+ latin:moreKeys=":" />
+ </default>
+ </switch>
</merge>
diff --git a/java/res/xml/rowkeys_colemak2.xml b/java/res/xml/rowkeys_colemak2.xml
index f73d7e95f..a8e93bf0e 100644
--- a/java/res/xml/rowkeys_colemak2.xml
+++ b/java/res/xml/rowkeys_colemak2.xml
@@ -22,33 +22,33 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="a"
- latin:moreKeys="!text/more_keys_for_a" />
+ latin:keySpec="a"
+ latin:moreKeys="!text/morekeys_a" />
<Key
- latin:keyLabel="r"
- latin:moreKeys="!text/more_keys_for_r" />
+ latin:keySpec="r"
+ latin:moreKeys="!text/morekeys_r" />
<Key
- latin:keyLabel="s"
- latin:moreKeys="!text/more_keys_for_s" />
+ latin:keySpec="s"
+ latin:moreKeys="!text/morekeys_s" />
<Key
- latin:keyLabel="t"
- latin:moreKeys="!text/more_keys_for_t" />
+ latin:keySpec="t"
+ latin:moreKeys="!text/morekeys_t" />
<Key
- latin:keyLabel="d"
- latin:moreKeys="!text/more_keys_for_d" />
+ latin:keySpec="d"
+ latin:moreKeys="!text/morekeys_d" />
<Key
- latin:keyLabel="h"
- latin:moreKeys="!text/more_keys_for_h" />
+ latin:keySpec="h"
+ latin:moreKeys="!text/morekeys_h" />
<Key
- latin:keyLabel="n"
- latin:moreKeys="!text/more_keys_for_n" />
+ latin:keySpec="n"
+ latin:moreKeys="!text/morekeys_n" />
<Key
- latin:keyLabel="e"
- latin:moreKeys="!text/more_keys_for_e" />
+ latin:keySpec="e"
+ latin:moreKeys="!text/morekeys_e" />
<Key
- latin:keyLabel="i"
- latin:moreKeys="!text/more_keys_for_i" />
+ latin:keySpec="i"
+ latin:moreKeys="!text/morekeys_i" />
<Key
- latin:keyLabel="o"
- latin:moreKeys="!text/more_keys_for_o" />
+ latin:keySpec="o"
+ latin:moreKeys="!text/morekeys_o" />
</merge>
diff --git a/java/res/xml/rowkeys_colemak3.xml b/java/res/xml/rowkeys_colemak3.xml
index f0f915142..df4d9936e 100644
--- a/java/res/xml/rowkeys_colemak3.xml
+++ b/java/res/xml/rowkeys_colemak3.xml
@@ -22,21 +22,21 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="z"
- latin:moreKeys="!text/more_keys_for_z" />
+ latin:keySpec="z"
+ latin:moreKeys="!text/morekeys_z" />
<Key
- latin:keyLabel="x" />
+ latin:keySpec="x" />
<Key
- latin:keyLabel="c"
- latin:moreKeys="!text/more_keys_for_c" />
+ latin:keySpec="c"
+ latin:moreKeys="!text/morekeys_c" />
<Key
- latin:keyLabel="v"
- latin:moreKeys="!text/more_keys_for_v" />
+ latin:keySpec="v"
+ latin:moreKeys="!text/morekeys_v" />
<Key
- latin:keyLabel="b" />
+ latin:keySpec="b" />
<Key
- latin:keyLabel="k"
- latin:moreKeys="!text/more_keys_for_k" />
+ latin:keySpec="k"
+ latin:moreKeys="!text/morekeys_k" />
<Key
- latin:keyLabel="m" />
+ latin:keySpec="m" />
</merge>
diff --git a/java/res/xml/rowkeys_dvorak1.xml b/java/res/xml/rowkeys_dvorak1.xml
index 033308acb..170e31664 100644
--- a/java/res/xml/rowkeys_dvorak1.xml
+++ b/java/res/xml/rowkeys_dvorak1.xml
@@ -24,36 +24,36 @@
<include
latin:keyboardLayout="@xml/keys_dvorak_123" />
<Key
- latin:keyLabel="p"
+ latin:keySpec="p"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<Key
- latin:keyLabel="y"
+ latin:keySpec="y"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
- latin:moreKeys="!text/more_keys_for_y" />
+ latin:moreKeys="!text/morekeys_y" />
<Key
- latin:keyLabel="f"
+ latin:keySpec="f"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6" />
<Key
- latin:keyLabel="g"
+ latin:keySpec="g"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
- latin:moreKeys="!text/more_keys_for_g" />
+ latin:moreKeys="!text/morekeys_g" />
<Key
- latin:keyLabel="c"
+ latin:keySpec="c"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="!text/more_keys_for_c" />
+ latin:moreKeys="!text/morekeys_c" />
<Key
- latin:keyLabel="r"
+ latin:keySpec="r"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
- latin:moreKeys="!text/more_keys_for_r" />
+ latin:moreKeys="!text/morekeys_r" />
<Key
- latin:keyLabel="l"
+ latin:keySpec="l"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0"
- latin:moreKeys="!text/more_keys_for_l" />
+ latin:moreKeys="!text/morekeys_l" />
</merge>
diff --git a/java/res/xml/rowkeys_dvorak2.xml b/java/res/xml/rowkeys_dvorak2.xml
index 943e3f549..0840a6cfc 100644
--- a/java/res/xml/rowkeys_dvorak2.xml
+++ b/java/res/xml/rowkeys_dvorak2.xml
@@ -22,33 +22,33 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="a"
- latin:moreKeys="!text/more_keys_for_a" />
+ latin:keySpec="a"
+ latin:moreKeys="!text/morekeys_a" />
<Key
- latin:keyLabel="o"
- latin:moreKeys="!text/more_keys_for_o" />
+ latin:keySpec="o"
+ latin:moreKeys="!text/morekeys_o" />
<Key
- latin:keyLabel="e"
- latin:moreKeys="!text/more_keys_for_e" />
+ latin:keySpec="e"
+ latin:moreKeys="!text/morekeys_e" />
<Key
- latin:keyLabel="u"
- latin:moreKeys="!text/more_keys_for_u" />
+ latin:keySpec="u"
+ latin:moreKeys="!text/morekeys_u" />
<Key
- latin:keyLabel="i"
- latin:moreKeys="!text/more_keys_for_i" />
+ latin:keySpec="i"
+ latin:moreKeys="!text/morekeys_i" />
<Key
- latin:keyLabel="d"
- latin:moreKeys="!text/more_keys_for_d" />
+ latin:keySpec="d"
+ latin:moreKeys="!text/morekeys_d" />
<Key
- latin:keyLabel="h"
- latin:moreKeys="!text/more_keys_for_h" />
+ latin:keySpec="h"
+ latin:moreKeys="!text/morekeys_h" />
<Key
- latin:keyLabel="t"
- latin:moreKeys="!text/more_keys_for_t" />
+ latin:keySpec="t"
+ latin:moreKeys="!text/morekeys_t" />
<Key
- latin:keyLabel="n"
- latin:moreKeys="!text/more_keys_for_n" />
+ latin:keySpec="n"
+ latin:moreKeys="!text/morekeys_n" />
<Key
- latin:keyLabel="s"
- latin:moreKeys="!text/more_keys_for_s" />
+ latin:keySpec="s"
+ latin:moreKeys="!text/morekeys_s" />
</merge>
diff --git a/java/res/xml/rowkeys_dvorak3.xml b/java/res/xml/rowkeys_dvorak3.xml
index b035f41cd..e53908c91 100644
--- a/java/res/xml/rowkeys_dvorak3.xml
+++ b/java/res/xml/rowkeys_dvorak3.xml
@@ -22,21 +22,21 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="j"
- latin:moreKeys="!text/more_keys_for_j" />
+ latin:keySpec="j"
+ latin:moreKeys="!text/morekeys_j" />
<Key
- latin:keyLabel="k"
- latin:moreKeys="!text/more_keys_for_k" />
+ latin:keySpec="k"
+ latin:moreKeys="!text/morekeys_k" />
<Key
- latin:keyLabel="x" />
+ latin:keySpec="x" />
<Key
- latin:keyLabel="b" />
+ latin:keySpec="b" />
<Key
- latin:keyLabel="m" />
+ latin:keySpec="m" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="!text/more_keys_for_w" />
+ latin:keySpec="w"
+ latin:moreKeys="!text/morekeys_w" />
<Key
- latin:keyLabel="v"
- latin:moreKeys="!text/more_keys_for_v" />
+ latin:keySpec="v"
+ latin:moreKeys="!text/morekeys_v" />
</merge>
diff --git a/java/res/xml/rowkeys_east_slavic1.xml b/java/res/xml/rowkeys_east_slavic1.xml
index 5b3b4b48d..88d95fffb 100644
--- a/java/res/xml/rowkeys_east_slavic1.xml
+++ b/java/res/xml/rowkeys_east_slavic1.xml
@@ -23,59 +23,59 @@
>
<!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
<Key
- latin:keyLabel="&#x0439;"
+ latin:keySpec="&#x0439;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
<Key
- latin:keyLabel="&#x0446;"
+ latin:keySpec="&#x0446;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
<Key
- latin:keyLabel="&#x0443;"
+ latin:keySpec="&#x0443;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="!text/more_keys_for_cyrillic_u" />
+ latin:moreKeys="!text/morekeys_cyrillic_u" />
<!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
<Key
- latin:keyLabel="&#x043A;"
+ latin:keySpec="&#x043A;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
- latin:moreKeys="!text/more_keys_for_cyrillic_ka" />
+ latin:moreKeys="!text/morekeys_cyrillic_ka" />
<!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
<Key
- latin:keyLabel="&#x0435;"
+ latin:keySpec="&#x0435;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
- latin:moreKeys="!text/more_keys_for_cyrillic_ie" />
+ latin:moreKeys="!text/morekeys_cyrillic_ie" />
<!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
<Key
- latin:keyLabel="&#x043D;"
+ latin:keySpec="&#x043D;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="!text/more_keys_for_cyrillic_en" />
+ latin:moreKeys="!text/morekeys_cyrillic_en" />
<!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
<Key
- latin:keyLabel="&#x0433;"
+ latin:keySpec="&#x0433;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
- latin:moreKeys="!text/more_keys_for_cyrillic_ghe" />
+ latin:moreKeys="!text/morekeys_cyrillic_ghe" />
<!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
<Key
- latin:keyLabel="&#x0448;"
+ latin:keySpec="&#x0448;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8" />
<Key
- latin:keyLabel="!text/keylabel_for_east_slavic_row1_9"
+ latin:keySpec="!text/keyspec_east_slavic_row1_9"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9" />
<!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
<Key
- latin:keyLabel="&#x0437;"
+ latin:keySpec="&#x0437;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
<!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
<Key
- latin:keyLabel="&#x0445;" />
+ latin:keySpec="&#x0445;" />
</merge>
diff --git a/java/res/xml/rowkeys_east_slavic2.xml b/java/res/xml/rowkeys_east_slavic2.xml
index 2e412f08c..21463fb7d 100644
--- a/java/res/xml/rowkeys_east_slavic2.xml
+++ b/java/res/xml/rowkeys_east_slavic2.xml
@@ -23,37 +23,37 @@
>
<!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
<Key
- latin:keyLabel="&#x0444;" />
+ latin:keySpec="&#x0444;" />
<Key
- latin:keyLabel="!text/keylabel_for_east_slavic_row2_1"
- latin:moreKeys="!text/more_keys_for_east_slavic_row2_1" />
+ latin:keySpec="!text/keyspec_east_slavic_row2_2"
+ latin:moreKeys="!text/morekeys_east_slavic_row2_2" />
<!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
<Key
- latin:keyLabel="&#x0432;" />
+ latin:keySpec="&#x0432;" />
<!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
<Key
- latin:keyLabel="&#x0430;"
- latin:moreKeys="!text/more_keys_for_cyrillic_a" />
+ latin:keySpec="&#x0430;"
+ latin:moreKeys="!text/morekeys_cyrillic_a" />
<!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
<Key
- latin:keyLabel="&#x043F;" />
+ latin:keySpec="&#x043F;" />
<!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
<Key
- latin:keyLabel="&#x0440;" />
+ latin:keySpec="&#x0440;" />
<!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
<Key
- latin:keyLabel="&#x043E;"
- latin:moreKeys="!text/more_keys_for_cyrillic_o" />
+ latin:keySpec="&#x043E;"
+ latin:moreKeys="!text/morekeys_cyrillic_o" />
<!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
<Key
- latin:keyLabel="&#x043B;" />
+ latin:keySpec="&#x043B;" />
<!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
<Key
- latin:keyLabel="&#x0434;" />
+ latin:keySpec="&#x0434;" />
<!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
<Key
- latin:keyLabel="&#x0436;" />
+ latin:keySpec="&#x0436;" />
<Key
- latin:keyLabel="!text/keylabel_for_east_slavic_row2_11"
- latin:moreKeys="!text/more_keys_for_east_slavic_row2_11" />
+ latin:keySpec="!text/keyspec_east_slavic_row2_11"
+ latin:moreKeys="!text/morekeys_east_slavic_row2_11" />
</merge>
diff --git a/java/res/xml/rowkeys_east_slavic3.xml b/java/res/xml/rowkeys_east_slavic3.xml
index c3a171b49..54802e878 100644
--- a/java/res/xml/rowkeys_east_slavic3.xml
+++ b/java/res/xml/rowkeys_east_slavic3.xml
@@ -23,29 +23,29 @@
>
<!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
<Key
- latin:keyLabel="&#x044F;" />
+ latin:keySpec="&#x044F;" />
<!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
<Key
- latin:keyLabel="&#x0447;" />
+ latin:keySpec="&#x0447;" />
<!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
<Key
- latin:keyLabel="&#x0441;" />
+ latin:keySpec="&#x0441;" />
<!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
<Key
- latin:keyLabel="&#x043C;" />
+ latin:keySpec="&#x043C;" />
<Key
- latin:keyLabel="!text/keylabel_for_east_slavic_row3_5" />
+ latin:keySpec="!text/keyspec_east_slavic_row3_5" />
<!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
<Key
- latin:keyLabel="&#x0442;" />
+ latin:keySpec="&#x0442;" />
<!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
<Key
- latin:keyLabel="&#x044C;"
- latin:moreKeys="!text/more_keys_for_cyrillic_soft_sign" />
+ latin:keySpec="&#x044C;"
+ latin:moreKeys="!text/morekeys_cyrillic_soft_sign" />
<!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
<Key
- latin:keyLabel="&#x0431;" />
+ latin:keySpec="&#x0431;" />
<!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
<Key
- latin:keyLabel="&#x044E;" />
+ latin:keySpec="&#x044E;" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml
index 5a22a2462..46fef4236 100644
--- a/java/res/xml/rowkeys_farsi1.xml
+++ b/java/res/xml/rowkeys_farsi1.xml
@@ -24,49 +24,49 @@
<!-- U+0636: "ض" ARABIC LETTER DAD
U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
<Key
- latin:keyLabel="&#x0636;"
+ latin:keySpec="&#x0636;"
latin:keyHintLabel="&#x06F1;"
latin:additionalMoreKeys="&#x06F1;,1"
latin:keyLabelFlags="fontNormal" />
<!-- U+0635: "ص" ARABIC LETTER SAD
U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->
<Key
- latin:keyLabel="&#x0635;"
+ latin:keySpec="&#x0635;"
latin:keyHintLabel="&#x06F2;"
latin:additionalMoreKeys="&#x06F2;,2"
latin:keyLabelFlags="fontNormal" />
<!-- U+062B: "ث" ARABIC LETTER THEH
U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE -->
<Key
- latin:keyLabel="&#x062B;"
+ latin:keySpec="&#x062B;"
latin:keyHintLabel="&#x06F3;"
latin:additionalMoreKeys="&#x06F3;,3"
latin:keyLabelFlags="fontNormal" />
<!-- U+0642: "ق" ARABIC LETTER QAF
U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR -->
<Key
- latin:keyLabel="&#x0642;"
+ latin:keySpec="&#x0642;"
latin:keyHintLabel="&#x06F4;"
latin:additionalMoreKeys="&#x06F4;,4"
latin:keyLabelFlags="fontNormal" />
<!-- U+0641: "ف" ARABIC LETTER FEH
U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE -->
<Key
- latin:keyLabel="&#x0641;"
+ latin:keySpec="&#x0641;"
latin:keyHintLabel="&#x06F5;"
latin:additionalMoreKeys="&#x06F5;,5"
latin:keyLabelFlags="fontNormal" />
<!-- U+063A: "غ" ARABIC LETTER GHAIN
U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->
<Key
- latin:keyLabel="&#x063A;"
+ latin:keySpec="&#x063A;"
latin:keyHintLabel="&#x06F6;"
latin:additionalMoreKeys="&#x06F6;,6"
latin:keyLabelFlags="fontNormal" />
<!-- U+0639: "ع" ARABIC LETTER AIN
U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
<Key
- latin:keyLabel="&#x0639;"
+ latin:keySpec="&#x0639;"
latin:keyHintLabel="&#x06F7;"
latin:additionalMoreKeys="&#x06F7;,7"
latin:keyLabelFlags="fontNormal" />
@@ -77,7 +77,7 @@
U+0629: "ة" ARABIC LETTER TEH MARBUTA
U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT -->
<Key
- latin:keyLabel="&#x0647;"
+ latin:keySpec="&#x0647;"
latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%"
latin:keyHintLabel="&#x06F8;"
latin:additionalMoreKeys="&#x06F8;,8"
@@ -85,19 +85,19 @@
<!-- U+062E: "خ" ARABIC LETTER KHAH
U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE -->
<Key
- latin:keyLabel="&#x062E;"
+ latin:keySpec="&#x062E;"
latin:keyHintLabel="&#x06F9;"
latin:additionalMoreKeys="&#x06F9;,9"
latin:keyLabelFlags="fontNormal" />
<!-- U+062D: "ح" ARABIC LETTER HAH
U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->
<Key
- latin:keyLabel="&#x062D;"
+ latin:keySpec="&#x062D;"
latin:keyHintLabel="&#x06F0;"
latin:additionalMoreKeys="&#x06F0;,0"
latin:keyLabelFlags="fontNormal" />
<!-- U+062C: "ج" ARABIC LETTER JEEM -->
<Key
- latin:keyLabel="&#x062C;"
+ latin:keySpec="&#x062C;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml
index 590161f62..f94ee8e49 100644
--- a/java/res/xml/rowkeys_farsi2.xml
+++ b/java/res/xml/rowkeys_farsi2.xml
@@ -23,11 +23,11 @@
>
<!-- U+0634: "ش" ARABIC LETTER SHEEN -->
<Key
- latin:keyLabel="&#x0634;"
+ latin:keySpec="&#x0634;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0633: "س" ARABIC LETTER SEEN -->
<Key
- latin:keyLabel="&#x0633;"
+ latin:keySpec="&#x0633;"
latin:keyLabelFlags="fontNormal" />
<!-- U+06CC: "ی" ARABIC LETTER FARSI YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
@@ -35,16 +35,16 @@
U+FBE8: "ﯨ" ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM
U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
- latin:keyLabel="&#x06CC;"
+ latin:keySpec="&#x06CC;"
latin:moreKeys="&#x0626;,&#x064A;,&#xFBE8;|&#x0649;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0628: "ب" ARABIC LETTER BEH -->
<Key
- latin:keyLabel="&#x0628;"
+ latin:keySpec="&#x0628;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0644: "ل" ARABIC LETTER LAM -->
<Key
- latin:keyLabel="&#x0644;"
+ latin:keySpec="&#x0644;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0627: "ا" ARABIC LETTER ALEF
U+0671: "ٱ" ARABIC LETTER ALEF WASLA
@@ -53,31 +53,31 @@
U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW -->
<Key
- latin:keyLabel="&#x0627;"
+ latin:keySpec="&#x0627;"
latin:moreKeys="!fixedColumnOrder!5,&#x0671;,&#x0621;,&#x0622;,&#x0623;,&#x0625;"
latin:keyLabelFlags="fontNormal" />
<!-- U+062A: "ت" ARABIC LETTER TEH
U+0629: "ة": ARABIC LETTER TEH MARBUTA -->
<Key
- latin:keyLabel="&#x062A;"
+ latin:keySpec="&#x062A;"
latin:moreKeys="&#x0629;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0646: "ن" ARABIC LETTER NOON -->
<Key
- latin:keyLabel="&#x0646;"
+ latin:keySpec="&#x0646;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0645: "م" ARABIC LETTER MEEM -->
<Key
- latin:keyLabel="&#x0645;"
+ latin:keySpec="&#x0645;"
latin:keyLabelFlags="fontNormal" />
<!-- U+06A9: "ک" ARABIC LETTER KEHEH
U+0643: "ك" ARABIC LETTER KAF -->
<Key
- latin:keyLabel="&#x06A9;"
+ latin:keySpec="&#x06A9;"
latin:moreKeys="&#x0643;"
latin:keyLabelFlags="fontNormal" />
<!-- U+06AF: "گ" ARABIC LETTER GAF -->
<Key
- latin:keyLabel="&#x06AF;"
+ latin:keySpec="&#x06AF;"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml
index 98949f4c0..edc22f95a 100644
--- a/java/res/xml/rowkeys_farsi3.xml
+++ b/java/res/xml/rowkeys_farsi3.xml
@@ -23,40 +23,40 @@
>
<!-- U+0638: "ظ" ARABIC LETTER ZAH -->
<Key
- latin:keyLabel="&#x0638;"
+ latin:keySpec="&#x0638;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0637: "ط" ARABIC LETTER TAH -->
<Key
- latin:keyLabel="&#x0637;"
+ latin:keySpec="&#x0637;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0698: "ژ" ARABIC LETTER JEH -->
<Key
- latin:keyLabel="&#x0698;"
+ latin:keySpec="&#x0698;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0632: "ز" ARABIC LETTER ZAIN -->
<Key
- latin:keyLabel="&#x0632;"
+ latin:keySpec="&#x0632;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
- latin:keyLabel="&#x0631;"
+ latin:keySpec="&#x0631;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0630: "ذ" ARABIC LETTER THAL -->
<Key
- latin:keyLabel="&#x0630;"
+ latin:keySpec="&#x0630;"
latin:keyLabelFlags="fontNormal" />
<!-- U+062F: "د" ARABIC LETTER DAL -->
<Key
- latin:keyLabel="&#x062F;"
+ latin:keySpec="&#x062F;"
latin:keyLabelFlags="fontNormal" />
<!-- U+067E: "پ" ARABIC LETTER PEH -->
<Key
- latin:keyLabel="&#x067E;"
+ latin:keySpec="&#x067E;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0648: "و" ARABIC LETTER WAW
U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
<Key
- latin:keyLabel="&#x0648;"
+ latin:keySpec="&#x0648;"
latin:moreKeys="&#x0624;"
latin:keyLabelFlags="fontNormal" />
<include
diff --git a/java/res/xml/rowkeys_georgian1.xml b/java/res/xml/rowkeys_georgian1.xml
index d31a4c79c..c412aa3fa 100644
--- a/java/res/xml/rowkeys_georgian1.xml
+++ b/java/res/xml/rowkeys_georgian1.xml
@@ -26,104 +26,104 @@
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
- latin:keyLabel="Q"
+ latin:keySpec="Q"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<!-- U+10ED: "ჭ" GEORGIAN LETTER CHAR -->
<Key
- latin:keyLabel="&#x10ED;"
+ latin:keySpec="&#x10ED;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<Key
- latin:keyLabel="E"
+ latin:keySpec="E"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3" />
<!-- U+10E6: "ღ" GEORGIAN LETTER GHAN -->
<Key
- latin:keyLabel="&#x10E6;"
+ latin:keySpec="&#x10E6;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<!-- U+10D7: "თ" GEORGIAN LETTER TAN -->
<Key
- latin:keyLabel="&#x10D7;"
+ latin:keySpec="&#x10D7;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5" />
<Key
- latin:keyLabel="Y"
+ latin:keySpec="Y"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6" />
<Key
- latin:keyLabel="U"
+ latin:keySpec="U"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7" />
<Key
- latin:keyLabel="I"
+ latin:keySpec="I"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8" />
<Key
- latin:keyLabel="O"
+ latin:keySpec="O"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9" />
<Key
- latin:keyLabel="P"
+ latin:keySpec="P"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
</case>
<default>
<!-- U+10E5: "ქ" GEORGIAN LETTER GHAN -->
<Key
- latin:keyLabel="&#x10E5;"
+ latin:keySpec="&#x10E5;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<!-- U+10EC: "წ" GEORGIAN LETTER CIL -->
<Key
- latin:keyLabel="&#x10EC;"
+ latin:keySpec="&#x10EC;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<!-- U+10D4: "ე" GEORGIAN LETTER EN
U+10F1: "ჱ" GEORGIAN LETTER HE -->
<Key
- latin:keyLabel="&#x10D4;"
+ latin:keySpec="&#x10D4;"
latin:moreKeys="&#x10F1;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3" />
<!-- U+10E0: "რ" GEORGIAN LETTER RAE -->
<Key
- latin:keyLabel="&#x10E0;"
+ latin:keySpec="&#x10E0;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<!-- U+10E2: "ტ" GEORGIAN LETTER TAR -->
<Key
- latin:keyLabel="&#x10E2;"
+ latin:keySpec="&#x10E2;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5" />
<!-- U+10E7: "ყ" GEORGIAN LETTER QAR
U+10F8: "ჸ" GEORGIAN LETTER ELIFI -->
<Key
- latin:keyLabel="&#x10E7;"
+ latin:keySpec="&#x10E7;"
latin:moreKeys="&#x10F8;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6" />
<!-- U+10E3: "უ" GEORGIAN LETTER UN -->
<Key
- latin:keyLabel="&#x10E3;"
+ latin:keySpec="&#x10E3;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7" />
<!-- U+10D8: "ი" GEORGIAN LETTER IN
U+10F2: "ჲ" GEORGIAN LETTER HIE -->
<Key
- latin:keyLabel="&#x10D8;"
+ latin:keySpec="&#x10D8;"
latin:moreKeys="&#x10F2;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8" />
<!-- U+10DD: "ო" GEORGIAN LETTER ON -->
<Key
- latin:keyLabel="&#x10DD;"
+ latin:keySpec="&#x10DD;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9" />
<!-- U+10DE: "პ" GEORGIAN LETTER PAR -->
<Key
- latin:keyLabel="&#x10DE;"
+ latin:keySpec="&#x10DE;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
</default>
diff --git a/java/res/xml/rowkeys_georgian2.xml b/java/res/xml/rowkeys_georgian2.xml
index cdccda31f..162960d75 100644
--- a/java/res/xml/rowkeys_georgian2.xml
+++ b/java/res/xml/rowkeys_georgian2.xml
@@ -26,64 +26,64 @@
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
- latin:keyLabel="A" />
+ latin:keySpec="A" />
<!-- U+10E8: "შ" GEORGIAN LETTER SHIN -->
<Key
- latin:keyLabel="&#x10E8;" />
+ latin:keySpec="&#x10E8;" />
<Key
- latin:keyLabel="D" />
+ latin:keySpec="D" />
<Key
- latin:keyLabel="F" />
+ latin:keySpec="F" />
<Key
- latin:keyLabel="G" />
+ latin:keySpec="G" />
<Key
- latin:keyLabel="H" />
+ latin:keySpec="H" />
<!-- U+10DF: "ჟ" GEORGIAN LETTER ZHAR -->
<Key
- latin:keyLabel="&#x10DF;" />
+ latin:keySpec="&#x10DF;" />
<Key
- latin:keyLabel="K" />
+ latin:keySpec="K" />
<Key
- latin:keyLabel="L" />
+ latin:keySpec="L" />
</case>
<default>
<!-- U+10D0: "ა" GEORGIAN LETTER AN
U+10FA: "ჺ" GEORGIAN LETTER AIN -->
<Key
- latin:keyLabel="&#x10D0;"
+ latin:keySpec="&#x10D0;"
latin:moreKeys="&#x10FA;" />
<!-- U+10E1: "ს" GEORGIAN LETTER SAN -->
<Key
- latin:keyLabel="&#x10E1;" />
+ latin:keySpec="&#x10E1;" />
<!-- U+10D3: "დ" GEORGIAN LETTER DON -->
<Key
- latin:keyLabel="&#x10D3;" />
+ latin:keySpec="&#x10D3;" />
<!-- U+10E4: "ფ" GEORGIAN LETTER PHAR
U+10F6: "ჶ" GEORGIAN LETTER FI -->
<Key
- latin:keyLabel="&#x10E4;"
+ latin:keySpec="&#x10E4;"
latin:moreKeys="&#x10F6;" />
<!-- U+10D2: "გ" GEORGIAN LETTER GAN
U+10F9: "ჹ" GEORGIAN LETTER TURNED GAN -->
<Key
- latin:keyLabel="&#x10D2;"
+ latin:keySpec="&#x10D2;"
latin:moreKeys="&#x10F9;" />
<!-- U+10F0: "ჰ" GEORGIAN LETTER HAE
U+10F5: "ჵ" GEORGIAN LETTER HOE -->
<Key
- latin:keyLabel="&#x10F0;"
+ latin:keySpec="&#x10F0;"
latin:moreKeys="&#x10F5;" />
<!-- U+10EF: "ჯ" GEORGIAN LETTER JHAN
U+10F7: "ჷ" GEORGIAN LETTER YN -->
<Key
- latin:keyLabel="&#x10EF;"
+ latin:keySpec="&#x10EF;"
latin:moreKeys="&#x10F7;" />
<!-- U+10D9: "კ" GEORGIAN LETTER KAN -->
<Key
- latin:keyLabel="&#x10D9;" />
+ latin:keySpec="&#x10D9;" />
<!-- U+10DA: "ლ" GEORGIAN LETTER LAS -->
<Key
- latin:keyLabel="&#x10DA;" />
+ latin:keySpec="&#x10DA;" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_georgian3.xml b/java/res/xml/rowkeys_georgian3.xml
index a3714586f..a16acf8d3 100644
--- a/java/res/xml/rowkeys_georgian3.xml
+++ b/java/res/xml/rowkeys_georgian3.xml
@@ -27,49 +27,49 @@
>
<!-- U+10EB: "ძ" GEORGIAN LETTER JIL -->
<Key
- latin:keyLabel="&#x10EB;" />
+ latin:keySpec="&#x10EB;" />
<Key
- latin:keyLabel="X" />
+ latin:keySpec="X" />
<!-- U+10E9: "ჩ" GEORGIAN LETTER CHIN -->
<Key
- latin:keyLabel="&#x10E9;" />
+ latin:keySpec="&#x10E9;" />
<Key
- latin:keyLabel="V" />
+ latin:keySpec="V" />
<Key
- latin:keyLabel="B" />
+ latin:keySpec="B" />
<Key
- latin:keyLabel="N" />
+ latin:keySpec="N" />
<Key
- latin:keyLabel="M" />
+ latin:keySpec="M" />
</case>
<default>
<!-- U+10D6: "ზ" GEORGIAN LETTER ZEN -->
<Key
- latin:keyLabel="&#x10D6;" />
+ latin:keySpec="&#x10D6;" />
<!-- U+10EE: "ხ" GEORGIAN LETTER XAN
U+10F4: "ჴ" GEORGIAN LETTER HAR -->
<Key
- latin:keyLabel="&#x10EE;"
+ latin:keySpec="&#x10EE;"
latin:moreKeys="&#x10F4;" />
<!-- U+10EA: "ც" GEORGIAN LETTER CAN -->
<Key
- latin:keyLabel="&#x10EA;" />
+ latin:keySpec="&#x10EA;" />
<!-- U+10D5: "ვ" GEORGIAN LETTER VIN
U+10F3: "ჳ" GEORGIAN LETTER WE -->
<Key
- latin:keyLabel="&#x10D5;"
+ latin:keySpec="&#x10D5;"
latin:moreKeys="&#x10F3;" />
<!-- U+10D1: "ბ" GEORGIAN LETTER BAN -->
<Key
- latin:keyLabel="&#x10D1;" />
+ latin:keySpec="&#x10D1;" />
<!-- U+10DC: "ნ" GEORGIAN LETTER NAR
U+10FC: "ჼ" MODIFIER LETTER GEORGIAN NAR -->
<Key
- latin:keyLabel="&#x10DC;"
+ latin:keySpec="&#x10DC;"
latin:moreKeys="&#x10FC;" />
<!-- U+10DB: "მ" GEORGIAN LETTER MAN -->
<Key
- latin:keyLabel="&#x10DB;" />
+ latin:keySpec="&#x10DB;" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_greek1.xml b/java/res/xml/rowkeys_greek1.xml
index 5777d3b85..6d767794c 100644
--- a/java/res/xml/rowkeys_greek1.xml
+++ b/java/res/xml/rowkeys_greek1.xml
@@ -21,6 +21,24 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+ >
+ <Key
+ latin:keySpec=":"
+ latin:keyHintLabel="1"
+ latin:moreKeys=";"
+ latin:additionalMoreKeys="1" />
+ </case>
+ <default>
+ <Key
+ latin:keySpec=";"
+ latin:keyHintLabel="1"
+ latin:moreKeys=":"
+ latin:additionalMoreKeys="1" />
+ </default>
+ </switch>
<!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
<!--
<switch>
@@ -29,7 +47,7 @@
>
U+0385: "΅" GREEK DIALYTIKA TONOS
<Key
- latin:keyLabel="&#x0385;"
+ latin:keySpec="&#x0385;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
</case>
@@ -37,7 +55,7 @@
-->
<!-- U+03C2: "ς" GREEK SMALL LETTER FINAL SIGMA -->
<Key
- latin:keyLabel="&#x03C2;"
+ latin:keySpec="&#x03C2;"
latin:keyLabelFlags="preserveCase"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
@@ -48,18 +66,18 @@
<!-- U+03B5: "ε" GREEK SMALL LETTER EPSILON
U+03AD: "έ" GREEK SMALL LETTER EPSILON WITH TONOS -->
<Key
- latin:keyLabel="&#x03B5;"
+ latin:keySpec="&#x03B5;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="&#x03AD;" />
+ latin:moreKeys="&#x03AD;,%" />
<!-- U+03C1: "ρ" GREEK SMALL LETTER RHO -->
<Key
- latin:keyLabel="&#x03C1;"
+ latin:keySpec="&#x03C1;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<!-- U+03C4: "τ" GREEK SMALL LETTER TAU -->
<Key
- latin:keyLabel="&#x03C4;"
+ latin:keySpec="&#x03C4;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5" />
<!-- U+03C5: "υ" GREEK SMALL LETTER UPSILON
@@ -67,13 +85,13 @@
U+03CB: "ϋ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA
U+03B0: "ΰ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS -->
<Key
- latin:keyLabel="&#x03C5;"
+ latin:keySpec="&#x03C5;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="&#x03CD;,&#x03CB;,&#x03B0;" />
+ latin:moreKeys="&#x03CD;,%,&#x03CB;,&#x03B0;" />
<!-- U+03B8: "θ" GREEK SMALL LETTER THETA -->
<Key
- latin:keyLabel="&#x03B8;"
+ latin:keySpec="&#x03B8;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7" />
<!-- U+03B9: "ι" GREEK SMALL LETTER IOTA
@@ -81,20 +99,20 @@
U+03CA: "ϊ" GREEK SMALL LETTER IOTA WITH DIALYTIKA
U+0390: "ΐ" GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS -->
<Key
- latin:keyLabel="&#x03B9;"
+ latin:keySpec="&#x03B9;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="&#x03AF;,&#x03CA;,&#x0390;" />
+ latin:moreKeys="&#x03AF;,%,&#x03CA;,&#x0390;" />
<!-- U+03BF: "ο" GREEK SMALL LETTER OMICRON
U+03CC: "ό" GREEK SMALL LETTER OMICRON WITH TONOS -->
<Key
- latin:keyLabel="&#x03BF;"
+ latin:keySpec="&#x03BF;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
- latin:moreKeys="&#x03CC;" />
+ latin:moreKeys="&#x03CC;,%" />
<!-- U+03C0: "π" GREEK SMALL LETTER PI -->
<Key
- latin:keyLabel="&#x03C0;"
+ latin:keySpec="&#x03C0;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
</merge>
diff --git a/java/res/xml/rowkeys_greek2.xml b/java/res/xml/rowkeys_greek2.xml
index 91bdc1165..d8769caa9 100644
--- a/java/res/xml/rowkeys_greek2.xml
+++ b/java/res/xml/rowkeys_greek2.xml
@@ -24,32 +24,32 @@
<!-- U+03B1: "α" GREEK SMALL LETTER ALPHA
U+03AC: "ά" GREEK SMALL LETTER ALPHA WITH TONOS -->
<Key
- latin:keyLabel="&#x03B1;"
+ latin:keySpec="&#x03B1;"
latin:moreKeys="&#x03AC;" />
<!-- U+03C3: "σ" GREEK SMALL LETTER SIGMA -->
<Key
- latin:keyLabel="&#x03C3;" />
+ latin:keySpec="&#x03C3;" />
<!-- U+03B4: "δ" GREEK SMALL LETTER DELTA -->
<Key
- latin:keyLabel="&#x03B4;" />
+ latin:keySpec="&#x03B4;" />
<!-- U+03C6: "φ" GREEK SMALL LETTER PHI -->
<Key
- latin:keyLabel="&#x03C6;" />
+ latin:keySpec="&#x03C6;" />
<!-- U+03B3: "γ" GREEK SMALL LETTER GAMMA -->
<Key
- latin:keyLabel="&#x03B3;" />
+ latin:keySpec="&#x03B3;" />
<!-- U+03B7: "η" GREEK SMALL LETTER ETA
U+03AE: "ή" GREEK SMALL LETTER ETA WITH TONOS -->
<Key
- latin:keyLabel="&#x03B7;"
+ latin:keySpec="&#x03B7;"
latin:moreKeys="&#x03AE;" />
<!-- U+03BE: "ξ" GREEK SMALL LETTER XI -->
<Key
- latin:keyLabel="&#x03BE;" />
+ latin:keySpec="&#x03BE;" />
<!-- U+03BA: "κ" GREEK SMALL LETTER KAPPA -->
<Key
- latin:keyLabel="&#x03BA;" />
+ latin:keySpec="&#x03BA;" />
<!-- U+03BB: "λ" GREEK SMALL LETTER LAMDA -->
<Key
- latin:keyLabel="&#x03BB;" />
+ latin:keySpec="&#x03BB;" />
</merge>
diff --git a/java/res/xml/rowkeys_greek3.xml b/java/res/xml/rowkeys_greek3.xml
index 8a99db925..3f989bc9c 100644
--- a/java/res/xml/rowkeys_greek3.xml
+++ b/java/res/xml/rowkeys_greek3.xml
@@ -23,25 +23,25 @@
>
<!-- U+03B6: "ζ" GREEK SMALL LETTER ZETA -->
<Key
- latin:keyLabel="&#x03B6;" />
+ latin:keySpec="&#x03B6;" />
<!-- U+03C7: "χ" GREEK SMALL LETTER CHI -->
<Key
- latin:keyLabel="&#x03C7;" />
+ latin:keySpec="&#x03C7;" />
<!-- U+03C8: "ψ" GREEK SMALL LETTER PSI -->
<Key
- latin:keyLabel="&#x03C8;" />
+ latin:keySpec="&#x03C8;" />
<!-- U+03C9: "ω" GREEK SMALL LETTER OMEGA
U+03CE: "ώ" GREEK SMALL LETTER OMEGA WITH TONOS -->
<Key
- latin:keyLabel="&#x03C9;"
+ latin:keySpec="&#x03C9;"
latin:moreKeys="&#x03CE;" />
<!-- U+03B2: "β" GREEK SMALL LETTER BETA -->
<Key
- latin:keyLabel="&#x03B2;" />
+ latin:keySpec="&#x03B2;" />
<!-- U+03BD: "ν" GREEK SMALL LETTER NU -->
<Key
- latin:keyLabel="&#x03BD;" />
+ latin:keySpec="&#x03BD;" />
<!-- U+03BC: "μ" GREEK SMALL LETTER MU -->
<Key
- latin:keyLabel="&#x03BC;" />
+ latin:keySpec="&#x03BC;" />
</merge>
diff --git a/java/res/xml/rowkeys_hebrew1.xml b/java/res/xml/rowkeys_hebrew1.xml
index 81a00e367..e888977ae 100644
--- a/java/res/xml/rowkeys_hebrew1.xml
+++ b/java/res/xml/rowkeys_hebrew1.xml
@@ -26,22 +26,22 @@
latin:mode="email|url"
>
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<Key
- latin:keyLabel="_"
+ latin:keySpec="_"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
</case>
<default>
<Key
- latin:keyLabel="\'"
+ latin:keySpec="\'"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="&quot;" />
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="_" />
@@ -49,42 +49,42 @@
</switch>
<!-- U+05E7: "ק" HEBREW LETTER QOF -->
<Key
- latin:keyLabel="&#x05E7;"
+ latin:keySpec="&#x05E7;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3" />
<!-- U+05E8: "ר" HEBREW LETTER RESH -->
<Key
- latin:keyLabel="&#x05E8;"
+ latin:keySpec="&#x05E8;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<!-- U+05D0: "א" HEBREW LETTER ALEF -->
<Key
- latin:keyLabel="&#x05D0;"
+ latin:keySpec="&#x05D0;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5" />
<!-- U+05D8: "ט" HEBREW LETTER TET -->
<Key
- latin:keyLabel="&#x05D8;"
+ latin:keySpec="&#x05D8;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6" />
<!-- U+05D5: "ו" HEBREW LETTER VAV -->
<Key
- latin:keyLabel="&#x05D5;"
+ latin:keySpec="&#x05D5;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7" />
<!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
<Key
- latin:keyLabel="&#x05DF;"
+ latin:keySpec="&#x05DF;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8" />
<!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
<Key
- latin:keyLabel="&#x05DD;"
+ latin:keySpec="&#x05DD;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9" />
<!-- U+05E4: "פ" HEBREW LETTER PE -->
<Key
- latin:keyLabel="&#x05E4;"
+ latin:keySpec="&#x05E4;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
</merge>
diff --git a/java/res/xml/rowkeys_hebrew2.xml b/java/res/xml/rowkeys_hebrew2.xml
index e4ecac335..d43f5a8f2 100644
--- a/java/res/xml/rowkeys_hebrew2.xml
+++ b/java/res/xml/rowkeys_hebrew2.xml
@@ -23,38 +23,38 @@
>
<!-- U+05E9: "ש" HEBREW LETTER SHIN -->
<Key
- latin:keyLabel="&#x05E9;" />
+ latin:keySpec="&#x05E9;" />
<!-- U+05D3: "ד" HEBREW LETTER DALET -->
<Key
- latin:keyLabel="&#x05D3;" />
+ latin:keySpec="&#x05D3;" />
<!-- U+05D2: "ג" HEBREW LETTER GIMEL
U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
<Key
- latin:keyLabel="&#x05D2;"
+ latin:keySpec="&#x05D2;"
latin:moreKeys="&#x05D2;&#x05F3;" />
<!-- U+05DB: "כ" HEBREW LETTER KAF -->
<Key
- latin:keyLabel="&#x05DB;" />
+ latin:keySpec="&#x05DB;" />
<!-- U+05E2: "ע" HEBREW LETTER AYIN -->
<Key
- latin:keyLabel="&#x05E2;" />
+ latin:keySpec="&#x05E2;" />
<!-- U+05D9: "י" HEBREW LETTER YOD
U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
<Key
- latin:keyLabel="&#x05D9;"
+ latin:keySpec="&#x05D9;"
latin:moreKeys="&#x05F2;&#x05B7;" />
<!-- U+05D7: "ח" HEBREW LETTER HET
U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
<Key
- latin:keyLabel="&#x05D7;"
+ latin:keySpec="&#x05D7;"
latin:moreKeys="&#x05D7;&#x05F3;" />
<!-- U+05DC: "ל" HEBREW LETTER LAMED -->
<Key
- latin:keyLabel="&#x05DC;" />
+ latin:keySpec="&#x05DC;" />
<!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
<Key
- latin:keyLabel="&#x05DA;" />
+ latin:keySpec="&#x05DA;" />
<!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
<Key
- latin:keyLabel="&#x05E3;" />
+ latin:keySpec="&#x05E3;" />
</merge>
diff --git a/java/res/xml/rowkeys_hebrew3.xml b/java/res/xml/rowkeys_hebrew3.xml
index 805a7a596..928e6b255 100644
--- a/java/res/xml/rowkeys_hebrew3.xml
+++ b/java/res/xml/rowkeys_hebrew3.xml
@@ -24,36 +24,36 @@
<!-- U+05D6: "ז" HEBREW LETTER ZAYIN
U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
<Key
- latin:keyLabel="&#x05D6;"
+ latin:keySpec="&#x05D6;"
latin:moreKeys="&#x05D6;&#x05F3;" />
<!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
<Key
- latin:keyLabel="&#x05E1;" />
+ latin:keySpec="&#x05E1;" />
<!-- U+05D1: "ב" HEBREW LETTER BET -->
<Key
- latin:keyLabel="&#x05D1;" />
+ latin:keySpec="&#x05D1;" />
<!-- U+05D4: "ה" HEBREW LETTER HE -->
<Key
- latin:keyLabel="&#x05D4;" />
+ latin:keySpec="&#x05D4;" />
<!-- U+05E0: "נ" HEBREW LETTER NUN -->
<Key
- latin:keyLabel="&#x05E0;" />
+ latin:keySpec="&#x05E0;" />
<!-- U+05DE: "מ" HEBREW LETTER MEM -->
<Key
- latin:keyLabel="&#x05DE;" />
+ latin:keySpec="&#x05DE;" />
<!-- U+05E6: "צ" HEBREW LETTER TSADI
U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
<Key
- latin:keyLabel="&#x05E6;"
+ latin:keySpec="&#x05E6;"
latin:moreKeys="&#x05E6;&#x05F3;" />
<!-- U+05EA: "ת" HEBREW LETTER TAV
U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
<Key
- latin:keyLabel="&#x05EA;"
+ latin:keySpec="&#x05EA;"
latin:moreKeys="&#x05EA;&#x05F3;" />
<!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
<Key
- latin:keyLabel="&#x05E5;"
+ latin:keySpec="&#x05E5;"
latin:moreKeys="&#x05E5;&#x05F3;" />
</merge>
diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml
index c0b3cb913..cff9756cf 100644
--- a/java/res/xml/rowkeys_hindi1.xml
+++ b/java/res/xml/rowkeys_hindi1.xml
@@ -28,38 +28,38 @@
<!-- U+0914: "औ" DEVANAGARI LETTER AU
U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA -->
<Key
- latin:keyLabel="&#x0914;"
+ latin:keySpec="&#x0914;"
latin:moreKeys="&#x0912;&#x0902;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0910: "ऐ" DEVANAGARI LETTER AI
U+0910/U+0902: "ऐं" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA -->
<Key
- latin:keyLabel="&#x0910;"
+ latin:keySpec="&#x0910;"
latin:moreKeys="&#x0910;&#x0902;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0906: "आ" DEVANAGARI LETTER AA
U+0906/U+0902: "आं" DEVANAGARI LETTER AA/DEVANAGARI SIGN ANUSVARA
U+0906/U+0901: "आँ" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU -->
<Key
- latin:keyLabel="&#x0906;"
+ latin:keySpec="&#x0906;"
latin:moreKeys="&#x0906;&#x0902;,&#x0906;&#x0901;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0908: "ई" DEVANAGARI LETTER II
U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA -->
<Key
- latin:keyLabel="&#x0908;"
+ latin:keySpec="&#x0908;"
latin:moreKeys="&#x0908;&#x0902;"
latin:keyLabelFlags="fontNormal" />
<!-- U+090A: "ऊ" DEVANAGARI LETTER UU
U+090A/U+0902: "ऊं" DEVANAGARI LETTER UU/DEVANAGARI SIGN ANUSVARA
U+090A/U+0901: "ऊँ" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU -->
<Key
- latin:keyLabel="&#x090A;"
+ latin:keySpec="&#x090A;"
latin:moreKeys="&#x090A;&#x0902;,&#x090A;&#x0901;"
latin:keyLabelFlags="fontNormal" />
<!-- U+092D: "भ" DEVANAGARI LETTER BHA -->
<Key
- latin:keyLabel="&#x092D;"
+ latin:keySpec="&#x092D;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -70,31 +70,31 @@
latin:keyStyle="baseKeyDevanagariSignVisarga" />
<!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
<Key
- latin:keyLabel="&#x0918;"
+ latin:keySpec="&#x0918;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0927: "ध" DEVANAGARI LETTER DHA
U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
<Key
- latin:keyLabel="&#x0927;"
+ latin:keySpec="&#x0927;"
latin:moreKeys="&#x0915;&#x094D;&#x0937;,&#x0936;&#x094D;&#x0930;"
latin:keyLabelFlags="fontNormal" />
<!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
<Key
- latin:keyLabel="&#x091D;"
+ latin:keySpec="&#x091D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
<Key
- latin:keyLabel="&#x0922;"
+ latin:keySpec="&#x0922;"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+ <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAu"
latin:keyHintLabel="1"
@@ -102,9 +102,9 @@
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+ <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAi"
latin:keyHintLabel="2"
@@ -112,9 +112,9 @@
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+ <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAa"
latin:keyHintLabel="3"
@@ -122,9 +122,9 @@
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+ <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignIi"
latin:keyHintLabel="4"
@@ -132,18 +132,18 @@
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+ <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignUu"
latin:keyHintLabel="5"
latin:additionalMoreKeys="&#x096B;,5" />
<!-- U+092C: "ब" DEVANAGARI LETTER BA
- U+096C: "६" DEVANAGARI DIGIT SIX
- U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA -->
+ U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA
+ U+096C: "६" DEVANAGARI DIGIT SIX -->
<Key
- latin:keyLabel="&#x092C;"
+ latin:keySpec="&#x092C;"
latin:moreKeys="&#x092C;&#x0952;,%"
latin:keyHintLabel="6"
latin:additionalMoreKeys="&#x096C;,6"
@@ -151,7 +151,7 @@
<!-- U+0939: "ह" DEVANAGARI LETTER HA
U+096D: "७" DEVANAGARI DIGIT SEVEN -->
<Key
- latin:keyLabel="&#x0939;"
+ latin:keySpec="&#x0939;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="&#x096D;,7"
latin:keyLabelFlags="fontNormal" />
@@ -161,7 +161,7 @@
U+0917/U+0952: "ग॒" DEVANAGARI LETTER GA/DEVANAGARI STRESS SIGN ANUDATTA
U+096E: "८" DEVANAGARI DIGIT EIGHT -->
<Key
- latin:keyLabel="&#x0917;"
+ latin:keySpec="&#x0917;"
latin:moreKeys="&#x091C;&#x094D;&#x091E;,&#x0917;&#x093C;,&#x0917;&#x0952;,%"
latin:keyHintLabel="8"
latin:additionalMoreKeys="&#x096E;,8"
@@ -169,7 +169,7 @@
<!-- U+0926: "द" DEVANAGARI LETTER DA
U+096F: "९" DEVANAGARI DIGIT NINE -->
<Key
- latin:keyLabel="&#x0926;"
+ latin:keySpec="&#x0926;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="&#x096F;,9"
latin:keyLabelFlags="fontNormal" />
@@ -179,7 +179,7 @@
U+091C/U+093C: "ज़" DEVANAGARI LETTER JA/DEVANAGARI SIGN NUKTA
U+0966: "०" DEVANAGARI DIGIT ZERO -->
<Key
- latin:keyLabel="&#x091C;"
+ latin:keySpec="&#x091C;"
latin:moreKeys="&#x091C;&#x0952;,&#x091C;&#x094D;&#x091E;,&#x091C;&#x093C;,%"
latin:keyHintLabel="0"
latin:additionalMoreKeys="&#x0966;,0"
@@ -188,7 +188,7 @@
U+0921/U+0952: "ड॒" DEVANAGARI LETTER DDA/DEVANAGARI STRESS SIGN ANUDATTA
U+0921/U+093C: "ड़" DEVANAGARI LETTER DDA/DEVANAGARI SIGN NUKTA -->
<Key
- latin:keyLabel="&#x0921;"
+ latin:keySpec="&#x0921;"
latin:moreKeys="&#x0921;&#x0952;,&#x0921;&#x093C;"
latin:keyLabelFlags="fontNormal" />
</default>
diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml
index 70ac66ee4..7ba4ee1ec 100644
--- a/java/res/xml/rowkeys_hindi2.xml
+++ b/java/res/xml/rowkeys_hindi2.xml
@@ -30,7 +30,7 @@
U+0911: "ऑ" DEVANAGARI LETTER CANDRA O
U+0912: "ऒ" DEVANAGARI LETTER SHORT O -->
<Key
- latin:keyLabel="&#x0913;"
+ latin:keySpec="&#x0913;"
latin:moreKeys="&#x0913;&#x0902;,&#x0911;,&#x0912;"
latin:keyLabelFlags="fontNormal" />
<!-- U+090F: "ए" DEVANAGARI LETTER E
@@ -39,60 +39,60 @@
U+090D: "ऍ" DEVANAGARI LETTER CANDRA E
U+090E: "ऎ" DEVANAGARI LETTER SHORT E -->
<Key
- latin:keyLabel="&#x090F;"
+ latin:keySpec="&#x090F;"
latin:moreKeys="&#x090F;&#x0902;,&#x090F;&#x0901;,&#x090D;,&#x090E;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0905: "अ" DEVANAGARI LETTER A
U+0905/U+0902: "अं" DEVANAGARI LETTER A/DEVANAGARI SIGN ANUSVARA
U+0905/U+0901: "अँ" DEVANAGARI LETTER A/DEVANAGARI SIGN CANDRABINDU -->
<Key
- latin:keyLabel="&#x0905;"
+ latin:keySpec="&#x0905;"
latin:moreKeys="&#x0905;&#x0902;,&#x0905;&#x0901;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0907: "इ" DEVANAGARI LETTER I
U+0907/U+0902: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN ANUSVARA
U+0907/U+0901: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN CANDRABINDU -->
<Key
- latin:keyLabel="&#x0907;"
+ latin:keySpec="&#x0907;"
latin:moreKeys="&#x0907;&#x0902;,&#x0907;&#x0901;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0909: "उ" DEVANAGARI LETTER U
U+0909/U+0902: "उं" DEVANAGARI LETTER U/DEVANAGARI SIGN ANUSVARA
U+0909/U+0901: "उँ" DEVANAGARI LETTER U/DEVANAGARI SIGN CANDRABINDU -->
<Key
- latin:keyLabel="&#x0909;"
+ latin:keySpec="&#x0909;"
latin:moreKeys="&#x0909;&#x0902;,&#x0909;&#x0901;"
latin:keyLabelFlags="fontNormal" />
<!-- U+092B: "फ" DEVANAGARI LETTER PHA
U+092B/U+093C: "फ़" DEVANAGARI LETTER PHA/DEVANAGARI SIGN NUKTA -->
<Key
- latin:keyLabel="&#x092B;"
+ latin:keySpec="&#x092B;"
latin:moreKeys="&#x092B;&#x093C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
U+094D/U+0930: "्र" DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA
U+0930/U+094D: "र्" DEVANAGARI LETTER RA/DEVANAGARI SIGN VIRAMA -->
<Key
- latin:keyLabel="&#x0931;"
+ latin:keySpec="&#x0931;"
latin:moreKeys="&#x094D;&#x0930;,&#x0930;&#x094D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0916: "ख" DEVANAGARI LETTER KHA
U+0916/U+093C: "ख़" DEVANAGARI LETTER KHA/DEVANAGARI SIGN NUKTA -->
<Key
- latin:keyLabel="&#x0916;"
+ latin:keySpec="&#x0916;"
latin:moreKeys="&#x0916;&#x093C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0925: "थ" DEVANAGARI LETTER THA -->
<Key
- latin:keyLabel="&#x0925;"
+ latin:keySpec="&#x0925;"
latin:keyLabelFlags="fontNormal" />
<!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
<Key
- latin:keyLabel="&#x091B;"
+ latin:keySpec="&#x091B;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
<Key
- latin:keyLabel="&#x0920;"
+ latin:keySpec="&#x0920;"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
@@ -133,35 +133,35 @@
latin:keyStyle="baseKeyDevanagariVowelSignU" />
<!-- U+092A: "प" DEVANAGARI LETTER PA -->
<Key
- latin:keyLabel="&#x092A;"
+ latin:keySpec="&#x092A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0930: "र" DEVANAGARI LETTER RA
U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
U+0930/U+093C: "ऱ" DEVANAGARI LETTER RA/DEVANAGARI SIGN NUKTA
U+0960: "ॠ" DEVANAGARI LETTER VOCALIC RR -->
<Key
- latin:keyLabel="&#x0930;"
+ latin:keySpec="&#x0930;"
latin:moreKeys="&#x090B;,&#x0930;&#x093C;,&#x0960;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0915: "क" DEVANAGARI LETTER KA
U+0915/U+093C: "क़" DEVANAGARI LETTER KA/DEVANAGARI SIGN NUKTA -->
<Key
- latin:keyLabel="&#x0915;"
+ latin:keySpec="&#x0915;"
latin:moreKeys="&#x0915;&#x093C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0924: "त" DEVANAGARI LETTER TA
U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
<Key
- latin:keyLabel="&#x0924;"
+ latin:keySpec="&#x0924;"
latin:moreKeys="&#x0924;&#x094D;&#x0930;"
latin:keyLabelFlags="fontNormal" />
<!-- U+091A: "च" DEVANAGARI LETTER CA -->
<Key
- latin:keyLabel="&#x091A;"
+ latin:keySpec="&#x091A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+091F: "ट" DEVANAGARI LETTER TTA -->
<Key
- latin:keyLabel="&#x091F;"
+ latin:keySpec="&#x091F;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml
index 136bc5f22..cf36fc5d4 100644
--- a/java/res/xml/rowkeys_hindi3.xml
+++ b/java/res/xml/rowkeys_hindi3.xml
@@ -27,42 +27,46 @@
>
<!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
<Key
- latin:keyLabel="&#x0911;"
+ latin:keySpec="&#x0911;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_sign_candrabindu" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
<!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
<Key
- latin:keyLabel="&#x0923;"
+ latin:keySpec="&#x0923;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0929: "ऩ" DEVANAGARI LETTER NNNA -->
<Key
- latin:keyLabel="&#x0929;" />
+ latin:keySpec="&#x0929;" />
<!-- U+0933: "ळ" DEVANAGARI LETTER LLA
U+0934: "ऴ" DEVANAGARI LETTER LLLA -->
<Key
- latin:keyLabel="&#x0933;"
+ latin:keySpec="&#x0933;"
latin:moreKeys="&#x0934;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0936: "श" DEVANAGARI LETTER SHA -->
<Key
- latin:keyLabel="&#x0936;"
+ latin:keySpec="&#x0936;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0937: "ष" DEVANAGARI LETTER SSA -->
<Key
- latin:keyLabel="&#x0937;"
+ latin:keySpec="&#x0937;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_vowel_sign_vocalic_r" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
<!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
<Key
- latin:keyLabel="&#x091E;"
+ latin:keySpec="&#x091E;"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
@@ -70,13 +74,20 @@
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_vowel_sign_candra_o" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_sign_anusvara" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignAnusvara" />
<!-- U+092E: "म" DEVANAGARI LETTER MA
U+0950: "ॐ" DEVANAGARI OM -->
<Key
- latin:keyLabel="&#x092E;"
+ latin:keySpec="&#x092E;"
latin:moreKeys="&#x0950;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0928: "न" DEVANAGARI LETTER NA
@@ -84,35 +95,37 @@
U+0919: "ङ" DEVANAGARI LETTER NGA
U+0928/U+093C: "ऩ" DEVANAGARI LETTER NA/DEVANAGARI SIGN NUKTA -->
<Key
- latin:keyLabel="&#x0928;"
+ latin:keySpec="&#x0928;"
latin:moreKeys="&#x091E;,&#x0919;,&#x0928;&#x093C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0935: "व" DEVANAGARI LETTER VA -->
<Key
- latin:keyLabel="&#x0935;"
+ latin:keySpec="&#x0935;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0932: "ल" DEVANAGARI LETTER LA
U+090C: "ऌ" DEVANAGARI LETTER VOCALIC L
U+0961: "ॡ" DEVANAGARI LETTER VOCALIC LL -->
<Key
- latin:keyLabel="&#x0932;"
+ latin:keySpec="&#x0932;"
latin:moreKeys="&#x090C;,&#x0961;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0938: "स" DEVANAGARI LETTER SA -->
<Key
- latin:keyLabel="&#x0938;"
+ latin:keySpec="&#x0938;"
latin:keyLabelFlags="fontNormal" />
<!-- U+092F: "य" DEVANAGARI LETTER YA
U+095F: "य़" DEVANAGARI LETTER YYA -->
<Key
- latin:keyLabel="&#x092F;"
+ latin:keySpec="&#x092F;"
latin:moreKeys="&#x095F;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_sign_nukta" />
- </default>
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignNukta" />
+ </default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_hindi_compact1.xml b/java/res/xml/rowkeys_hindi_compact1.xml
new file mode 100644
index 000000000..c63de4f0b
--- /dev/null
+++ b/java/res/xml/rowkeys_hindi_compact1.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+ <!-- U+0914: "औ" DEVANAGARI LETTER AU
+ U+0967: "१" DEVANAGARI DIGIT ONE -->
+ <Key
+ latin:keySpec="&#x0914;"
+ latin:keyStyle="moreKeysDevanagariVowelSignAu"
+ latin:keyHintLabel="1"
+ latin:additionalMoreKeys="&#x0967;,1"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+ <!-- U+0910: "ऐ" DEVANAGARI LETTER AI
+ U+0968: "२" DEVANAGARI DIGIT TWO -->
+ <Key
+ latin:keySpec="&#x0910;"
+ latin:keyStyle="moreKeysDevanagariVowelSignAi"
+ latin:keyHintLabel="2"
+ latin:additionalMoreKeys="&#x0968;,2"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+ <!-- U+0906: "आ" DEVANAGARI LETTER AA
+ U+0969: "३" DEVANAGARI DIGIT THREE -->
+ <Key
+ latin:keySpec="&#x0906;"
+ latin:keyStyle="moreKeysDevanagariVowelSignAa"
+ latin:keyHintLabel="3"
+ latin:additionalMoreKeys="&#x0969;,3"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+ <!-- U+0908: "ई" DEVANAGARI LETTER II
+ U+096A: "४" DEVANAGARI DIGIT FOUR -->
+ <Key
+ latin:keySpec="&#x0908;"
+ latin:keyStyle="moreKeysDevanagariVowelSignIi"
+ latin:keyHintLabel="4"
+ latin:additionalMoreKeys="&#x096A;,4"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+ <!-- U+090A: "ऊ" DEVANAGARI LETTER UU
+ U+096B: "५" DEVANAGARI DIGIT FIVE -->
+ <Key
+ latin:keySpec="&#x090A;"
+ latin:keyStyle="moreKeysDevanagariVowelSignUu"
+ latin:keyHintLabel="5"
+ latin:additionalMoreKeys="&#x096B;,5"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+092C: "ब" DEVANAGARI LETTER BA
+ U+092D: "भ" DEVANAGARI LETTER BHA
+ U+096C: "६" DEVANAGARI DIGIT SIX -->
+ <Key
+ latin:keySpec="&#x092C;"
+ latin:moreKeys="&#x092D;,%"
+ latin:keyHintLabel="6"
+ latin:additionalMoreKeys="&#x096C;,6"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0939: "ह" DEVANAGARI LETTER HA
+ U+096D: "७" DEVANAGARI DIGIT SEVEN -->
+ <Key
+ latin:keySpec="&#x0939;"
+ latin:keyHintLabel="7"
+ latin:additionalMoreKeys="&#x096D;,7"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0917: "ग" DEVANAGARI LETTER GA
+ U+0918: "घ" DEVANAGARI LETTER GHA
+ U+096E: "८" DEVANAGARI DIGIT EIGHT -->
+ <Key
+ latin:keySpec="&#x0917;"
+ latin:moreKeys="&#x0918;,%"
+ latin:keyHintLabel="8"
+ latin:additionalMoreKeys="&#x096E;,8"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0926: "द" DEVANAGARI LETTER DA
+ U+0927: "ध" DEVANAGARI LETTER DHA
+ U+096F: "९" DEVANAGARI DIGIT NINE -->
+ <Key
+ latin:keySpec="&#x0926;"
+ latin:moreKeys="&#x0927;,%"
+ latin:keyHintLabel="9"
+ latin:additionalMoreKeys="&#x096F;,9"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+091C: "ज" DEVANAGARI LETTER JA
+ U+091D: "झ" DEVANAGARI LETTER JHA
+ U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
+ U+0966: "०" DEVANAGARI DIGIT ZERO -->
+ <Key
+ latin:keySpec="&#x091C;"
+ latin:moreKeys="&#x091D;,&#x091C;&#x094D;&#x091E;,%"
+ latin:keyHintLabel="0"
+ latin:additionalMoreKeys="&#x0966;,0"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0921: "ड" DEVANAGARI LETTER DDA
+ U+0922: "ढ" DEVANAGARI LETTER DDHA -->
+ <Key
+ latin:keySpec="&#x0921;"
+ latin:moreKeys="&#x0922;"
+ latin:keyLabelFlags="fontNormal" />
+</merge>
diff --git a/java/res/xml/rowkeys_hindi_compact2.xml b/java/res/xml/rowkeys_hindi_compact2.xml
new file mode 100644
index 000000000..06364c209
--- /dev/null
+++ b/java/res/xml/rowkeys_hindi_compact2.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+ <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
+ <Key
+ latin:keySpec="&#x0913;"
+ latin:keyStyle="moreKeysDevanagariVowelSignO"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+ <!-- U+090F: "ए" DEVANAGARI LETTER E -->
+ <Key
+ latin:keySpec="&#x090F;"
+ latin:keyStyle="moreKeysDevanagariVowelSignE"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+ <!-- U+0905: "अ" DEVANAGARI LETTER A -->
+ <Key
+ latin:keySpec="&#x0905;"
+ latin:keyStyle="moreKeysDevanagariSignVirama"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+ <!-- U+0907: "इ" DEVANAGARI LETTER I -->
+ <Key
+ latin:keySpec="&#x0907;"
+ latin:keyStyle="moreKeysDevanagariVowelSignI"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+ <!-- U+0909: "उ" DEVANAGARI LETTER U -->
+ <Key
+ latin:keySpec="&#x0909;"
+ latin:keyStyle="moreKeysDevanagariVowelSignU"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+092A: "प" DEVANAGARI LETTER PA
+ U+092B: "फ" DEVANAGARI LETTER PHA -->
+ <Key
+ latin:keySpec="&#x092A;"
+ latin:moreKeys="&#x092B;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+ <!-- U+0930: "र" DEVANAGARI LETTER RA -->
+ <Key
+ latin:keySpec="&#x0930;"
+ latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0915: "क" DEVANAGARI LETTER KA
+ U+0916: "ख" DEVANAGARI LETTER KHA -->
+ <Key
+ latin:keySpec="&#x0915;"
+ latin:moreKeys="&#x0916;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0924: "त" DEVANAGARI LETTER TA
+ U+0925: "थ" DEVANAGARI LETTER THA
+ U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
+ <Key
+ latin:keySpec="&#x0924;"
+ latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+091A: "च" DEVANAGARI LETTER CA
+ U+091B: "छ" DEVANAGARI LETTER CHA -->
+ <Key
+ latin:keySpec="&#x091A;"
+ latin:moreKeys="&#x091B;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+091F: "ट" DEVANAGARI LETTER TTA
+ U+0920: "ठ" DEVANAGARI LETTER TTHA -->
+ <Key
+ latin:keySpec="&#x091F;"
+ latin:moreKeys="&#x0920;"
+ latin:keyLabelFlags="fontNormal" />
+</merge>
diff --git a/java/res/xml/rowkeys_hindi_compact3.xml b/java/res/xml/rowkeys_hindi_compact3.xml
new file mode 100644
index 000000000..0e8165ecc
--- /dev/null
+++ b/java/res/xml/rowkeys_hindi_compact3.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+ <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
+ <Key
+ latin:keySpec="&#x0911;"
+ latin:keyStyle="moreKeysDevanagariVowelSignCandraO"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
+ <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
+ <Key
+ latin:keySpec="&#x090D;"
+ latin:keyStyle="moreKeysDevanagariVowelSignCandraE"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+ <!-- U+092E: "म" DEVANAGARI LETTER MA
+ U+0950: "ॐ" DEVANAGARI OM -->
+ <Key
+ latin:keySpec="&#x092E;"
+ latin:moreKeys="&#x0950;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0928: "न" DEVANAGARI LETTER NA
+ U+0923: "ण" DEVANAGARI LETTER NNA
+ U+091E: "ञ" DEVANAGARI LETTER NYA
+ U+0919: "ङ" DEVANAGARI LETTER NGA -->
+ <Key
+ latin:keySpec="&#x0928;"
+ latin:moreKeys="&#x0923;,&#x091E;,&#x0919;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0935: "व" DEVANAGARI LETTER VA -->
+ <Key
+ latin:keySpec="&#x0935;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0932: "ल" DEVANAGARI LETTER LA -->
+ <Key
+ latin:keySpec="&#x0932;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0938: "स" DEVANAGARI LETTER SA
+ U+0936: "श" DEVANAGARI LETTER SHA
+ U+0937: "ष" DEVANAGARI LETTER SSA
+ U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
+ <Key
+ latin:keySpec="&#x0938;"
+ latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+092F: "य" DEVANAGARI LETTER YA -->
+ <Key
+ latin:keySpec="&#x092F;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA -->
+ <Key
+ latin:keySpec="&#x0915;&#x094D;&#x0937;"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+</merge>
diff --git a/java/res/xml/rowkeys_khmer1.xml b/java/res/xml/rowkeys_khmer1.xml
index 25da66400..567c6aff0 100644
--- a/java/res/xml/rowkeys_khmer1.xml
+++ b/java/res/xml/rowkeys_khmer1.xml
@@ -27,78 +27,79 @@
>
<!-- U+200D: ZERO WIDTH JOINER -->
<Key
- latin:keyLabel="!"
+ latin:keySpec="!"
latin:moreKeys="!icon/zwj_key|&#x200D;" />
<!-- U+17D7: "ៗ" KHMER SIGN LEK TOO
U+200C: ZERO WIDTH NON-JOINER -->
<Key
- latin:keyLabel="&#x17D7;"
+ latin:keySpec="&#x17D7;"
latin:moreKeys="!icon/zwnj_key|&#x200C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17D1: "៑" KHMER SIGN VIRIAM -->
<Key
- latin:keyLabel="&quot;"
+ latin:keySpec="&quot;"
latin:keyHintLabel="&#x17D1;"
latin:moreKeys="&#x17D1;" />
<!-- U+17DB: "៛" KHMER CURRENCY SYMBOL RIEL
U+20AC: "€" EURO SIGN -->
<Key
- latin:keyLabel="&#x17DB;"
+ latin:keySpec="&#x17DB;"
latin:keyHintLabel="$"
latin:moreKeys="$,&#x20AC;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17D6: "៖" KHMER SIGN CAMNUC PII KUUH -->
<Key
- latin:keyLabel="%"
+ latin:keySpec="%"
latin:keyHintLabel="&#x17D6;"
latin:moreKeys="&#x17D6;" />
<!-- U+17CD: "៍" KHMER SIGN TOANDAKHIAT
U+17D9: "៙" KHMER SIGN PHNAEK MUAN -->
<Key
- latin:keyLabel="&#x17CD;"
+ latin:keySpec="&#x17CD;"
latin:keyHintLabel="&#x17D9;"
latin:moreKeys="&#x17D9;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17D0: "័" KHMER SIGN SAMYOK SANNYA
U+17DA: "៚" KHMER SIGN KOOMUUT -->
<Key
- latin:keyLabel="&#x17D0;"
+ latin:keySpec="&#x17D0;"
latin:keyHintLabel="&#x17DA;"
+ latin:keyHintLabelVerticalAdjustment="-30%"
latin:moreKeys="&#x17DA;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17CF: "៏" KHMER SIGN AHSDA -->
<Key
- latin:keyLabel="&#x17CF;"
+ latin:keySpec="&#x17CF;"
latin:keyHintLabel="*"
latin:moreKeys="*"
latin:keyLabelFlags="fontNormal" />
<!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
- latin:keyLabel="("
+ latin:keySpec="("
latin:keyHintLabel="{"
latin:moreKeys="{,&#x00AB;" />
<!-- U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
- latin:keyLabel=")"
+ latin:keySpec=")"
latin:keyHintLabel="}"
latin:moreKeys="},&#x00BB;" />
<!-- U+17CC: "៌" KHMER SIGN ROBAT
U+00D7: "×" MULTIPLICATION SIGN -->
<Key
- latin:keyLabel="&#x17CC;"
+ latin:keySpec="&#x17CC;"
latin:keyHintLabel="&#x00D7;"
latin:moreKeys="&#x00D7;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17CE: "៎" KHMER SIGN KAKABAT -->
<Key
- latin:keyLabel="&#x17CE;"
+ latin:keySpec="&#x17CE;"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+17E1: "១" KHMER DIGIT ONE
U+17F1: "៱" KHMER SYMBOL LEK ATTAK MUOY -->
<Key
- latin:keyLabel="&#x17E1;"
+ latin:keySpec="&#x17E1;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="&#x17F1;"
@@ -106,7 +107,7 @@
<!-- U+17E2: "២" KHMER DIGIT TWO
U+17F2: "៲" KHMER SYMBOL LEK ATTAK PII -->
<Key
- latin:keyLabel="&#x17E2;"
+ latin:keySpec="&#x17E2;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="&#x17F2;"
@@ -114,7 +115,7 @@
<!-- U+17E3: "៣" KHMER DIGIT THREE
U+17F3: "៳" KHMER SYMBOL LEK ATTAK BEI -->
<Key
- latin:keyLabel="&#x17E3;"
+ latin:keySpec="&#x17E3;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys="&#x17F3;"
@@ -122,7 +123,7 @@
<!-- U+17E4: "៤" KHMER DIGIT FOUR
U+17F4: "៴" KHMER SYMBOL LEK ATTAK BUON -->
<Key
- latin:keyLabel="&#x17E4;"
+ latin:keySpec="&#x17E4;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
latin:moreKeys="&#x17F4;"
@@ -130,7 +131,7 @@
<!-- U+17E5: "៥" KHMER DIGIT FIVE
U+17F5: "៵" KHMER SYMBOL LEK ATTAK PRAM -->
<Key
- latin:keyLabel="&#x17E5;"
+ latin:keySpec="&#x17E5;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
latin:moreKeys="&#x17F5;"
@@ -138,7 +139,7 @@
<!-- U+17E6: "៦" KHMER DIGIT SIX
U+17F6: "៶" KHMER SYMBOL LEK ATTAK PRAM-MUOY -->
<Key
- latin:keyLabel="&#x17E6;"
+ latin:keySpec="&#x17E6;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
latin:moreKeys="&#x17F6;"
@@ -146,7 +147,7 @@
<!-- U+17E7: "៧" KHMER DIGIT SEVEN
U+17F7: "៷" KHMER SYMBOL LEK ATTAK PRAM-PII -->
<Key
- latin:keyLabel="&#x17E7;"
+ latin:keySpec="&#x17E7;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
latin:moreKeys="&#x17F7;"
@@ -154,7 +155,7 @@
<!-- U+17E8: "៨" KHMER DIGIT EIGHT
U+17F8: "៸" KHMER SYMBOL LEK ATTAK PRAM-BEI -->
<Key
- latin:keyLabel="&#x17E8;"
+ latin:keySpec="&#x17E8;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:moreKeys="&#x17F8;"
@@ -162,7 +163,7 @@
<!-- U+17E9: "៩" KHMER DIGIT NINE
U+17F9: "៹" KHMER SYMBOL LEK ATTAK PRAM-BUON -->
<Key
- latin:keyLabel="&#x17E9;"
+ latin:keySpec="&#x17E9;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
latin:moreKeys="&#x17F9;"
@@ -170,7 +171,7 @@
<!-- U+17E0: "០" KHMER DIGIT ZERO
U+17F0: "៰" KHMER SYMBOL LEK ATTAK SON -->
<Key
- latin:keyLabel="&#x17E0;"
+ latin:keySpec="&#x17E0;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0"
latin:moreKeys="&#x17F0;"
@@ -178,14 +179,14 @@
<!-- U+17A5: "ឥ" KHMER INDEPENDENT VOWEL QI
U+17A6: "ឦ" KHMER INDEPENDENT VOWEL QII -->
<Key
- latin:keyLabel="&#x17A5;"
+ latin:keySpec="&#x17A5;"
latin:keyHintLabel="&#x17A6;"
latin:moreKeys=",&#x17A6;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17B2: "ឲ" KHMER INDEPENDENT VOWEL QOO TYPE TWO
U+17B1: "ឱ" KHMER INDEPENDENT VOWEL QOO TYPE ONE -->
<Key
- latin:keyLabel="&#x17B2;"
+ latin:keySpec="&#x17B2;"
latin:keyHintLabel="&#x17B1;"
latin:moreKeys="&#x17B1;"
latin:keyLabelFlags="fontNormal" />
diff --git a/java/res/xml/rowkeys_khmer2.xml b/java/res/xml/rowkeys_khmer2.xml
index cba2d3b90..4146895f7 100644
--- a/java/res/xml/rowkeys_khmer2.xml
+++ b/java/res/xml/rowkeys_khmer2.xml
@@ -28,106 +28,107 @@
<!-- U+1788: "ឈ" KHMER LETTER CHO
U+17DC: "ៜ" KHMER SIGN AVAKRAHASANYA -->
<Key
- latin:keyLabel="&#x1788;"
+ latin:keySpec="&#x1788;"
latin:keyHintLabel="&#x17DC;"
latin:moreKeys="&#x17DC;"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyLabelFlags="fontNormal|autoScale" />
<!-- U+17BA: "ឺ" KHMER VOWEL SIGN YY
U+17DD: "៝" KHMER SIGN ATTHACAN -->
<Key
- latin:keyLabel="&#x17BA;"
+ latin:keySpec="&#x17BA;"
latin:keyHintLabel="&#x17DD;"
+ latin:keyHintLabelVerticalAdjustment="40%"
latin:moreKeys="&#x17DD;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17C2: "ែ" KHMER VOWEL SIGN AE -->
<Key
- latin:keyLabel="&#x17C2;"
+ latin:keySpec="&#x17C2;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17AC: "ឬ" KHMER INDEPENDENT VOWEL RYY
U+17AB: "ឫ" KHMER INDEPENDENT VOWEL RY -->
<Key
- latin:keyLabel="&#x17AC;"
+ latin:keySpec="&#x17AC;"
latin:keyHintLabel="&#x17AB;"
latin:moreKeys="&#x17AB;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1791: "ទ" KHMER LETTER TO -->
<Key
- latin:keyLabel="&#x1791;"
+ latin:keySpec="&#x1791;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17BD: "ួ" KHMER VOWEL SIGN UA -->
<Key
- latin:keyLabel="&#x17BD;"
+ latin:keySpec="&#x17BD;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17BC: "ូ" KHMER VOWEL SIGN UU -->
<Key
- latin:keyLabel="&#x17BC;"
+ latin:keySpec="&#x17BC;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17B8: "ី" KHMER VOWEL SIGN II -->
<Key
- latin:keyLabel="&#x17B8;"
+ latin:keySpec="&#x17B8;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17C5: "ៅ" KHMER VOWEL SIGN AU -->
<Key
- latin:keyLabel="&#x17C5;"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="&#x17C5;"
+ latin:keyLabelFlags="fontNormal|autoScale" />
<!-- U+1797: "ភ" KHMER LETTER PHO -->
<Key
- latin:keyLabel="&#x1797;"
+ latin:keySpec="&#x1797;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17BF: "ឿ" KHMER VOWEL SIGN YA -->
<Key
- latin:keyLabel="&#x17BF;"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="&#x17BF;"
+ latin:keyLabelFlags="fontNormal|autoScale" />
<!-- U+17B0: "ឰ" KHMER INDEPENDENT VOWEL QAI -->
<Key
- latin:keyLabel="&#x17B0;"
+ latin:keySpec="&#x17B0;"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+1786: "ឆ" KHMER LETTER CHA -->
<Key
- latin:keyLabel="&#x1786;"
+ latin:keySpec="&#x1786;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17B9: "ឹ" KHMER VOWEL SIGN Y -->
<Key
- latin:keyLabel="&#x17B9;"
+ latin:keySpec="&#x17B9;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17C1: "េ" KHMER VOWEL SIGN E -->
<Key
- latin:keyLabel="&#x17C1;"
+ latin:keySpec="&#x17C1;"
latin:keyLabelFlags="fontNormal" />
<!-- U+179A: "រ" KHMER LETTER RO -->
<Key
- latin:keyLabel="&#x179A;"
+ latin:keySpec="&#x179A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+178F: "ត" KHMER LETTER TA -->
<Key
- latin:keyLabel="&#x178F;"
+ latin:keySpec="&#x178F;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1799: "យ" KHMER LETTER YO -->
<Key
- latin:keyLabel="&#x1799;"
+ latin:keySpec="&#x1799;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17BB: "ុ" KHMER VOWEL SIGN U -->
<Key
- latin:keyLabel="&#x17BB;"
+ latin:keySpec="&#x17BB;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17B7: "ិ" KHMER VOWEL SIGN I -->
<Key
- latin:keyLabel="&#x17B7;"
+ latin:keySpec="&#x17B7;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17C4: "ោ" KHMER VOWEL SIGN OO -->
<Key
- latin:keyLabel="&#x17C4;"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="&#x17C4;"
+ latin:keyLabelFlags="fontNormal|autoScale" />
<!-- U+1795: "ផ" KHMER LETTER PHA -->
<Key
- latin:keyLabel="&#x1795;"
+ latin:keySpec="&#x1795;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17C0: "ៀ" KHMER VOWEL SIGN IE -->
<Key
- latin:keyLabel="&#x17C0;"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="&#x17C0;"
+ latin:keyLabelFlags="fontNormal|autoScale" />
<!-- U+17AA: "ឪ" KHMER INDEPENDENT VOWEL QUUV
U+17A7: "ឧ" KHMER INDEPENDENT VOWEL QU
U+17B1: "ឱ" KHMER INDEPENDENT VOWEL QOO TYPE ONE
@@ -135,7 +136,7 @@
U+17A9: "ឩ" KHMER INDEPENDENT VOWEL QUU
U+17A8: "ឨ" KHMER INDEPENDENT VOWEL QUK -->
<Key
- latin:keyLabel="&#x17AA;"
+ latin:keySpec="&#x17AA;"
latin:keyHintLabel="&#x17A7;"
latin:moreKeys="&#x17A7;,&#x17B1;,&#x17B3;,&#x17A9;,&#x17A8;"
latin:keyLabelFlags="fontNormal" />
diff --git a/java/res/xml/rowkeys_khmer3.xml b/java/res/xml/rowkeys_khmer3.xml
index ff6c9ca51..5e6d01fb2 100644
--- a/java/res/xml/rowkeys_khmer3.xml
+++ b/java/res/xml/rowkeys_khmer3.xml
@@ -27,109 +27,109 @@
>
<!-- U+17B6/U+17C6: "ាំ" KHMER VOWEL SIGN AA/KHMER SIGN NIKAHIT -->
<Key
- latin:keyLabel="&#x17B6;&#x17C6;"
+ latin:keySpec="&#x17B6;&#x17C6;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+17C3: "ៃ" KHMER VOWEL SIGN AI -->
<Key
- latin:keyLabel="&#x17C3;"
+ latin:keySpec="&#x17C3;"
latin:keyLabelFlags="fontNormal" />
<!-- U+178C: "ឌ" KHMER LETTER DO -->
<Key
- latin:keyLabel="&#x178C;"
+ latin:keySpec="&#x178C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1792: "ធ" KHMER LETTER THO -->
<Key
- latin:keyLabel="&#x1792;"
+ latin:keySpec="&#x1792;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17A2: "អ" KHMER LETTER QA -->
<Key
- latin:keyLabel="&#x17A2;"
+ latin:keySpec="&#x17A2;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17C7: "ះ" KHMER SIGN REAHMUK
- U+17C8: "ៈ" KHMER SIGN YUUKALEAPINTU;-->
+ U+17C8: "ៈ" KHMER SIGN YUUKALEAPINTU -->
<Key
- latin:keyLabel="&#x17C7;"
+ latin:keySpec="&#x17C7;"
latin:keyHintLabel="&#x17C8;"
latin:moreKeys="&#x17C8;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1789: "ញ" KHMER LETTER NYO -->
<Key
- latin:keyLabel="&#x1789;"
+ latin:keySpec="&#x1789;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1782: "គ" KHMER LETTER KO
U+179D: "ឝ" KHMER LETTER SHA -->
<Key
- latin:keyLabel="&#x1782;"
+ latin:keySpec="&#x1782;"
latin:keyHintLabel="&#x179D;"
latin:moreKeys="&#x179D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17A1: "ឡ" KHMER LETTER LA -->
<Key
- latin:keyLabel="&#x17A1;"
+ latin:keySpec="&#x17A1;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17C4/U+17C7: "ោះ" KHMER VOWEL SIGN OO/KHMER SIGN REAHMUK -->
<Key
- latin:keyLabel="&#x17C4;&#x17C7;"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="&#x17C4;&#x17C7;"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
<!-- U+17C9: "៉" KHMER SIGN MUUSIKATOAN -->
<Key
- latin:keyLabel="&#x17C9;"
+ latin:keySpec="&#x17C9;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17AF: "ឯ" KHMER INDEPENDENT VOWEL QE -->
<Key
- latin:keyLabel="&#x17AF;"
+ latin:keySpec="&#x17AF;"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+17B6: "ា" KHMER VOWEL SIGN AA -->
<Key
- latin:keyLabel="&#x17B6;"
+ latin:keySpec="&#x17B6;"
latin:keyLabelFlags="fontNormal" />
<!-- U+179F: "ស" KHMER LETTER SA -->
<Key
- latin:keyLabel="&#x179F;"
+ latin:keySpec="&#x179F;"
latin:keyLabelFlags="fontNormal" />
<!-- U+178A: "ដ" KHMER LETTER DA -->
<Key
- latin:keyLabel="&#x178A;"
+ latin:keySpec="&#x178A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1790: "ថ" KHMER LETTER THA -->
<Key
- latin:keyLabel="&#x1790;"
+ latin:keySpec="&#x1790;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1784: "ង" KHMER LETTER NGO -->
<Key
- latin:keyLabel="&#x1784;"
+ latin:keySpec="&#x1784;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17A0: "ហ" KHMER LETTER HA -->
<Key
- latin:keyLabel="&#x17A0;"
+ latin:keySpec="&#x17A0;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17D2: "្" KHMER SIGN COENG -->
<Key
- latin:keyLabel="&#x17D2;"
+ latin:keySpec="&#x17D2;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1780: "ក" KHMER LETTER KA -->
<Key
- latin:keyLabel="&#x1780;"
+ latin:keySpec="&#x1780;"
latin:keyLabelFlags="fontNormal" />
<!-- U+179B: "ល" KHMER LETTER LO -->
<Key
- latin:keyLabel="&#x179B;"
+ latin:keySpec="&#x179B;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17BE: "ើ" KHMER VOWEL SIGN OE -->
<Key
- latin:keyLabel="&#x17BE;"
+ latin:keySpec="&#x17BE;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17CB: "់" KHMER SIGN BANTOC -->
<Key
- latin:keyLabel="&#x17CB;"
+ latin:keySpec="&#x17CB;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17AE: "ឮ" KHMER INDEPENDENT VOWEL LYY
U+17AD: "ឭ" KHMER INDEPENDENT VOWEL LY
U+17B0: "ឰ" KHMER INDEPENDENT VOWEL QAI -->
<Key
- latin:keyLabel="&#x17AE;"
+ latin:keySpec="&#x17AE;"
latin:keyHintLabel="&#x17AD;"
latin:moreKeys="&#x17AD;,&#x17B0;"
latin:keyLabelFlags="fontNormal" />
diff --git a/java/res/xml/rowkeys_khmer4.xml b/java/res/xml/rowkeys_khmer4.xml
index fe6c59125..5523d86b7 100644
--- a/java/res/xml/rowkeys_khmer4.xml
+++ b/java/res/xml/rowkeys_khmer4.xml
@@ -27,86 +27,86 @@
>
<!-- U+178D: "ឍ" KHMER LETTER TTHO -->
<Key
- latin:keyLabel="&#x178D;"
+ latin:keySpec="&#x178D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1783: "ឃ" KHMER LETTER KHO -->
<Key
- latin:keyLabel="&#x1783;"
+ latin:keySpec="&#x1783;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1787: "ជ" KHMER LETTER CO -->
<Key
- latin:keyLabel="&#x1787;"
+ latin:keySpec="&#x1787;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17C1/U+17C7: "េះ" KHMER VOWEL SIGN E/KHMER SIGN REAHMUK -->
<Key
- latin:keyLabel="&#x17C1;&#x17C7;"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="&#x17C1;&#x17C7;"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
<!-- U+1796: "ព" KHMER LETTER PO
U+179E: "ឞ" KHMER LETTER SSO -->
<Key
- latin:keyLabel="&#x1796;"
+ latin:keySpec="&#x1796;"
latin:keyHintLabel="&#x179E;"
latin:moreKeys="&#x179E;"
latin:keyLabelFlags="fontNormal" />
<!-- U+178E: "ណ" KHMER LETTER NNO -->
<Key
- latin:keyLabel="&#x178E;"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="&#x178E;"
+ latin:keyLabelFlags="fontNormal|autoScale" />
<!-- U+17C6: "ំ" KHMER SIGN NIKAHIT -->
<Key
- latin:keyLabel="&#x17C6;"
+ latin:keySpec="&#x17C6;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17BB/U+17C7: "ុះ" KHMER VOWEL SIGN U/KHMER SIGN REAHMUK -->
<Key
- latin:keyLabel="&#x17BB;&#x17C7;"
+ latin:keySpec="&#x17BB;&#x17C7;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+17D5: "៕" KHMER SIGN BARIYOOSAN -->
<Key
- latin:keyLabel="&#x17D5;"
+ latin:keySpec="&#x17D5;"
latin:keyLabelFlags="fontNormal" />
<Key
- latin:keyLabel="\?" />
+ latin:keySpec="\?" />
</case>
<default>
<!-- U+178B: "ឋ" KHMER LETTER TTHA -->
<Key
- latin:keyLabel="&#x178B;"
+ latin:keySpec="&#x178B;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1781: "ខ" KHMER LETTER KHA -->
<Key
- latin:keyLabel="&#x1781;"
+ latin:keySpec="&#x1781;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1785: "ច" KHMER LETTER CA -->
<Key
- latin:keyLabel="&#x1785;"
+ latin:keySpec="&#x1785;"
latin:keyLabelFlags="fontNormal" />
<!-- U+179C: "វ" KHMER LETTER VO -->
<Key
- latin:keyLabel="&#x179C;"
+ latin:keySpec="&#x179C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1794: "ប" KHMER LETTER BA -->
<Key
- latin:keyLabel="&#x1794;"
+ latin:keySpec="&#x1794;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1793: "ន" KHMER LETTER NO -->
<Key
- latin:keyLabel="&#x1793;"
+ latin:keySpec="&#x1793;"
latin:keyLabelFlags="fontNormal" />
<!-- U+1798: "ម" KHMER LETTER MO -->
<Key
- latin:keyLabel="&#x1798;"
+ latin:keySpec="&#x1798;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17BB/U+17C6: "ុំ" KHMER VOWEL SIGN U/KHMER SIGN NIKAHIT -->
<Key
- latin:keyLabel="&#x17BB;&#x17C6;"
+ latin:keySpec="&#x17BB;&#x17C6;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+17D4: "។" KHMER SIGN KHAN -->
<Key
- latin:keyLabel="&#x17D4;"
+ latin:keySpec="&#x17D4;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17CA: "៊" KHMER SIGN TRIISAP -->
<Key
- latin:keyLabel="&#x17CA;"
+ latin:keySpec="&#x17CA;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_lao1.xml b/java/res/xml/rowkeys_lao1.xml
index fa1ad97d8..a5085a540 100644
--- a/java/res/xml/rowkeys_lao1.xml
+++ b/java/res/xml/rowkeys_lao1.xml
@@ -27,58 +27,58 @@
>
<!-- U+0ED1: "໑" LAO DIGIT ONE -->
<Key
- latin:keyLabel="&#x0ED1;"
+ latin:keySpec="&#x0ED1;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ED2: "໒" LAO DIGIT TWO -->
<Key
- latin:keyLabel="&#x0ED2;"
+ latin:keySpec="&#x0ED2;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ED3: "໓" LAO DIGIT THREE -->
<Key
- latin:keyLabel="&#x0ED3;"
+ latin:keySpec="&#x0ED3;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ED4: "໔" LAO DIGIT FOUR -->
<Key
- latin:keyLabel="&#x0ED4;"
+ latin:keySpec="&#x0ED4;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ECC: "໌" LAO CANCELLATION MARK -->
<Key
- latin:keyLabel="&#x0ECC;"
+ latin:keySpec="&#x0ECC;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EBC: "ຼ" LAO SEMIVOWEL SIGN LO -->
<Key
- latin:keyLabel="&#x0EBC;"
+ latin:keySpec="&#x0EBC;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ED5: "໕" LAO DIGIT FIVE -->
<Key
- latin:keyLabel="&#x0ED5;"
+ latin:keySpec="&#x0ED5;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ED6: "໖" LAO DIGIT SIX -->
<Key
- latin:keyLabel="&#x0ED6;"
+ latin:keySpec="&#x0ED6;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ED7: "໗" LAO DIGIT SEVEN -->
<Key
- latin:keyLabel="&#x0ED7;"
+ latin:keySpec="&#x0ED7;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ED8: "໘" LAO DIGIT EIGHT -->
<Key
- latin:keyLabel="&#x0ED8;"
+ latin:keySpec="&#x0ED8;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ED9: "໙" LAO DIGIT NINE -->
<Key
- latin:keyLabel="&#x0ED9;"
+ latin:keySpec="&#x0ED9;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ECD/U+0EC8: "ໍ່" LAO NIGGAHITA/LAO TONE MAI EK -->
<Key
- latin:keyLabel="&#x0ECD;&#x0EC8;"
+ latin:keySpec="&#x0ECD;&#x0EC8;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</case>
<default>
<!-- U+0EA2: "ຢ" LAO LETTER YO
U+0ED1: "໑" LAO DIGIT ONE -->
<Key
- latin:keyLabel="&#x0EA2;"
+ latin:keySpec="&#x0EA2;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="&#x0ED1;"
@@ -86,7 +86,7 @@
<!-- U+0E9F: "ຟ" LAO LETTER FO SUNG
U+0ED2: "໒" LAO DIGIT TWO -->
<Key
- latin:keyLabel="&#x0E9F;"
+ latin:keySpec="&#x0E9F;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="&#x0ED2;"
@@ -94,7 +94,7 @@
<!-- U+0EC2: "ໂ" LAO VOWEL SIGN O
U+0ED3: "໓" LAO DIGIT THREE -->
<Key
- latin:keyLabel="&#x0EC2;"
+ latin:keySpec="&#x0EC2;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys="&#x0ED3;"
@@ -102,23 +102,23 @@
<!-- U+0E96: "ຖ" LAO LETTER THO SUNG
U+0ED4: "໔" LAO DIGIT FOUR -->
<Key
- latin:keyLabel="&#x0E96;"
+ latin:keySpec="&#x0E96;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
latin:moreKeys="&#x0ED4;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EB8: "ຸ" LAO VOWEL SIGN U -->
<Key
- latin:keyLabel="&#x0EB8;"
+ latin:keySpec="&#x0EB8;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EB9: "ູ" LAO VOWEL SIGN UU -->
<Key
- latin:keyLabel="&#x0EB9;"
+ latin:keySpec="&#x0EB9;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E84: "ຄ" LAO LETTER KHO TAM
U+0ED5: "໕" LAO DIGIT FIVE -->
<Key
- latin:keyLabel="&#x0E84;"
+ latin:keySpec="&#x0E84;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
latin:moreKeys="&#x0ED5;"
@@ -126,7 +126,7 @@
<!-- U+0E95: "ຕ" LAO LETTER TO
U+0ED6: "໖" LAO DIGIT SIX -->
<Key
- latin:keyLabel="&#x0E95;"
+ latin:keySpec="&#x0E95;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
latin:moreKeys="&#x0ED6;"
@@ -134,7 +134,7 @@
<!-- U+0E88: "ຈ" LAO LETTER CO
U+0ED7: "໗" LAO DIGIT SEVEN -->
<Key
- latin:keyLabel="&#x0E88;"
+ latin:keySpec="&#x0E88;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
latin:moreKeys="&#x0ED7;"
@@ -142,7 +142,7 @@
<!-- U+0E82: "ຂ" LAO LETTER KHO SUNG
U+0ED8: "໘" LAO DIGIT EIGHT -->
<Key
- latin:keyLabel="&#x0E82;"
+ latin:keySpec="&#x0E82;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:moreKeys="&#x0ED8;"
@@ -150,14 +150,14 @@
<!-- U+0E8A: "ຊ" LAO LETTER SO TAM
U+0ED9: "໙" LAO DIGIT NINE -->
<Key
- latin:keyLabel="&#x0E8A;"
+ latin:keySpec="&#x0E8A;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
latin:moreKeys="&#x0ED9;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ECD: "ໍ" LAO NIGGAHITA -->
<Key
- latin:keyLabel="&#x0ECD;"
+ latin:keySpec="&#x0ECD;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_lao2.xml b/java/res/xml/rowkeys_lao2.xml
index fca58ac0e..67c474f98 100644
--- a/java/res/xml/rowkeys_lao2.xml
+++ b/java/res/xml/rowkeys_lao2.xml
@@ -27,100 +27,100 @@
>
<!-- U+0EBB/U+0EC9: "" LAO VOWEL SIGN MAI KON/LAO TONE MAI THO -->
<Key
- latin:keyLabel="&#x0EBB;&#x0EC9;"
+ latin:keySpec="&#x0EBB;&#x0EC9;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0ED0: "໐" LAO DIGIT ZERO -->
<Key
- latin:keyLabel="&#x0ED0;"
+ latin:keySpec="&#x0ED0;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EB3/U+0EC9: "ຳ້" LAO VOWEL SIGN AM/LAO TONE MAI THO -->
<Key
- latin:keyLabel="&#x0EB3;&#x0EC9;"
+ latin:keySpec="&#x0EB3;&#x0EC9;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<Key
- latin:keyLabel="_" />
+ latin:keySpec="_" />
<Key
- latin:keyLabel="+" />
+ latin:keySpec="+" />
<!-- U+0EB4/U+0EC9: "ິ້" LAO VOWEL SIGN I/LAO TONE MAI THO -->
<Key
- latin:keyLabel="&#x0EB4;&#x0EC9;"
+ latin:keySpec="&#x0EB4;&#x0EC9;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0EB5/U+0EC9: "ີ້" LAO VOWEL SIGN II/LAO TONE MAI THO -->
<Key
- latin:keyLabel="&#x0EB5;&#x0EC9;"
+ latin:keySpec="&#x0EB5;&#x0EC9;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0EA3: "ຣ" LAO LETTER LO LING -->
<Key
- latin:keyLabel="&#x0EA3;"
+ latin:keySpec="&#x0EA3;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EDC: "ໜ" LAO HO NO -->
<Key
- latin:keyLabel="&#x0EDC;"
+ latin:keySpec="&#x0EDC;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EBD: "ຽ" LAO SEMIVOWEL SIGN NYO -->
<Key
- latin:keyLabel="&#x0EBD;"
+ latin:keySpec="&#x0EBD;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EAB/U+0EBC: "" LAO LETTER HO SUNG/LAO SEMIVOWEL SIGN LO -->
<Key
- latin:keyLabel="&#x0EAB;&#x0EBC;"
+ latin:keySpec="&#x0EAB;&#x0EBC;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+201D: "”" RIGHT DOUBLE QUOTATION MARK -->
<Key
- latin:keyLabel="&#x201D;" />
+ latin:keySpec="&#x201D;" />
</case>
<default>
<!-- U+0EBB: "ົ" LAO VOWEL SIGN MAI KON -->
<Key
- latin:keyLabel="&#x0EBB;"
+ latin:keySpec="&#x0EBB;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EC4: "ໄ" LAO VOWEL SIGN AI
U+0ED0: "໐" LAO DIGIT ZERO -->
<Key
- latin:keyLabel="&#x0EC4;"
+ latin:keySpec="&#x0EC4;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0"
latin:moreKeys="&#x0ED0;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EB3: "ຳ" LAO VOWEL SIGN AM -->
<Key
- latin:keyLabel="&#x0EB3;"
+ latin:keySpec="&#x0EB3;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E9E: "ພ" LAO LETTER PHO TAM -->
<Key
- latin:keyLabel="&#x0E9E;"
+ latin:keySpec="&#x0E9E;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EB0: "ະ" LAO VOWEL SIGN A -->
<Key
- latin:keyLabel="&#x0EB0;"
+ latin:keySpec="&#x0EB0;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EB4: "ິ" LAO VOWEL SIGN I -->
<Key
- latin:keyLabel="&#x0EB4;"
+ latin:keySpec="&#x0EB4;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EB5: "ີ" LAO VOWEL SIGN II -->
<Key
- latin:keyLabel="&#x0EB5;"
+ latin:keySpec="&#x0EB5;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EAE: "ຮ" LAO LETTER HO TAM -->
<Key
- latin:keyLabel="&#x0EAE;"
+ latin:keySpec="&#x0EAE;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E99: "ນ" LAO LETTER NO -->
<Key
- latin:keyLabel="&#x0E99;"
+ latin:keySpec="&#x0E99;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E8D: "ຍ" LAO LETTER NYO -->
<Key
- latin:keyLabel="&#x0E8D;"
+ latin:keySpec="&#x0E8D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E9A: "ບ" LAO LETTER BO -->
<Key
- latin:keyLabel="&#x0E9A;"
+ latin:keySpec="&#x0E9A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EA5: "ລ" LAO LETTER LO LOOT -->
<Key
- latin:keyLabel="&#x0EA5;"
+ latin:keySpec="&#x0EA5;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_lao3.xml b/java/res/xml/rowkeys_lao3.xml
index 2a6c2d1dd..172716dde 100644
--- a/java/res/xml/rowkeys_lao3.xml
+++ b/java/res/xml/rowkeys_lao3.xml
@@ -27,84 +27,84 @@
>
<!-- U+0EB1/U+0EC9: "ັ້" LAO VOWEL SIGN MAI KAN/LAO TONE MAI THO -->
<Key
- latin:keyLabel="&#x0EB1;&#x0EC9;"
+ latin:keySpec="&#x0EB1;&#x0EC9;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<Key
- latin:keyLabel=";" />
+ latin:keySpec=";" />
<Key
- latin:keyLabel="." />
+ latin:keySpec="." />
<Key
- latin:keyLabel="," />
+ latin:keySpec="," />
<Key
- latin:keyLabel=":" />
+ latin:keySpec=":" />
<!-- U+0ECA: "໊" LAO TONE MAI TI -->
<Key
- latin:keyLabel="&#x0ECA;"
+ latin:keySpec="&#x0ECA;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0ECB: "໋" LAO TONE MAI CATAWA -->
<Key
- latin:keyLabel="&#x0ECB;"
+ latin:keySpec="&#x0ECB;"
latin:keyLabelFlags="fontNormal" />
<Key
- latin:keyLabel="!" />
+ latin:keySpec="!" />
<Key
- latin:keyLabel="\?" />
+ latin:keySpec="\?" />
<Key
- latin:keyLabel="%" />
+ latin:keySpec="%" />
<Key
- latin:keyLabel="=" />
+ latin:keySpec="=" />
<!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
<Key
- latin:keyLabel="&#x201C;" />
+ latin:keySpec="&#x201C;" />
</case>
<default>
<!-- U+0EB1: "ັ" LAO VOWEL SIGN MAI KAN -->
<Key
- latin:keyLabel="&#x0EB1;"
+ latin:keySpec="&#x0EB1;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EAB: "ຫ" LAO LETTER HO SUNG -->
<Key
- latin:keyLabel="&#x0EAB;"
+ latin:keySpec="&#x0EAB;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E81: "ກ" LAO LETTER KO -->
<Key
- latin:keyLabel="&#x0E81;"
+ latin:keySpec="&#x0E81;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E94: "ດ" LAO LETTER DO -->
<Key
- latin:keyLabel="&#x0E94;"
+ latin:keySpec="&#x0E94;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EC0: "ເ" LAO VOWEL SIGN E -->
<Key
- latin:keyLabel="&#x0EC0;"
+ latin:keySpec="&#x0EC0;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EC9: "້" LAO TONE MAI THO -->
<Key
- latin:keyLabel="&#x0EC9;"
+ latin:keySpec="&#x0EC9;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EC8: "່" LAO TONE MAI EK -->
<Key
- latin:keyLabel="&#x0EC8;"
+ latin:keySpec="&#x0EC8;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EB2: "າ" LAO VOWEL SIGN AA -->
<Key
- latin:keyLabel="&#x0EB2;"
+ latin:keySpec="&#x0EB2;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EAA: "ສ" LAO LETTER SO SUNG -->
<Key
- latin:keyLabel="&#x0EAA;"
+ latin:keySpec="&#x0EAA;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EA7: "ວ" LAO LETTER WO -->
<Key
- latin:keyLabel="&#x0EA7;"
+ latin:keySpec="&#x0EA7;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E87: "ງ" LAO LETTER NGO -->
<Key
- latin:keyLabel="&#x0E87;"
+ latin:keySpec="&#x0E87;"
latin:keyLabelFlags="fontNormal" />
<!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
<Key
- latin:keyLabel="&#x201C;" />
+ latin:keySpec="&#x201C;" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_lao4.xml b/java/res/xml/rowkeys_lao4.xml
index fae9cc923..ed4b9b1f1 100644
--- a/java/res/xml/rowkeys_lao4.xml
+++ b/java/res/xml/rowkeys_lao4.xml
@@ -27,76 +27,76 @@
>
<!-- U+20AD: "₭" KIP SIGN -->
<Key
- latin:keyLabel="&#x20AD;" />
+ latin:keySpec="&#x20AD;" />
<Key
- latin:keyLabel="(" />
+ latin:keySpec="(" />
<!-- U+0EAF: "ຯ" LAO ELLIPSIS -->
<Key
- latin:keyLabel="&#x0EAF;"
+ latin:keySpec="&#x0EAF;"
latin:keyLabelFlags="fontNormal" />
<Key
- latin:keyLabel="\@" />
+ latin:keySpec="\@" />
<!-- U+0EB6/U+0EC9: "ຶ້" LAO VOWEL SIGN Y/LAO TONE MAI THO -->
<Key
- latin:keyLabel="&#x0EB6;&#x0EC9;"
+ latin:keySpec="&#x0EB6;&#x0EC9;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0EB7/U+0EC9: "ື້" LAO VOWEL SIGN YY/LAO TONE MAI THO -->
<Key
- latin:keyLabel="&#x0EB7;&#x0EC9;"
+ latin:keySpec="&#x0EB7;&#x0EC9;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0EC6: "ໆ" LAO KO LA -->
<Key
- latin:keyLabel="&#x0EC6;"
+ latin:keySpec="&#x0EC6;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EDD: "ໝ" LAO HO MO -->
<Key
- latin:keyLabel="&#x0EDD;"
+ latin:keySpec="&#x0EDD;"
latin:keyLabelFlags="fontNormal" />
<Key
- latin:keyLabel="$" />
+ latin:keySpec="$" />
<Key
- latin:keyLabel=")" />
+ latin:keySpec=")" />
</case>
<default>
<!-- U+0E9C: "ຜ" LAO LETTER PHO SUNG -->
<Key
- latin:keyLabel="&#x0E9C;"
+ latin:keySpec="&#x0E9C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E9B: "ປ" LAO LETTER PO -->
<Key
- latin:keyLabel="&#x0E9B;"
+ latin:keySpec="&#x0E9B;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EC1: "ແ" LAO VOWEL SIGN EI -->
<Key
- latin:keyLabel="&#x0EC1;"
+ latin:keySpec="&#x0EC1;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EAD: "ອ" LAO LETTER O -->
<Key
- latin:keyLabel="&#x0EAD;"
+ latin:keySpec="&#x0EAD;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EB6: "ຶ" LAO VOWEL SIGN Y -->
<Key
- latin:keyLabel="&#x0EB6;"
+ latin:keySpec="&#x0EB6;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EB7: "ື" LAO VOWEL SIGN YY -->
<Key
- latin:keyLabel="&#x0EB7;"
+ latin:keySpec="&#x0EB7;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E97: "ທ" LAO LETTER THO TAM -->
<Key
- latin:keyLabel="&#x0E97;"
+ latin:keySpec="&#x0E97;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EA1: "ມ" LAO LETTER MO -->
<Key
- latin:keyLabel="&#x0EA1;"
+ latin:keySpec="&#x0EA1;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0EC3: "ໃ" LAO VOWEL SIGN AY -->
<Key
- latin:keyLabel="&#x0EC3;"
+ latin:keySpec="&#x0EC3;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E9D: "ຝ" LAO LETTER FO TAM -->
<Key
- latin:keyLabel="&#x0E9D;"
+ latin:keySpec="&#x0E9D;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_mongolian1.xml b/java/res/xml/rowkeys_mongolian1.xml
index 6c8c8e2fd..2bd8097e2 100644
--- a/java/res/xml/rowkeys_mongolian1.xml
+++ b/java/res/xml/rowkeys_mongolian1.xml
@@ -23,61 +23,61 @@
>
<!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
<Key
- latin:keyLabel="&#x0444;"
+ latin:keySpec="&#x0444;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
<Key
- latin:keyLabel="&#x0446;"
+ latin:keySpec="&#x0446;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
<Key
- latin:keyLabel="&#x0443;"
+ latin:keySpec="&#x0443;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="!text/more_keys_for_cyrillic_u" />
+ latin:moreKeys="!text/morekeys_cyrillic_u" />
<!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
<Key
- latin:keyLabel="&#x0436;"
+ latin:keySpec="&#x0436;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
<Key
- latin:keyLabel="&#x044D;"
+ latin:keySpec="&#x044D;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
- latin:moreKeys="!text/more_keys_for_cyrillic_ie" />
+ latin:moreKeys="!text/morekeys_cyrillic_ie" />
<!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
<Key
- latin:keyLabel="&#x043D;"
+ latin:keySpec="&#x043D;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="!text/more_keys_for_cyrillic_en" />
+ latin:moreKeys="!text/morekeys_cyrillic_en" />
<!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
<Key
- latin:keyLabel="&#x0433;"
+ latin:keySpec="&#x0433;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
- latin:moreKeys="!text/more_keys_for_cyrillic_ghe" />
+ latin:moreKeys="!text/morekeys_cyrillic_ghe" />
<!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA
U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
<Key
- latin:keyLabel="&#x0448;"
+ latin:keySpec="&#x0448;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:moreKeys="&#x0449;" />
<!-- U+04AF: "ү" CYRILLIC SMALL LETTER STRAIGHT U -->
<Key
- latin:keyLabel="&#x04AF;"
+ latin:keySpec="&#x04AF;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9" />
<!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
<Key
- latin:keyLabel="&#x0437;"
+ latin:keySpec="&#x0437;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
<!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
<Key
- latin:keyLabel="&#x043A;" />
+ latin:keySpec="&#x043A;" />
</merge>
diff --git a/java/res/xml/rowkeys_mongolian2.xml b/java/res/xml/rowkeys_mongolian2.xml
index a8aa00620..f11f4f230 100644
--- a/java/res/xml/rowkeys_mongolian2.xml
+++ b/java/res/xml/rowkeys_mongolian2.xml
@@ -23,35 +23,35 @@
>
<!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
<Key
- latin:keyLabel="&#x0439;" />
+ latin:keySpec="&#x0439;" />
<!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
<Key
- latin:keyLabel="&#x044B;" />
+ latin:keySpec="&#x044B;" />
<!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
<Key
- latin:keyLabel="&#x0431;" />
+ latin:keySpec="&#x0431;" />
<!-- U+04E9: "ө" CYRILLIC SMALL LETTER BARRED O -->
<Key
- latin:keyLabel="&#x04E9;" />
+ latin:keySpec="&#x04E9;" />
<!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
<Key
- latin:keyLabel="&#x0430;" />
+ latin:keySpec="&#x0430;" />
<!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
<Key
- latin:keyLabel="&#x0445;" />
+ latin:keySpec="&#x0445;" />
<!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
<Key
- latin:keyLabel="&#x0440;" />
+ latin:keySpec="&#x0440;" />
<!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
<Key
- latin:keyLabel="&#x043E;" />
+ latin:keySpec="&#x043E;" />
<!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
<Key
- latin:keyLabel="&#x043B;" />
+ latin:keySpec="&#x043B;" />
<!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
<Key
- latin:keyLabel="&#x0434;" />
+ latin:keySpec="&#x0434;" />
<!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
<Key
- latin:keyLabel="&#x043F;" />
+ latin:keySpec="&#x043F;" />
</merge>
diff --git a/java/res/xml/rowkeys_mongolian3.xml b/java/res/xml/rowkeys_mongolian3.xml
index dc80c37ab..cf57d1c2a 100644
--- a/java/res/xml/rowkeys_mongolian3.xml
+++ b/java/res/xml/rowkeys_mongolian3.xml
@@ -23,35 +23,35 @@
>
<!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
<Key
- latin:keyLabel="&#x044F;" />
+ latin:keySpec="&#x044F;" />
<!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
<Key
- latin:keyLabel="&#x0447;" />
+ latin:keySpec="&#x0447;" />
<!-- U+0451: "ё" CYRILLIC SMALL LETTER IO
U+0435: "е" CYRILLIC SMALL LETTER IE -->
<Key
- latin:keyLabel="&#x0451;"
+ latin:keySpec="&#x0451;"
latin:moreKeys="&#x0435;" />
<!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
<Key
- latin:keyLabel="&#x0441;" />
+ latin:keySpec="&#x0441;" />
<!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
<Key
- latin:keyLabel="&#x043C;" />
+ latin:keySpec="&#x043C;" />
<!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
<Key
- latin:keyLabel="&#x0438;" />
+ latin:keySpec="&#x0438;" />
<!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
<Key
- latin:keyLabel="&#x0442;" />
+ latin:keySpec="&#x0442;" />
<!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<Key
- latin:keyLabel="&#x044C;"
+ latin:keySpec="&#x044C;"
latin:moreKeys="&#x044A;" />
<!-- U+0432: "в" CYRILLIC SMALL LETTER VE
U+044E: "ю" CYRILLIC SMALL LETTER YU -->
<Key
- latin:keyLabel="&#x0432;"
+ latin:keySpec="&#x0432;"
latin:moreKeys="&#x044E;" />
</merge>
diff --git a/java/res/xml/rowkeys_myanmar1.xml b/java/res/xml/rowkeys_myanmar1.xml
new file mode 100644
index 000000000..b7c820922
--- /dev/null
+++ b/java/res/xml/rowkeys_myanmar1.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+ >
+ <!-- U+1027: "ဧ" MYANMAR LETTER E -->
+ <Key
+ latin:keySpec="&#x1027;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE -->
+ <Key
+ latin:keySpec="&#x104F;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1024: "ဤ" MYANMAR LETTER II -->
+ <Key
+ latin:keySpec="&#x1024;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1023: "ဣ" MYANMAR LETTER I -->
+ <Key
+ latin:keySpec="&#x1023;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED -->
+ <Key
+ latin:keySpec="&#x104E;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1000/U+103B/U+1015/U+103A: "ကျပ်"
+ MYANMAR LETTER KA/MYANMAR CONSONANT SIGN MEDIAL YA/MYANMAR LETTER PA/MYANMAR SIGN ASAT -->
+ <Key
+ latin:keySpec="&#x1000;&#x103B;&#x1015;&#x103A;"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+ <!-- U+1029: "ဩ" MYANMAR LETTER O -->
+ <Key
+ latin:keySpec="&#x1029;"
+ latin:keyLabelFlags="fontNormal|autoScale" />
+ <!-- U+102A: "ဪ" MYANMAR LETTER AU -->
+ <Key
+ latin:keySpec="&#x102A;"
+ latin:keyLabelFlags="fontNormal|autoScale" />
+ <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED -->
+ <Key
+ latin:keySpec="&#x104D;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE -->
+ <Key
+ latin:keySpec="&#x104C;"
+ latin:keyLabelFlags="fontNormal" />
+ </case>
+ <default>
+ <!-- U+1041: "၁" MYANMAR DIGIT ONE -->
+ <Key
+ latin:keySpec="&#x1041;"
+ latin:keyHintLabel="1"
+ latin:additionalMoreKeys="1"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1042: "၂" MYANMAR DIGIT TWO -->
+ <Key
+ latin:keySpec="&#x1042;"
+ latin:keyHintLabel="2"
+ latin:additionalMoreKeys="2"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1043: "၃" MYANMAR DIGIT THREE -->
+ <Key
+ latin:keySpec="&#x1043;"
+ latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1044: "၄" MYANMAR DIGIT FOUR -->
+ <Key
+ latin:keySpec="&#x1044;"
+ latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1045: "၅" MYANMAR DIGIT FIVE -->
+ <Key
+ latin:keySpec="&#x1045;"
+ latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1046: "၆" MYANMAR DIGIT SIX -->
+ <Key
+ latin:keySpec="&#x1046;"
+ latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1047: "၇" MYANMAR DIGIT SEVEN -->
+ <Key
+ latin:keySpec="&#x1047;"
+ latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1048: "၈" MYANMAR DIGIT EIGHT -->
+ <Key
+ latin:keySpec="&#x1048;"
+ latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1049: "၉" MYANMAR DIGIT NINE -->
+ <Key
+ latin:keySpec="&#x1049;"
+ latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1040: "၀" MYANMAR DIGIT ZERO -->
+ <Key
+ latin:keySpec="&#x1040;"
+ latin:keyHintLabel="0"
+ latin:additionalMoreKeys="0"
+ latin:keyLabelFlags="fontNormal" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml/rowkeys_myanmar2.xml b/java/res/xml/rowkeys_myanmar2.xml
new file mode 100644
index 000000000..5f0115f39
--- /dev/null
+++ b/java/res/xml/rowkeys_myanmar2.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+ >
+ <!-- U+1017: "ဗ" MYANMAR LETTER BA -->
+ <Key
+ latin:keySpec="&#x1017;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1012: "ဒ" MYANMAR LETTER DA -->
+ <Key
+ latin:keySpec="&#x1012;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1013: "ဓ" MYANMAR LETTER DHA -->
+ <Key
+ latin:keySpec="&#x1013;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1003: "ဃ" MYANMAR LETTER GHA -->
+ <Key
+ latin:keySpec="&#x1003;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+100E: "ဎ" MYANMAR LETTER DDHA -->
+ <Key
+ latin:keySpec="&#x100E;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA -->
+ <Key
+ latin:keySpec="&#x103F;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+100F: "ဏ" MYANMAR LETTER NNA -->
+ <Key
+ latin:keySpec="&#x100F;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1008: "ဈ" MYANMAR LETTER JHA -->
+ <Key
+ latin:keySpec="&#x1008;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1007: "ဇ" MYANMAR LETTER JA -->
+ <Key
+ latin:keySpec="&#x1007;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1002: "ဂ" MYANMAR LETTER GA -->
+ <Key
+ latin:keySpec="&#x1002;"
+ latin:keyLabelFlags="fontNormal" />
+ </case>
+ <default>
+ <!-- U+1006: "ဆ" MYANMAR LETTER CHA -->
+ <Key
+ latin:keySpec="&#x1006;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1010: "တ" MYANMAR LETTER TA -->
+ <Key
+ latin:keySpec="&#x1010;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1014: "န" MYANMAR LETTER NA -->
+ <Key
+ latin:keySpec="&#x1014;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1019: "မ" MYANMAR LETTER MA -->
+ <Key
+ latin:keySpec="&#x1019;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1021: "အ" MYANMAR LETTER A -->
+ <Key
+ latin:keySpec="&#x1021;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1015: "ပ" MYANMAR LETTER PA -->
+ <Key
+ latin:keySpec="&#x1015;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1000: "က" MYANMAR LETTER KA -->
+ <Key
+ latin:keySpec="&#x1000;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1004: "င" MYANMAR LETTER NGA -->
+ <Key
+ latin:keySpec="&#x1004;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+101E: "သ" MYANMAR LETTER SA -->
+ <Key
+ latin:keySpec="&#x101E;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1005: "စ" MYANMAR LETTER CA -->
+ <Key
+ latin:keySpec="&#x1005;"
+ latin:keyLabelFlags="fontNormal" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml/rowkeys_myanmar3.xml b/java/res/xml/rowkeys_myanmar3.xml
new file mode 100644
index 000000000..612bcd31b
--- /dev/null
+++ b/java/res/xml/rowkeys_myanmar3.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+ >
+ <!-- U+101A: "ယ" MYANMAR LETTER YA -->
+ <Key
+ latin:keySpec="&#x101A;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1039: "္" MYANMAR SIGN VIRAMA -->
+ <Key
+ latin:keySpec="&#x1039;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1004/U+103A/U+1039: "င်္င" MYANMAR LETTER NGA/MYANMAR SIGN ASAT/MYANMAR SIGN VIRAMA -->
+ <Key
+ latin:keySpec="&#x1004;&#x103A;&#x1039;"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA -->
+ <Key
+ latin:keySpec="&#x103E;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+102E: "ီ" MYANMAR VOWEL SIGN II -->
+ <Key
+ latin:keySpec="&#x102E;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
+ <Key
+ latin:keySpec="&#x1030;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->
+ <Key
+ latin:keySpec="&#x102B;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
+ <Key
+ latin:keySpec="&#x1032;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
+ <Key
+ latin:keySpec="&#x1036;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+101F: "ဟ" MYANMAR LETTER HA -->
+ <Key
+ latin:keySpec="&#x101F;"
+ latin:keyLabelFlags="fontNormal" />
+ </case>
+ <default>
+ <!-- U+1031: "ေ" MYANMAR VOWEL SIGN E -->
+ <Key
+ latin:keySpec="&#x1031;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+103B: "ျ" MYANMAR CONSONANT SIGN MEDIAL YA -->
+ <Key
+ latin:keySpec="&#x103B;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA -->
+ <Key
+ latin:keySpec="&#x103C;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA
+ U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA
+ U+103D/U+103E: "ွှ" MYANMAR CONSONANT SIGN MEDIAL WA/MYANMAR CONSONANT SIGN MEDIAL HA -->
+ <Key
+ latin:keySpec="&#x103D;"
+ latin:moreKeys="&#x103E;,&#x103D;&#x103E;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I
+ U+102E: "ီ" MYANMAR VOWEL SIGN II -->
+ <Key
+ latin:keySpec="&#x102D;"
+ latin:moreKeys="&#x102E;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+102F: "ု" MYANMAR VOWEL SIGN U
+ U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
+ <Key
+ latin:keySpec="&#x102F;"
+ latin:moreKeys="&#x1030;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA -->
+ <Key
+ latin:keySpec="&#x102C;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+103A: "်" MYANMAR SIGN ASAT
+ U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
+ <Key
+ latin:keySpec="&#x103A;"
+ latin:moreKeys="&#x1032;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1037: "့" MYANMAR SIGN DOT BELOW
+ U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
+ <Key
+ latin:keySpec="&#x1037;"
+ latin:moreKeys="&#x1036;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1038: "း" MYANMAR SIGN VISARGA -->
+ <Key
+ latin:keySpec="&#x1038;"
+ latin:keyLabelFlags="fontNormal" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml/rowkeys_myanmar4.xml b/java/res/xml/rowkeys_myanmar4.xml
new file mode 100644
index 000000000..57466c565
--- /dev/null
+++ b/java/res/xml/rowkeys_myanmar4.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+ >
+ <!-- U+1025: "ဥ" MYANMAR LETTER U -->
+ <Key
+ latin:keySpec="&#x1025;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1026: "ဦ" MYANMAR LETTER UU -->
+ <Key
+ latin:keySpec="&#x1026;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+100C: "ဌ" MYANMAR LETTER TTHA -->
+ <Key
+ latin:keySpec="&#x100C;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+100B: "ဋ" MYANMAR LETTER TTA -->
+ <Key
+ latin:keySpec="&#x100B;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+100D: "ဍ" MYANMAR LETTER DDA -->
+ <Key
+ latin:keySpec="&#x100D;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1020: "ဠ" MYANMAR LETTER LLA -->
+ <Key
+ latin:keySpec="&#x1020;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+100B/U+1039/U+100C: "ဋ္ဌ" MYANMAR LETTER TTA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA -->
+ <Key
+ latin:keySpec="&#x100B;&#x1039;&#x100C;"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+100F/U+1039/U+100D: "ဏ္ဍ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER DDA
+ U+100F/U+1039/U+100C: "ဏ္ဌ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA -->
+ <Key
+ latin:keySpec="&#x100F;&#x1039;&#x100D;"
+ latin:moreKeys="&#x100F;&#x1039;&#x100C;"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ </case>
+ <default>
+ <!-- U+1016: "ဖ" MYANMAR LETTER PHA -->
+ <Key
+ latin:keySpec="&#x1016;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1011: "ထ" MYANMAR LETTER THA -->
+ <Key
+ latin:keySpec="&#x1011;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1001: "ခ" MYANMAR LETTER KHA -->
+ <Key
+ latin:keySpec="&#x1001;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+101C: "လ" MYANMAR LETTER LA -->
+ <Key
+ latin:keySpec="&#x101C;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1018: "ဘ" MYANMAR LETTER BHA -->
+ <Key
+ latin:keySpec="&#x1018;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+100A: "ည" MYANMAR LETTER NNYA
+ U+1009: "ဉ" MYANMAR LETTER NYA -->
+ <Key
+ latin:keySpec="&#x100A;"
+ latin:moreKeys="&#x1009;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+101B: "ရ" MYANMAR LETTER RA -->
+ <Key
+ latin:keySpec="&#x101B;"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+101D: "ဝ" MYANMAR LETTER WA -->
+ <Key
+ latin:keySpec="&#x101D;"
+ latin:keyLabelFlags="fontNormal" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized1.xml b/java/res/xml/rowkeys_nepali_romanized1.xml
index 408a96648..616b259a3 100644
--- a/java/res/xml/rowkeys_nepali_romanized1.xml
+++ b/java/res/xml/rowkeys_nepali_romanized1.xml
@@ -27,11 +27,11 @@
>
<!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
<Key
- latin:keyLabel="&#x0920;"
+ latin:keySpec="&#x0920;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0914: "औ" DEVANAGARI LETTER AU -->
<Key
- latin:keyLabel="&#x0914;"
+ latin:keySpec="&#x0914;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -44,14 +44,16 @@
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_vowel_sign_vocalic_r" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
<!-- U+0925: "थ" DEVANAGARI LETTER THA -->
<Key
- latin:keyLabel="&#x0925;"
+ latin:keySpec="&#x0925;"
latin:keyLabelFlags="fontNormal" />
<!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
<Key
- latin:keyLabel="&#x091E;"
+ latin:keySpec="&#x091E;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -69,33 +71,37 @@
latin:keyStyle="baseKeyDevanagariVowelSignIi" />
<!-- U+0913: "ओ" DEVANAGARI LETTER O -->
<Key
- latin:keyLabel="&#x0913;"
+ latin:keySpec="&#x0913;"
latin:keyLabelFlags="fontNormal" />
<!-- U+092B: "फ" DEVANAGARI LETTER PHA -->
<Key
- latin:keyLabel="&#x092B;"
+ latin:keySpec="&#x092B;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0908: "ई" DEVANAGARI LETTER II -->
<Key
- latin:keyLabel="&#x0908;"
+ latin:keySpec="&#x0908;"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
<!-- U+091F: "ट" DEVANAGARI LETTER TTA
- U+0967: "१" DEVANAGARI DIGIT ONE
- U+093C: "़" DEVANAGARI SIGN NUKTA -->
+ U+0967: "१" DEVANAGARI DIGIT ONE -->
<Key
- latin:keyLabel="&#x091F;"
+ latin:keySpec="&#x091F;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="&#x0967;,1"
- latin:moreKeys="&#x093C;"
+ latin:keyStyle="moreKeysDevanagariSignNukta"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+ <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAu"
latin:keyHintLabel="2"
@@ -103,9 +109,9 @@
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+ <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignE"
latin:keyHintLabel="3"
@@ -113,30 +119,30 @@
<!-- U+0930: "र" DEVANAGARI LETTER RA
U+096A: "४" DEVANAGARI DIGIT FOUR -->
<Key
- latin:keyLabel="&#x0930;"
+ latin:keySpec="&#x0930;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="&#x096A;,4"
latin:keyLabelFlags="fontNormal" />
<!-- U+0924: "त" DEVANAGARI LETTER TA
U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
- latin:keyLabel="&#x0924;"
+ latin:keySpec="&#x0924;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="&#x096B;,5"
latin:keyLabelFlags="fontNormal" />
<!-- U+092F: "य" DEVANAGARI LETTER YA
U+096C: "६" DEVANAGARI DIGIT SIX -->
<Key
- latin:keyLabel="&#x092F;"
+ latin:keySpec="&#x092F;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="&#x096C;,6"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+096D: "७" DEVANAGARI DIGIT SEVEN -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+ <!-- U+096D: "७" DEVANAGARI DIGIT SEVEN -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignU"
latin:keyHintLabel="7"
@@ -144,9 +150,9 @@
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+ <!-- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignI"
latin:keyHintLabel="8"
@@ -154,9 +160,9 @@
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+096F: "९" DEVANAGARI DIGIT NINE -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+ <!-- U+096F: "९" DEVANAGARI DIGIT NINE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignO"
latin:keyHintLabel="9"
@@ -164,13 +170,13 @@
<!-- U+092A: "प" DEVANAGARI LETTER PA
U+0966: "०" DEVANAGARI DIGIT ZERO -->
<Key
- latin:keyLabel="&#x092A;"
+ latin:keySpec="&#x092A;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="&#x0966;,0"
latin:keyLabelFlags="fontNormal" />
<!-- U+0907: "इ" DEVANAGARI LETTER I -->
<Key
- latin:keyLabel="&#x0907;"
+ latin:keySpec="&#x0907;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_nepali_romanized2.xml b/java/res/xml/rowkeys_nepali_romanized2.xml
index 66359ffb5..561ae6c93 100644
--- a/java/res/xml/rowkeys_nepali_romanized2.xml
+++ b/java/res/xml/rowkeys_nepali_romanized2.xml
@@ -27,43 +27,43 @@
>
<!-- U+0906: "आ" DEVANAGARI LETTER AA -->
<Key
- latin:keyLabel="&#x0906;"
+ latin:keySpec="&#x0906;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0936: "श" DEVANAGARI LETTER SHA -->
<Key
- latin:keyLabel="&#x0936;"
+ latin:keySpec="&#x0936;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0927: "ध" DEVANAGARI LETTER DHA -->
<Key
- latin:keyLabel="&#x0927;"
+ latin:keySpec="&#x0927;"
latin:keyLabelFlags="fontNormal" />
<!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
<Key
- latin:keyLabel="&#x090A;"
+ latin:keySpec="&#x090A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
<Key
- latin:keyLabel="&#x0918;"
+ latin:keySpec="&#x0918;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0905: "अ" DEVANAGARI LETTER A -->
<Key
- latin:keyLabel="&#x0905;"
+ latin:keySpec="&#x0905;"
latin:keyLabelFlags="fontNormal" />
<!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
<Key
- latin:keyLabel="&#x091D;"
+ latin:keySpec="&#x091D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0916: "ख" DEVANAGARI LETTER KHA -->
<Key
- latin:keyLabel="&#x0916;"
+ latin:keySpec="&#x0916;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
<Key
- latin:keyLabel="&#x0965;"
+ latin:keySpec="&#x0965;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
<Key
- latin:keyLabel="&#x0910;"
+ latin:keySpec="&#x0910;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -83,43 +83,43 @@
latin:keyStyle="baseKeyDevanagariVowelSignAa" />
<!-- U+0938: "स" DEVANAGARI LETTER SA -->
<Key
- latin:keyLabel="&#x0938;"
+ latin:keySpec="&#x0938;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0926: "द" DEVANAGARI LETTER DA -->
<Key
- latin:keyLabel="&#x0926;"
+ latin:keySpec="&#x0926;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0909: "उ" DEVANAGARI LETTER U -->
<Key
- latin:keyLabel="&#x0909;"
+ latin:keySpec="&#x0909;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0917: "ग" DEVANAGARI LETTER GA -->
<Key
- latin:keyLabel="&#x0917;"
+ latin:keySpec="&#x0917;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0939: "ह" DEVANAGARI LETTER HA -->
<Key
- latin:keyLabel="&#x0939;"
+ latin:keySpec="&#x0939;"
latin:keyLabelFlags="fontNormal" />
<!-- U+091C: "ज" DEVANAGARI LETTER JA -->
<Key
- latin:keyLabel="&#x091C;"
+ latin:keySpec="&#x091C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0915: "क" DEVANAGARI LETTER KA -->
<Key
- latin:keyLabel="&#x0915;"
+ latin:keySpec="&#x0915;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0932: "ल" DEVANAGARI LETTER LA -->
<Key
- latin:keyLabel="&#x0932;"
+ latin:keySpec="&#x0932;"
latin:keyLabelFlags="fontNormal" />
<!-- U+090F: "ए" DEVANAGARI LETTER E -->
<Key
- latin:keyLabel="&#x090F;"
+ latin:keySpec="&#x090F;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0950: "ॐ" DEVANAGARI OM -->
<Key
- latin:keyLabel="&#x0950;"
+ latin:keySpec="&#x0950;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_nepali_romanized3.xml b/java/res/xml/rowkeys_nepali_romanized3.xml
index 166d028a3..cc2ca8c84 100644
--- a/java/res/xml/rowkeys_nepali_romanized3.xml
+++ b/java/res/xml/rowkeys_nepali_romanized3.xml
@@ -27,37 +27,41 @@
>
<!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
<Key
- latin:keyLabel="&#x090B;"
+ latin:keySpec="&#x090B;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
<Key
- latin:keyLabel="&#x0922;"
+ latin:keySpec="&#x0922;"
latin:keyLabelFlags="fontNormal" />
<!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
<Key
- latin:keyLabel="&#x091B;"
+ latin:keySpec="&#x091B;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_sign_candrabindu" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
<!-- U+092D: "भ" DEVANAGARI LETTER BHA -->
<Key
- latin:keyLabel="&#x092D;"
+ latin:keySpec="&#x092D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
<Key
- latin:keyLabel="&#x0923;"
+ latin:keySpec="&#x0923;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_sign_anusvara" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignAnusvara" />
<!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
<Key
- latin:keyLabel="&#x0919;"
+ latin:keySpec="&#x0919;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -70,36 +74,36 @@
<default>
<!-- U+0937: "ष" DEVANAGARI LETTER SSA -->
<Key
- latin:keyLabel="&#x0937;"
+ latin:keySpec="&#x0937;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0921: "ड" DEVANAGARI LETTER DDA -->
<Key
- latin:keyLabel="&#x0921;"
+ latin:keySpec="&#x0921;"
latin:keyLabelFlags="fontNormal" />
<!-- U+091A: "च" DEVANAGARI LETTER CA -->
<Key
- latin:keyLabel="&#x091A;"
+ latin:keySpec="&#x091A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0935: "व" DEVANAGARI LETTER VA -->
<Key
- latin:keyLabel="&#x0935;"
+ latin:keySpec="&#x0935;"
latin:keyLabelFlags="fontNormal" />
<!-- U+092C: "ब" DEVANAGARI LETTER BHA -->
<Key
- latin:keyLabel="&#x092C;"
+ latin:keySpec="&#x092C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0928: "न" DEVANAGARI LETTER NA -->
<Key
- latin:keyLabel="&#x0928;"
+ latin:keySpec="&#x0928;"
latin:keyLabelFlags="fontNormal" />
<!-- U+092E: "म" DEVANAGARI LETTER MA -->
<Key
- latin:keyLabel="&#x092E;"
+ latin:keySpec="&#x092E;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0964: "।" DEVANAGARI DANDA
U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
<Key
- latin:keyLabel="&#x0964;"
+ latin:keySpec="&#x0964;"
latin:moreKeys="&#x093D;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
diff --git a/java/res/xml/rowkeys_nepali_traditional1.xml b/java/res/xml/rowkeys_nepali_traditional1.xml
index c7883c733..cf4bda982 100644
--- a/java/res/xml/rowkeys_nepali_traditional1.xml
+++ b/java/res/xml/rowkeys_nepali_traditional1.xml
@@ -30,144 +30,146 @@
U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
<Key
- latin:keyLabel="&#x0924;&#x094D;&#x0924;"
+ latin:keySpec="&#x0924;&#x094D;&#x0924;"
latin:moreKeys="&#x091E;,&#x091C;&#x094D;&#x091E;,&#x0965;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0921/U+094D/U+0922: "ड्ढ" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDHA
U+0908: "ई" DEVANAGARI LETTER II -->
<Key
- latin:keyLabel="&#x0921;&#x094D;&#x0922;"
+ latin:keySpec="&#x0921;&#x094D;&#x0922;"
latin:moreKeys="&#x0908;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0910: "ऐ" DEVANAGARI LETTER AI
U+0918: "घ" DEVANAGARI LETTER GHA -->
<Key
- latin:keyLabel="&#x0910;"
+ latin:keySpec="&#x0910;"
latin:moreKeys="&#x0918;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0926/U+094D/U+0935: "द्व" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER VA
U+0926/U+094D/U+0927: "द्ध" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DHA -->
<Key
- latin:keyLabel="&#x0926;&#x094D;&#x0935;"
+ latin:keySpec="&#x0926;&#x094D;&#x0935;"
latin:moreKeys="&#x0926;&#x094D;&#x0927;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+091F/U+094D/U+091F: "ट्ट" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTA
U+091B: "छ" DEVANAGARI LETTER CHA -->
<Key
- latin:keyLabel="&#x091F;&#x094D;&#x091F;"
+ latin:keySpec="&#x091F;&#x094D;&#x091F;"
latin:moreKeys="&#x091B;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0920/U+094D/U+0920: "ठ्ठ" DEVANAGARI LETTER TTHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA
U+091F: "ट" DEVANAGARI LETTER TTA -->
<Key
- latin:keyLabel="&#x0920;&#x094D;&#x0920;"
+ latin:keySpec="&#x0920;&#x094D;&#x0920;"
latin:moreKeys="&#x091F;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+090A: "ऊ" DEVANAGARI LETTER UU
U+0920: "ठ" DEVANAGARI LETTER TTHA -->
<Key
- latin:keyLabel="&#x090A;"
+ latin:keySpec="&#x090A;"
latin:moreKeys="&#x0920;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
U+0921: "ड" DEVANAGARI LETTER DDA -->
<Key
- latin:keyLabel="&#x0915;&#x094D;&#x0937;"
+ latin:keySpec="&#x0915;&#x094D;&#x0937;"
latin:moreKeys="&#x0921;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0907: "इ" DEVANAGARI LETTER I
U+0922: "ढ" DEVANAGARI LETTER DDHA -->
<Key
- latin:keyLabel="&#x0907;"
+ latin:keySpec="&#x0907;"
latin:moreKeys="&#x0922;"
latin:keyLabelFlags="fontNormal" />
<!-- U+090F: "ए" DEVANAGARI LETTER E
U+0923: "ण" DEVANAGARI LETTER NNA -->
<Key
- latin:keyLabel="&#x090F;"
+ latin:keySpec="&#x090F;"
latin:moreKeys="&#x0923;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_vowel_sign_vocalic_r" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
</case>
<default>
<!-- U+091F: "ट" DEVANAGARI LETTER TTA
U+0967: "१" DEVANAGARI DIGIT ONE -->
<Key
- latin:keyLabel="&#x091F;"
+ latin:keySpec="&#x091F;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="&#x0967;,1"
latin:keyLabelFlags="fontNormal" />
<!-- U+0927: "ध" DEVANAGARI LETTER DHA
U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
- latin:keyLabel="&#x0927;"
+ latin:keySpec="&#x0927;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="&#x0968;,2"
latin:keyLabelFlags="fontNormal" />
<!-- U+092D: "भ" DEVANAGARI LETTER BHA
U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
- latin:keyLabel="&#x092D;"
+ latin:keySpec="&#x092D;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="&#x0969;,3"
latin:keyLabelFlags="fontNormal" />
<!-- U+091A: "च" DEVANAGARI LETTER CA
U+096A: "४" DEVANAGARI DIGIT FOUR -->
<Key
- latin:keyLabel="&#x091A;"
+ latin:keySpec="&#x091A;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="&#x096A;,4"
latin:keyLabelFlags="fontNormal" />
<!-- U+0924: "त" DEVANAGARI LETTER TA
U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
- latin:keyLabel="&#x0924;"
+ latin:keySpec="&#x0924;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="&#x096B;,5"
latin:keyLabelFlags="fontNormal" />
<!-- U+0925: "थ" DEVANAGARI LETTER THA
U+096C: "६" DEVANAGARI DIGIT SIX -->
<Key
- latin:keyLabel="&#x0925;"
+ latin:keySpec="&#x0925;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="&#x096C;,6"
latin:keyLabelFlags="fontNormal" />
<!-- U+0917: "ग" DEVANAGARI LETTER G
U+096D: "७" DEVANAGARI DIGIT SEVEN -->
<Key
- latin:keyLabel="&#x0917;"
+ latin:keySpec="&#x0917;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="&#x096D;,7"
latin:keyLabelFlags="fontNormal" />
<!-- U+0937: "ष" DEVANAGARI LETTER SSA
U+096E: "८" DEVANAGARI DIGIT EIGHT -->
<Key
- latin:keyLabel="&#x0937;"
+ latin:keySpec="&#x0937;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="&#x096E;,8"
latin:keyLabelFlags="fontNormal" />
<!-- U+092F: "य" DEVANAGARI LETTER YA
U+096F: "९" DEVANAGARI DIGIT NINE -->
<Key
- latin:keyLabel="&#x092F;"
+ latin:keySpec="&#x092F;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="&#x096F;,9"
latin:keyLabelFlags="fontNormal" />
<!-- U+0909: "उ" DEVANAGARI LETTER U
U+0966: "०" DEVANAGARI DIGIT ZERO -->
<Key
- latin:keyLabel="&#x0909;"
+ latin:keySpec="&#x0909;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="&#x0966;,0"
latin:keyLabelFlags="fontNormal" />
<!-- U+0907: "इ" DEVANAGARI LETTER I
U+0914: "औ" DEVANAGARI LETTER AU -->
<Key
- latin:keyLabel="&#x0907;"
+ latin:keySpec="&#x0907;"
latin:moreKeys="&#x0914;"
latin:keyLabelFlags="fontNormal" />
</default>
diff --git a/java/res/xml/rowkeys_nepali_traditional2.xml b/java/res/xml/rowkeys_nepali_traditional2.xml
index 45620a9d7..58a463e71 100644
--- a/java/res/xml/rowkeys_nepali_traditional2.xml
+++ b/java/res/xml/rowkeys_nepali_traditional2.xml
@@ -27,28 +27,30 @@
>
<!-- U+0906: "आ" DEVANAGARI LETTER AA -->
<Key
- latin:keyLabel="&#x0906;"
+ latin:keySpec="&#x0906;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0919/U+094D: "ङ्" DEVANAGARI LETTER NGA/DEVANAGARI SIGN VIRAMA -->
<Key
- latin:keyLabel="&#x0919;&#x094D;"
+ latin:keySpec="&#x0919;&#x094D;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0921/U+094D/U+0921: "ड्ड" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDA -->
<Key
- latin:keyLabel="&#x0921;&#x094D;&#x0921;"
+ latin:keySpec="&#x0921;&#x094D;&#x0921;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_sign_candrabindu" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
<!-- U+0926/U+094D/U+0926: "द्द" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DA -->
<Key
- latin:keyLabel="&#x0926;&#x094D;&#x0926;"
+ latin:keySpec="&#x0926;&#x094D;&#x0926;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
<Key
- latin:keyLabel="&#x091D;"
+ latin:keySpec="&#x091D;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -59,7 +61,7 @@
latin:keyStyle="baseKeyDevanagariVowelSignO" />
<!-- U+092B: "फ" DEVANAGARI LETTER PHA -->
<Key
- latin:keyLabel="&#x092B;"
+ latin:keySpec="&#x092B;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -70,7 +72,7 @@
latin:keyStyle="baseKeyDevanagariVowelSignIi" />
<!-- U+091F/U+094D/U+0920: "ट्ठ" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA -->
<Key
- latin:keyLabel="&#x091F;&#x094D;&#x0920;"
+ latin:keySpec="&#x091F;&#x094D;&#x0920;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -83,15 +85,15 @@
<default>
<!-- U+092C: "ब" DEVANAGARI LETTER BA -->
<Key
- latin:keyLabel="&#x092C;"
+ latin:keySpec="&#x092C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0915: "क" DEVANAGARI LETTER KA -->
<Key
- latin:keyLabel="&#x0915;"
+ latin:keySpec="&#x0915;"
latin:keyLabelFlags="fontNormal" />
<!-- U+092E: "म" DEVANAGARI LETTER MA -->
<Key
- latin:keyLabel="&#x092E;"
+ latin:keySpec="&#x092E;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -102,19 +104,19 @@
latin:keyStyle="baseKeyDevanagariVowelSignAa" />
<!-- U+0928: "न" DEVANAGARI LETTER NA -->
<Key
- latin:keyLabel="&#x0928;"
+ latin:keySpec="&#x0928;"
latin:keyLabelFlags="fontNormal" />
<!-- U+091C: "ज" DEVANAGARI LETTER JA -->
<Key
- latin:keyLabel="&#x091C;"
+ latin:keySpec="&#x091C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0935: "व" DEVANAGARI LETTER VA -->
<Key
- latin:keyLabel="&#x0935;"
+ latin:keySpec="&#x0935;"
latin:keyLabelFlags="fontNormal" />
<!-- U+092A: "प" DEVANAGARI LETTER PA -->
<Key
- latin:keyLabel="&#x092A;"
+ latin:keySpec="&#x092A;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -125,7 +127,7 @@
latin:keyStyle="baseKeyDevanagariVowelSignI" />
<!-- U+0938: "स" DEVANAGARI LETTER SA -->
<Key
- latin:keyLabel="&#x0938;"
+ latin:keySpec="&#x0938;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
diff --git a/java/res/xml/rowkeys_nepali_traditional3_left6.xml b/java/res/xml/rowkeys_nepali_traditional3_left6.xml
index 1cacced83..59f6e651a 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_left6.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_left6.xml
@@ -27,19 +27,19 @@
>
<!-- U+0915/U+094D: "क्" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA -->
<Key
- latin:keyLabel="&#x0915;&#x094D;"
+ latin:keySpec="&#x0915;&#x094D;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0939/U+094D/U+092E: "ह्म" DEVANAGARI LETTER HA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER MA -->
<Key
- latin:keyLabel="&#x0939;&#x094D;&#x092E;"
+ latin:keySpec="&#x0939;&#x094D;&#x092E;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
<Key
- latin:keyLabel="&#x090B;"
+ latin:keySpec="&#x090B;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0950: "ॐ" DEVANAGARI OM -->
<Key
- latin:keyLabel="&#x0950;"
+ latin:keySpec="&#x0950;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -50,33 +50,33 @@
latin:keyStyle="baseKeyDevanagariVowelSignAu" />
<!-- U+0926/U+094D/U+092F: "द्य" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER YA -->
<Key
- latin:keyLabel="&#x0926;&#x094D;&#x092F;"
+ latin:keySpec="&#x0926;&#x094D;&#x092F;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</case>
<default>
<!-- U+0936: "श" DEVANAGARI LETTER SHA -->
<Key
- latin:keyLabel="&#x0936;"
+ latin:keySpec="&#x0936;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0939: "ह" DEVANAGARI LETTER HA -->
<Key
- latin:keyLabel="&#x0939;"
+ latin:keySpec="&#x0939;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0905: "अ" DEVANAGARI LETTER A -->
<Key
- latin:keyLabel="&#x0905;"
+ latin:keySpec="&#x0905;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0916: "ख" DEVANAGARI LETTER KHA -->
<Key
- latin:keyLabel="&#x0916;"
+ latin:keySpec="&#x0916;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0926: "द" DEVANAGARI LETTER DA -->
<Key
- latin:keyLabel="&#x0926;"
+ latin:keySpec="&#x0926;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0932: "ल" DEVANAGARI LETTER LA -->
<Key
- latin:keyLabel="&#x0932;"
+ latin:keySpec="&#x0932;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_nepali_traditional3_right3.xml b/java/res/xml/rowkeys_nepali_traditional3_right3.xml
index b2e01e481..3e6187d11 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_right3.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_right3.xml
@@ -29,10 +29,12 @@
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_sign_anusvara" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignAnusvara" />
<!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
<Key
- latin:keyLabel="&#x0919;"
+ latin:keySpec="&#x0919;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -52,12 +54,12 @@
latin:keyStyle="baseKeyDevanagariVowelSignE" />
<!-- U+0964: "।" DEVANAGARI DANDA -->
<Key
- latin:keyLabel="&#x0964;"
+ latin:keySpec="&#x0964;"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0930: "र" DEVANAGARI LETTER RA
- U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U -->
+ <!-- U+0930: "र" DEVANAGARI LETTER RA
+ U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U -->
<Key
- latin:keyLabel="&#x0930;"
+ latin:keySpec="&#x0930;"
latin:moreKeys="&#x0930;&#x0941;"
latin:keyLabelFlags="fontNormal" />
</default>
diff --git a/java/res/xml/rowkeys_nepali_traditional3_right5.xml b/java/res/xml/rowkeys_nepali_traditional3_right5.xml
index 87f061610..89d5aa469 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_right5.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_right5.xml
@@ -29,10 +29,12 @@
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include
- latin:keyboardLayout="@xml/key_devanagari_sign_anusvara" />
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignAnusvara" />
<!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
<Key
- latin:keyLabel="&#x0919;"
+ latin:keySpec="&#x0919;"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
@@ -43,19 +45,19 @@
latin:keyStyle="baseKeyDevanagariVowelSignAi" />
<!-- U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U -->
<Key
- latin:keyLabel="&#x0930;&#x0941;"
+ latin:keySpec="&#x0930;&#x0941;"
latin:moreKeys="!"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<Key
- latin:keyLabel="\?" />
+ latin:keySpec="\?" />
</case>
<default>
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
- <!-- U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
<include
latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
+ <!-- U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
<Key
latin:keyStyle="baseKeyDevanagariSignVisarga"
latin:moreKeys="&#x093D;" />
@@ -71,11 +73,11 @@
latin:keyStyle="baseKeyDevanagariVowelSignE" />
<!-- U+0964: "।" DEVANAGARI DANDA -->
<Key
- latin:keyLabel="&#x0964;"
+ latin:keySpec="&#x0964;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0930: "र" DEVANAGARI LETTER RA -->
<Key
- latin:keyLabel="&#x0930;"
+ latin:keySpec="&#x0930;"
latin:moreKeys="!"
latin:keyLabelFlags="fontNormal" />
<!-- Because the font rendering system prior to API version 16 can't automatically
diff --git a/java/res/xml/rowkeys_nordic1.xml b/java/res/xml/rowkeys_nordic1.xml
index 72ac86b2e..ff589cc4a 100644
--- a/java/res/xml/rowkeys_nordic1.xml
+++ b/java/res/xml/rowkeys_nordic1.xml
@@ -24,5 +24,5 @@
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1" />
<Key
- latin:keyLabel="!text/keylabel_for_nordic_row1_11" />
+ latin:keySpec="!text/keyspec_nordic_row1_11" />
</merge>
diff --git a/java/res/xml/rowkeys_nordic2.xml b/java/res/xml/rowkeys_nordic2.xml
index 836214abf..0330c0f67 100644
--- a/java/res/xml/rowkeys_nordic2.xml
+++ b/java/res/xml/rowkeys_nordic2.xml
@@ -24,9 +24,9 @@
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2" />
<Key
- latin:keyLabel="!text/keylabel_for_nordic_row2_10"
- latin:moreKeys="!text/more_keys_for_nordic_row2_10" />
+ latin:keySpec="!text/keyspec_nordic_row2_10"
+ latin:moreKeys="!text/morekeys_nordic_row2_10" />
<Key
- latin:keyLabel="!text/keylabel_for_nordic_row2_11"
- latin:moreKeys="!text/more_keys_for_nordic_row2_11" />
+ latin:keySpec="!text/keyspec_nordic_row2_11"
+ latin:moreKeys="!text/morekeys_nordic_row2_11" />
</merge>
diff --git a/java/res/xml/rowkeys_pcqwerty1.xml b/java/res/xml/rowkeys_pcqwerty1.xml
index de548d0ba..564468a9a 100644
--- a/java/res/xml/rowkeys_pcqwerty1.xml
+++ b/java/res/xml/rowkeys_pcqwerty1.xml
@@ -21,61 +21,72 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Key
- latin:keyLabel="`"
- latin:additionalMoreKeys="~" />
- <Key
- latin:keyLabel="1"
- latin:additionalMoreKeys="!,!text/more_keys_for_symbols_exclamation"
- latin:moreKeys="!text/more_keys_for_symbols_1" />
- <Key
- latin:keyLabel="2"
- latin:additionalMoreKeys="\@"
- latin:moreKeys="!text/more_keys_for_symbols_2" />
- <Key
- latin:keyLabel="3"
- latin:additionalMoreKeys="\#"
- latin:moreKeys="!text/more_keys_for_symbols_3" />
- <Key
- latin:keyLabel="4"
- latin:additionalMoreKeys="$"
- latin:moreKeys="!text/more_keys_for_symbols_4" />
- <Key
- latin:keyLabel="5"
- latin:additionalMoreKeys="\\%"
- latin:moreKeys="!text/more_keys_for_symbols_5" />
- <Key
- latin:keyLabel="6"
- latin:additionalMoreKeys="^"
- latin:moreKeys="!text/more_keys_for_symbols_6" />
- <Key
- latin:keyLabel="7"
- latin:additionalMoreKeys="&amp;"
- latin:moreKeys="!text/more_keys_for_symbols_7" />
- <Key
- latin:keyLabel="8"
- latin:additionalMoreKeys="*"
- latin:moreKeys="!text/more_keys_for_symbols_8" />
- <Key
- latin:keyLabel="9"
- latin:additionalMoreKeys="("
- latin:moreKeys="!text/more_keys_for_symbols_9" />
- <Key
- latin:keyLabel="0"
- latin:additionalMoreKeys=")"
- latin:moreKeys="!text/more_keys_for_symbols_0" />
- <!-- U+2013: "–" EN DASH
- U+2014: "—" EM DASH
- U+00B7: "·" MIDDLE DOT -->
- <Key
- latin:keyLabel="-"
- latin:additionalMoreKeys="_"
- latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
- <!-- U+221E: "∞" INFINITY
- U+2260: "≠" NOT EQUAL TO
- U+2248: "≈" ALMOST EQUAL TO -->
- <Key
- latin:keyLabel="="
- latin:additionalMoreKeys="+"
- latin:moreKeys="!fixedColumnOrder!4,&#x221E;,&#x2260;,&#x2248;,%" />
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
+ >
+ <Key
+ latin:keySpec="`"
+ latin:additionalMoreKeys="~" />
+ <Key
+ latin:keySpec="1"
+ latin:additionalMoreKeys="!,!text/morekeys_exclamation"
+ latin:moreKeys="!text/morekeys_symbols_1" />
+ <Key
+ latin:keySpec="2"
+ latin:additionalMoreKeys="\@"
+ latin:moreKeys="!text/morekeys_symbols_2" />
+ <Key
+ latin:keySpec="3"
+ latin:additionalMoreKeys="\#"
+ latin:moreKeys="!text/morekeys_symbols_3" />
+ <Key
+ latin:keySpec="4"
+ latin:additionalMoreKeys="$"
+ latin:moreKeys="!text/morekeys_symbols_4" />
+ <Key
+ latin:keySpec="5"
+ latin:additionalMoreKeys="\\%"
+ latin:moreKeys="!text/morekeys_symbols_5" />
+ <Key
+ latin:keySpec="6"
+ latin:additionalMoreKeys="^"
+ latin:moreKeys="!text/morekeys_symbols_6" />
+ <Key
+ latin:keySpec="7"
+ latin:additionalMoreKeys="&amp;"
+ latin:moreKeys="!text/morekeys_symbols_7" />
+ <Key
+ latin:keySpec="8"
+ latin:additionalMoreKeys="*"
+ latin:moreKeys="!text/morekeys_symbols_8" />
+ <Key
+ latin:keySpec="9"
+ latin:additionalMoreKeys="("
+ latin:moreKeys="!text/morekeys_symbols_9" />
+ <Key
+ latin:keySpec="0"
+ latin:additionalMoreKeys=")"
+ latin:moreKeys="!text/morekeys_symbols_0" />
+ <!-- U+2013: "–" EN DASH
+ U+2014: "—" EM DASH
+ U+00B7: "·" MIDDLE DOT -->
+ <Key
+ latin:keySpec="-"
+ latin:additionalMoreKeys="_"
+ latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
+ <!-- U+221E: "∞" INFINITY
+ U+2260: "≠" NOT EQUAL TO
+ U+2248: "≈" ALMOST EQUAL TO -->
+ <Key
+ latin:keySpec="="
+ latin:additionalMoreKeys="+"
+ latin:moreKeys="!fixedColumnOrder!4,&#x221E;,&#x2260;,&#x2248;,%" />
+ </case>
+ <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" -->
+ <default>
+ <include
+ latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
+ </default>
+ </switch>
</merge>
diff --git a/java/res/xml/rowkeys_pcqwerty1_shift.xml b/java/res/xml/rowkeys_pcqwerty1_shift.xml
index bc39f944e..c72040f8a 100644
--- a/java/res/xml/rowkeys_pcqwerty1_shift.xml
+++ b/java/res/xml/rowkeys_pcqwerty1_shift.xml
@@ -22,39 +22,38 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="~" />
+ latin:keySpec="~" />
<Key
- latin:keyLabel="!"
- latin:additionalMoreKeys="!text/more_keys_for_symbols_exclamation" />
+ latin:keySpec="!"
+ latin:additionalMoreKeys="!text/morekeys_exclamation" />
<Key
- latin:keyLabel="\@" />
+ latin:keySpec="\@" />
<Key
- latin:keyLabel="\#" />
+ latin:keySpec="\#" />
<Key
- latin:keyLabel="$"
- latin:additionalMoreKeys="!text/more_keys_for_currency_dollar" />
+ latin:keySpec="$"
+ latin:additionalMoreKeys="!text/morekeys_currency_dollar" />
<Key
- latin:keyLabel="%"
- latin:additionalMoreKeys="!text/more_keys_for_symbols_percent" />
+ latin:keySpec="%"
+ latin:additionalMoreKeys="!text/morekeys_symbols_percent" />
<Key
- latin:keyLabel="^" />
+ latin:keySpec="^" />
<Key
- latin:keyLabel="&amp;" />
+ latin:keySpec="&amp;" />
<Key
- latin:keyLabel="*"
- latin:additionalMoreKeys="!text/more_keys_for_star" />
+ latin:keySpec="*"
+ latin:additionalMoreKeys="!text/morekeys_star" />
<Key
- latin:keyLabel="(" />
+ latin:keySpec="(" />
<Key
- latin:keyLabel=")" />
+ latin:keySpec=")" />
<Key
- latin:keyLabel="_" />
- <!-- U+00B1: "±" PLUS-MINUS SIGN
- U+00D7: "×" MULTIPLICATION SIGN
+ latin:keySpec="_" />
+ <!-- U+00D7: "×" MULTIPLICATION SIGN
U+00F7: "÷" DIVISION SIGN
U+221A: "√" SQUARE ROOT -->
<Key
- latin:keyLabel="+"
- latin:additionalMoreKeys="!text/more_keys_for_plus"
- latin:moreKeys="&#x00B1;,&#x00D7;,&#x00F7;,&#x221A;" />
+ latin:keySpec="+"
+ latin:additionalMoreKeys="!text/morekeys_plus"
+ latin:moreKeys="&#x00D7;,&#x00F7;,&#x221A;" />
</merge>
diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml
index e7c9b590b..8f3b160fe 100644
--- a/java/res/xml/rowkeys_qwerty1.xml
+++ b/java/res/xml/rowkeys_qwerty1.xml
@@ -22,52 +22,52 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="!text/keylabel_for_q"
+ latin:keySpec="!text/keyspec_q"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
- latin:moreKeys="!text/more_keys_for_q" />
+ latin:moreKeys="!text/morekeys_q" />
<Key
- latin:keyLabel="!text/keylabel_for_w"
+ latin:keySpec="!text/keyspec_w"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
- latin:moreKeys="!text/more_keys_for_w" />
+ latin:moreKeys="!text/morekeys_w" />
<Key
- latin:keyLabel="e"
+ latin:keySpec="e"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="!text/more_keys_for_e" />
+ latin:moreKeys="!text/morekeys_e" />
<Key
- latin:keyLabel="r"
+ latin:keySpec="r"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
- latin:moreKeys="!text/more_keys_for_r" />
+ latin:moreKeys="!text/morekeys_r" />
<Key
- latin:keyLabel="t"
+ latin:keySpec="t"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
- latin:moreKeys="!text/more_keys_for_t" />
+ latin:moreKeys="!text/morekeys_t" />
<Key
- latin:keyLabel="!text/keylabel_for_y"
+ latin:keySpec="!text/keyspec_y"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="!text/more_keys_for_y" />
+ latin:moreKeys="!text/morekeys_y" />
<Key
- latin:keyLabel="u"
+ latin:keySpec="u"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
- latin:moreKeys="!text/more_keys_for_u" />
+ latin:moreKeys="!text/morekeys_u" />
<Key
- latin:keyLabel="i"
+ latin:keySpec="i"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="!text/more_keys_for_i" />
+ latin:moreKeys="!text/morekeys_i" />
<Key
- latin:keyLabel="o"
+ latin:keySpec="o"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
- latin:moreKeys="!text/more_keys_for_o" />
+ latin:moreKeys="!text/morekeys_o" />
<Key
- latin:keyLabel="p"
+ latin:keySpec="p"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
</merge>
diff --git a/java/res/xml/rowkeys_qwerty2.xml b/java/res/xml/rowkeys_qwerty2.xml
index d9777d920..4077beaf6 100644
--- a/java/res/xml/rowkeys_qwerty2.xml
+++ b/java/res/xml/rowkeys_qwerty2.xml
@@ -22,29 +22,29 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="a"
- latin:moreKeys="!text/more_keys_for_a" />
+ latin:keySpec="a"
+ latin:moreKeys="!text/morekeys_a" />
<Key
- latin:keyLabel="s"
- latin:moreKeys="!text/more_keys_for_s" />
+ latin:keySpec="s"
+ latin:moreKeys="!text/morekeys_s" />
<Key
- latin:keyLabel="d"
- latin:moreKeys="!text/more_keys_for_d" />
+ latin:keySpec="d"
+ latin:moreKeys="!text/morekeys_d" />
<Key
- latin:keyLabel="f" />
+ latin:keySpec="f" />
<Key
- latin:keyLabel="g"
- latin:moreKeys="!text/more_keys_for_g" />
+ latin:keySpec="g"
+ latin:moreKeys="!text/morekeys_g" />
<Key
- latin:keyLabel="h"
- latin:moreKeys="!text/more_keys_for_h" />
+ latin:keySpec="h"
+ latin:moreKeys="!text/morekeys_h" />
<Key
- latin:keyLabel="j"
- latin:moreKeys="!text/more_keys_for_j" />
+ latin:keySpec="j"
+ latin:moreKeys="!text/morekeys_j" />
<Key
- latin:keyLabel="k"
- latin:moreKeys="!text/more_keys_for_k" />
+ latin:keySpec="k"
+ latin:moreKeys="!text/morekeys_k" />
<Key
- latin:keyLabel="l"
- latin:moreKeys="!text/more_keys_for_l" />
+ latin:keySpec="l"
+ latin:moreKeys="!text/morekeys_l" />
</merge>
diff --git a/java/res/xml/rowkeys_qwerty3.xml b/java/res/xml/rowkeys_qwerty3.xml
index b70fd729f..8562003d2 100644
--- a/java/res/xml/rowkeys_qwerty3.xml
+++ b/java/res/xml/rowkeys_qwerty3.xml
@@ -22,22 +22,22 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="z"
- latin:moreKeys="!text/more_keys_for_z" />
+ latin:keySpec="z"
+ latin:moreKeys="!text/morekeys_z" />
<Key
- latin:keyLabel="!text/keylabel_for_x"
- latin:moreKeys="!text/more_keys_for_x" />
+ latin:keySpec="!text/keyspec_x"
+ latin:moreKeys="!text/morekeys_x" />
<Key
- latin:keyLabel="c"
- latin:moreKeys="!text/more_keys_for_c" />
+ latin:keySpec="c"
+ latin:moreKeys="!text/morekeys_c" />
<Key
- latin:keyLabel="v"
- latin:moreKeys="!text/more_keys_for_v" />
+ latin:keySpec="v"
+ latin:moreKeys="!text/morekeys_v" />
<Key
- latin:keyLabel="b" />
+ latin:keySpec="b" />
<Key
- latin:keyLabel="n"
- latin:moreKeys="!text/more_keys_for_n" />
+ latin:keySpec="n"
+ latin:moreKeys="!text/morekeys_n" />
<Key
- latin:keyLabel="m" />
+ latin:keySpec="m" />
</merge>
diff --git a/java/res/xml/rowkeys_qwertz1.xml b/java/res/xml/rowkeys_qwertz1.xml
index d87f03ddc..c4edae339 100644
--- a/java/res/xml/rowkeys_qwertz1.xml
+++ b/java/res/xml/rowkeys_qwertz1.xml
@@ -22,51 +22,51 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="q"
+ latin:keySpec="q"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<Key
- latin:keyLabel="w"
+ latin:keySpec="w"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
- latin:moreKeys="!text/more_keys_for_w" />
+ latin:moreKeys="!text/morekeys_w" />
<Key
- latin:keyLabel="e"
+ latin:keySpec="e"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="!text/more_keys_for_e" />
+ latin:moreKeys="!text/morekeys_e" />
<Key
- latin:keyLabel="r"
+ latin:keySpec="r"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
- latin:moreKeys="!text/more_keys_for_r" />
+ latin:moreKeys="!text/morekeys_r" />
<Key
- latin:keyLabel="t"
+ latin:keySpec="t"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
- latin:moreKeys="!text/more_keys_for_t" />
+ latin:moreKeys="!text/morekeys_t" />
<Key
- latin:keyLabel="z"
+ latin:keySpec="z"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="!text/more_keys_for_z" />
+ latin:moreKeys="!text/morekeys_z" />
<Key
- latin:keyLabel="u"
+ latin:keySpec="u"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
- latin:moreKeys="!text/more_keys_for_u" />
+ latin:moreKeys="!text/morekeys_u" />
<Key
- latin:keyLabel="i"
+ latin:keySpec="i"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="!text/more_keys_for_i" />
+ latin:moreKeys="!text/morekeys_i" />
<Key
- latin:keyLabel="o"
+ latin:keySpec="o"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
- latin:moreKeys="!text/more_keys_for_o" />
+ latin:moreKeys="!text/morekeys_o" />
<Key
- latin:keyLabel="p"
+ latin:keySpec="p"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
</merge>
diff --git a/java/res/xml/rowkeys_qwertz3.xml b/java/res/xml/rowkeys_qwertz3.xml
index 9e39fe08e..a66c34868 100644
--- a/java/res/xml/rowkeys_qwertz3.xml
+++ b/java/res/xml/rowkeys_qwertz3.xml
@@ -22,21 +22,21 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="y"
- latin:moreKeys="!text/more_keys_for_y" />
+ latin:keySpec="y"
+ latin:moreKeys="!text/morekeys_y" />
<Key
- latin:keyLabel="x" />
+ latin:keySpec="x" />
<Key
- latin:keyLabel="c"
- latin:moreKeys="!text/more_keys_for_c" />
+ latin:keySpec="c"
+ latin:moreKeys="!text/morekeys_c" />
<Key
- latin:keyLabel="v"
- latin:moreKeys="!text/more_keys_for_v" />
+ latin:keySpec="v"
+ latin:moreKeys="!text/morekeys_v" />
<Key
- latin:keyLabel="b" />
+ latin:keySpec="b" />
<Key
- latin:keyLabel="n"
- latin:moreKeys="!text/more_keys_for_n" />
+ latin:keySpec="n"
+ latin:moreKeys="!text/morekeys_n" />
<Key
- latin:keyLabel="m" />
+ latin:keySpec="m" />
</merge>
diff --git a/java/res/xml/rowkeys_south_slavic1.xml b/java/res/xml/rowkeys_south_slavic1.xml
index 6117d46f1..064f164e8 100644
--- a/java/res/xml/rowkeys_south_slavic1.xml
+++ b/java/res/xml/rowkeys_south_slavic1.xml
@@ -23,56 +23,56 @@
>
<!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
<Key
- latin:keyLabel="&#x0459;"
+ latin:keySpec="&#x0459;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
<Key
- latin:keyLabel="&#x045A;"
+ latin:keySpec="&#x045A;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
<Key
- latin:keyLabel="&#x0435;"
+ latin:keySpec="&#x0435;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="!text/more_keys_for_cyrillic_ie" />
+ latin:moreKeys="!text/morekeys_cyrillic_ie" />
<!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
<Key
- latin:keyLabel="&#x0440;"
+ latin:keySpec="&#x0440;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
<Key
- latin:keyLabel="&#x0442;"
+ latin:keySpec="&#x0442;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5" />
<Key
- latin:keyLabel="!text/keylabel_for_south_slavic_row1_6"
+ latin:keySpec="!text/keyspec_south_slavic_row1_6"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6" />
<!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
<Key
- latin:keyLabel="&#x0443;"
+ latin:keySpec="&#x0443;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7" />
<!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
<Key
- latin:keyLabel="&#x0438;"
+ latin:keySpec="&#x0438;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="!text/more_keys_for_cyrillic_i" />
+ latin:moreKeys="!text/morekeys_cyrillic_i" />
<!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
<Key
- latin:keyLabel="&#x043E;"
+ latin:keySpec="&#x043E;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9" />
<!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
<Key
- latin:keyLabel="&#x043F;"
+ latin:keySpec="&#x043F;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
<!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
<Key
- latin:keyLabel="&#x0448;" />
+ latin:keySpec="&#x0448;" />
</merge>
diff --git a/java/res/xml/rowkeys_south_slavic2.xml b/java/res/xml/rowkeys_south_slavic2.xml
index 88e894053..3b98001b2 100644
--- a/java/res/xml/rowkeys_south_slavic2.xml
+++ b/java/res/xml/rowkeys_south_slavic2.xml
@@ -23,34 +23,34 @@
>
<!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
<Key
- latin:keyLabel="&#x0430;" />
+ latin:keySpec="&#x0430;" />
<!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
<Key
- latin:keyLabel="&#x0441;" />
+ latin:keySpec="&#x0441;" />
<!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
<Key
- latin:keyLabel="&#x0434;" />
+ latin:keySpec="&#x0434;" />
<!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
<Key
- latin:keyLabel="&#x0444;" />
+ latin:keySpec="&#x0444;" />
<!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
<Key
- latin:keyLabel="&#x0433;" />
+ latin:keySpec="&#x0433;" />
<!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
<Key
- latin:keyLabel="&#x0445;" />
+ latin:keySpec="&#x0445;" />
<!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->
<Key
- latin:keyLabel="&#x0458;" />
+ latin:keySpec="&#x0458;" />
<!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
<Key
- latin:keyLabel="&#x043A;" />
+ latin:keySpec="&#x043A;" />
<!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
<Key
- latin:keyLabel="&#x043B;" />
+ latin:keySpec="&#x043B;" />
<!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
<Key
- latin:keyLabel="&#x0447;" />
+ latin:keySpec="&#x0447;" />
<Key
- latin:keyLabel="!text/keylabel_for_south_slavic_row2_11" />
+ latin:keySpec="!text/keyspec_south_slavic_row2_11" />
</merge>
diff --git a/java/res/xml/rowkeys_south_slavic3.xml b/java/res/xml/rowkeys_south_slavic3.xml
index b01550911..31df9b96e 100644
--- a/java/res/xml/rowkeys_south_slavic3.xml
+++ b/java/res/xml/rowkeys_south_slavic3.xml
@@ -22,28 +22,28 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="!text/keylabel_for_south_slavic_row3_1" />
+ latin:keySpec="!text/keyspec_south_slavic_row3_1" />
<!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
<Key
- latin:keyLabel="&#x045F;" />
+ latin:keySpec="&#x045F;" />
<!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
<Key
- latin:keyLabel="&#x0446;" />
+ latin:keySpec="&#x0446;" />
<!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
<Key
- latin:keyLabel="&#x0432;" />
+ latin:keySpec="&#x0432;" />
<!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
<Key
- latin:keyLabel="&#x0431;" />
+ latin:keySpec="&#x0431;" />
<!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
<Key
- latin:keyLabel="&#x043D;" />
+ latin:keySpec="&#x043D;" />
<!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
<Key
- latin:keyLabel="&#x043C;" />
+ latin:keySpec="&#x043C;" />
<Key
- latin:keyLabel="!text/keylabel_for_south_slavic_row3_8" />
+ latin:keySpec="!text/keyspec_south_slavic_row3_8" />
<!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
<Key
- latin:keyLabel="&#x0436;" />
+ latin:keySpec="&#x0436;" />
</merge>
diff --git a/java/res/xml/rowkeys_spanish2.xml b/java/res/xml/rowkeys_spanish2.xml
index 335dff33c..5c7f67cdd 100644
--- a/java/res/xml/rowkeys_spanish2.xml
+++ b/java/res/xml/rowkeys_spanish2.xml
@@ -25,5 +25,5 @@
latin:keyboardLayout="@xml/rowkeys_qwerty2" />
<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
<Key
- latin:keyLabel="!text/keylabel_for_spanish_row2_10" />
+ latin:keySpec="!text/keyspec_spanish_row2_10" />
</merge>
diff --git a/java/res/xml/rowkeys_swiss1.xml b/java/res/xml/rowkeys_swiss1.xml
new file mode 100644
index 000000000..2b82c81bd
--- /dev/null
+++ b/java/res/xml/rowkeys_swiss1.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/rowkeys_qwertz1" />
+ <Key
+ latin:keySpec="!text/keyspec_swiss_row1_11"
+ latin:moreKeys="!text/morekeys_swiss_row1_11" />
+</merge>
diff --git a/java/res/xml/key_azerty3_right.xml b/java/res/xml/rowkeys_swiss2.xml
index 65789ea69..770911179 100644
--- a/java/res/xml/key_azerty3_right.xml
+++ b/java/res/xml/rowkeys_swiss2.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2012, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -21,17 +21,12 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
- >
- <Key
- latin:keyLabel="\?" />
- </case>
- <default>
- <Key
- latin:keyLabel="\'"
- latin:moreKeys="!text/more_keys_for_single_quote" />
- </default>
- </switch>
+ <include
+ latin:keyboardLayout="@xml/rowkeys_qwerty2" />
+ <Key
+ latin:keySpec="!text/keyspec_swiss_row2_10"
+ latin:moreKeys="!text/morekeys_swiss_row2_10" />
+ <Key
+ latin:keySpec="!text/keyspec_swiss_row2_11"
+ latin:moreKeys="!text/morekeys_swiss_row2_11" />
</merge>
diff --git a/java/res/xml/rowkeys_symbols1.xml b/java/res/xml/rowkeys_symbols1.xml
index 6e2f92dd9..daf9087b2 100644
--- a/java/res/xml/rowkeys_symbols1.xml
+++ b/java/res/xml/rowkeys_symbols1.xml
@@ -22,43 +22,43 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="!text/keylabel_for_symbols_1"
- latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_1"
- latin:moreKeys="!text/more_keys_for_symbols_1" />
+ latin:keySpec="!text/keyspec_symbols_1"
+ latin:additionalMoreKeys="!text/additional_morekeys_symbols_1"
+ latin:moreKeys="!text/morekeys_symbols_1" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_2"
- latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_2"
- latin:moreKeys="!text/more_keys_for_symbols_2" />
+ latin:keySpec="!text/keyspec_symbols_2"
+ latin:additionalMoreKeys="!text/additional_morekeys_symbols_2"
+ latin:moreKeys="!text/morekeys_symbols_2" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_3"
- latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_3"
- latin:moreKeys="!text/more_keys_for_symbols_3" />
+ latin:keySpec="!text/keyspec_symbols_3"
+ latin:additionalMoreKeys="!text/additional_morekeys_symbols_3"
+ latin:moreKeys="!text/morekeys_symbols_3" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_4"
- latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_4"
- latin:moreKeys="!text/more_keys_for_symbols_4" />
+ latin:keySpec="!text/keyspec_symbols_4"
+ latin:additionalMoreKeys="!text/additional_morekeys_symbols_4"
+ latin:moreKeys="!text/morekeys_symbols_4" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_5"
- latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_5"
- latin:moreKeys="!text/more_keys_for_symbols_5" />
+ latin:keySpec="!text/keyspec_symbols_5"
+ latin:additionalMoreKeys="!text/additional_morekeys_symbols_5"
+ latin:moreKeys="!text/morekeys_symbols_5" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_6"
- latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_6"
- latin:moreKeys="!text/more_keys_for_symbols_6" />
+ latin:keySpec="!text/keyspec_symbols_6"
+ latin:additionalMoreKeys="!text/additional_morekeys_symbols_6"
+ latin:moreKeys="!text/morekeys_symbols_6" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_7"
- latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_7"
- latin:moreKeys="!text/more_keys_for_symbols_7" />
+ latin:keySpec="!text/keyspec_symbols_7"
+ latin:additionalMoreKeys="!text/additional_morekeys_symbols_7"
+ latin:moreKeys="!text/morekeys_symbols_7" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_8"
- latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_8"
- latin:moreKeys="!text/more_keys_for_symbols_8" />
+ latin:keySpec="!text/keyspec_symbols_8"
+ latin:additionalMoreKeys="!text/additional_morekeys_symbols_8"
+ latin:moreKeys="!text/morekeys_symbols_8" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_9"
- latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_9"
- latin:moreKeys="!text/more_keys_for_symbols_9" />
+ latin:keySpec="!text/keyspec_symbols_9"
+ latin:additionalMoreKeys="!text/additional_morekeys_symbols_9"
+ latin:moreKeys="!text/morekeys_symbols_9" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_0"
- latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_0"
- latin:moreKeys="!text/more_keys_for_symbols_0" />
+ latin:keySpec="!text/keyspec_symbols_0"
+ latin:additionalMoreKeys="!text/additional_morekeys_symbols_0"
+ latin:moreKeys="!text/morekeys_symbols_0" />
</merge>
diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml
index 76cbf6259..811915825 100644
--- a/java/res/xml/rowkeys_symbols2.xml
+++ b/java/res/xml/rowkeys_symbols2.xml
@@ -28,37 +28,37 @@
<!-- U+066C: "٬" ARABIC THOUSANDS SEPARATOR
U+066B: "٫" ARABIC DECIMAL SEPARATOR -->
<Key
- latin:keyLabel="&#x066C;"
+ latin:keySpec="&#x066C;"
latin:keyHintLabel="\@"
latin:moreKeys="\@" />
<Key
- latin:keyLabel="&#x066B;"
+ latin:keySpec="&#x066B;"
latin:keyHintLabel="\#"
latin:moreKeys="\#" />
</case>
<default>
<Key
- latin:keyLabel="\@" />
+ latin:keySpec="\@" />
<Key
- latin:keyLabel="\#" />
+ latin:keySpec="\#" />
</default>
</switch>
<Key
latin:keyStyle="currencyKeyStyle" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_percent"
- latin:moreKeys="!text/more_keys_for_symbols_percent" />
+ latin:keySpec="!text/keyspec_symbols_percent"
+ latin:moreKeys="!text/morekeys_symbols_percent" />
<Key
- latin:keyLabel="&amp;" />
+ latin:keySpec="&amp;" />
<!-- U+2013: "–" EN DASH
U+2014: "—" EM DASH
U+00B7: "·" MIDDLE DOT -->
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />
<Key
- latin:keyLabel="+"
- latin:moreKeys="!text/more_keys_for_plus" />
+ latin:keySpec="+"
+ latin:moreKeys="!text/morekeys_plus" />
<include
latin:keyboardLayout="@xml/keys_parentheses" />
</merge>
diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml
index 074078cb6..8093081f8 100644
--- a/java/res/xml/rowkeys_symbols3.xml
+++ b/java/res/xml/rowkeys_symbols3.xml
@@ -22,41 +22,37 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="*"
- latin:moreKeys="!text/more_keys_for_star" />
+ latin:keySpec="*"
+ latin:moreKeys="!text/morekeys_star" />
<switch>
<case
latin:languageCode="fa"
>
- <!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
- U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
- latin:keyLabel="&#x00AB;"
- latin:code="0x00BB"
- latin:moreKeys="!text/more_keys_for_double_quote" />
+ latin:keySpec="!text/keyspec_left_double_angle_quote"
+ latin:moreKeys="!text/morekeys_double_quote" />
<Key
- latin:keyLabel="&#x00BB;"
- latin:code="0x00AB"
- latin:moreKeys="!text/more_keys_for_single_quote" />
+ latin:keySpec="!text/keyspec_right_double_angle_quote"
+ latin:moreKeys="!text/morekeys_single_quote" />
</case>
<default>
<Key
- latin:keyLabel="&quot;"
- latin:moreKeys="!text/more_keys_for_double_quote" />
+ latin:keySpec="&quot;"
+ latin:moreKeys="!text/morekeys_double_quote" />
<Key
- latin:keyLabel="\'"
- latin:moreKeys="!text/more_keys_for_single_quote" />
+ latin:keySpec="\'"
+ latin:moreKeys="!text/morekeys_single_quote" />
</default>
</switch>
<Key
- latin:keyLabel=":" />
+ latin:keySpec=":" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_semicolon"
- latin:moreKeys="!text/more_keys_for_symbols_semicolon" />
+ latin:keySpec="!text/keyspec_symbols_semicolon"
+ latin:moreKeys="!text/morekeys_symbols_semicolon" />
<Key
- latin:keyLabel="!"
- latin:moreKeys="!text/more_keys_for_symbols_exclamation" />
+ latin:keySpec="!"
+ latin:moreKeys="!text/morekeys_exclamation" />
<Key
- latin:keyLabel="!text/keylabel_for_symbols_question"
- latin:moreKeys="!text/more_keys_for_symbols_question" />
+ latin:keySpec="!text/keyspec_symbols_question"
+ latin:moreKeys="!text/morekeys_question" />
</merge>
diff --git a/java/res/xml/rowkeys_symbols_shift1.xml b/java/res/xml/rowkeys_symbols_shift1.xml
index 6013493e5..f232a7de2 100644
--- a/java/res/xml/rowkeys_symbols_shift1.xml
+++ b/java/res/xml/rowkeys_symbols_shift1.xml
@@ -22,35 +22,35 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="~" />
+ latin:keySpec="~" />
<Key
- latin:keyLabel="`" />
+ latin:keySpec="`" />
<Key
- latin:keyLabel="|" />
+ latin:keySpec="|" />
<!-- U+2022: "•" BULLET -->
<Key
- latin:keyLabel="&#x2022;"
- latin:moreKeys="!text/more_keys_for_bullet" />
+ latin:keySpec="&#x2022;"
+ latin:moreKeys="!text/morekeys_bullet" />
<!-- U+221A: "√" SQUARE ROOT -->
<Key
- latin:keyLabel="&#x221A;" />
- <!-- U+03A0: "Π" GREEK CAPITAL LETTER PI
- U+03C0: "π" GREEK SMALL LETTER PI -->
+ latin:keySpec="&#x221A;" />
+ <!-- U+03C0: "π" GREEK SMALL LETTER PI
+ U+03A0: "Π" GREEK CAPITAL LETTER PI -->
<Key
- latin:keyLabel="&#x03A0;"
- latin:moreKeys="&#x03C0;" />
+ latin:keySpec="&#x03C0;"
+ latin:moreKeys="&#x03A0;" />
<!-- U+00F7: "÷" DIVISION SIGN -->
<Key
- latin:keyLabel="&#x00F7;" />
+ latin:keySpec="&#x00F7;" />
<!-- U+00D7: "×" MULTIPLICATION SIGN -->
<Key
- latin:keyLabel="&#x00D7;" />
+ latin:keySpec="&#x00D7;" />
<!-- U+00B6: "¶" PILCROW SIGN
U+00A7: "§" SECTION SIGN -->
<Key
- latin:keyLabel="&#x00B6;"
+ latin:keySpec="&#x00B6;"
latin:moreKeys="&#x00A7;" />
<!-- U+2206: "∆" INCREMENT -->
<Key
- latin:keyLabel="&#x2206;" />
+ latin:keySpec="&#x2206;" />
</merge>
diff --git a/java/res/xml/rowkeys_symbols_shift2.xml b/java/res/xml/rowkeys_symbols_shift2.xml
index 36f92143f..39a58030b 100644
--- a/java/res/xml/rowkeys_symbols_shift2.xml
+++ b/java/res/xml/rowkeys_symbols_shift2.xml
@@ -34,19 +34,19 @@
U+2190: "←" LEFTWARDS ARROW
U+2192: "→" RIGHTWARDS ARROW -->
<Key
- latin:keyLabel="^"
+ latin:keySpec="^"
latin:moreKeys="&#x2191;,&#x2193;,&#x2190;,&#x2192;" />
<!-- U+00B0: "°" DEGREE SIGN
U+2032: "′" PRIME
U+2033: "″" DOUBLE PRIME -->
<Key
- latin:keyLabel="&#x00B0;"
+ latin:keySpec="&#x00B0;"
latin:moreKeys="&#x2032;,&#x2033;" />
<!-- U+2260: "≠" NOT EQUAL TO
U+2248: "≈" ALMOST EQUAL TO
U+221E: "∞" INFINITY -->
<Key
- latin:keyLabel="="
+ latin:keySpec="="
latin:moreKeys="&#x2260;,&#x2248;,&#x221E;" />
<include
latin:keyboardLayout="@xml/keys_curly_brackets" />
diff --git a/java/res/xml/rowkeys_symbols_shift3.xml b/java/res/xml/rowkeys_symbols_shift3.xml
index 5fe1c7450..92ff97bb0 100644
--- a/java/res/xml/rowkeys_symbols_shift3.xml
+++ b/java/res/xml/rowkeys_symbols_shift3.xml
@@ -22,19 +22,19 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="\\" />
+ latin:keySpec="\\" />
<!-- U+00A9: "©" COPYRIGHT SIGN -->
<Key
- latin:keyLabel="&#x00A9;" />
+ latin:keySpec="&#x00A9;" />
<!-- U+00AE: "®" REGISTERED SIGN -->
<Key
- latin:keyLabel="&#x00AE;" />
+ latin:keySpec="&#x00AE;" />
<!-- U+2122: "™" TRADE MARK SIGN -->
<Key
- latin:keyLabel="&#x2122;" />
+ latin:keySpec="&#x2122;" />
<!-- U+2105: "℅" CARE OF -->
<Key
- latin:keyLabel="&#x2105;" />
+ latin:keySpec="&#x2105;" />
<include
latin:keyboardLayout="@xml/keys_square_brackets" />
</merge>
diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml
index cd536656f..e42bda391 100644
--- a/java/res/xml/rowkeys_thai1.xml
+++ b/java/res/xml/rowkeys_thai1.xml
@@ -26,77 +26,76 @@
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
- latin:keyLabel="+" />
+ latin:keySpec="+" />
<!-- U+0E51: "๑" THAI DIGIT ONE -->
<Key
- latin:keyLabel="&#x0E51;"
+ latin:keySpec="&#x0E51;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E52: "๒" THAI DIGIT TWO -->
<Key
- latin:keyLabel="&#x0E52;"
+ latin:keySpec="&#x0E52;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E53: "๓" THAI DIGIT THREE -->
<Key
- latin:keyLabel="&#x0E53;"
+ latin:keySpec="&#x0E53;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E54: "๔" THAI DIGIT FOUR -->
<Key
- latin:keyLabel="&#x0E54;"
+ latin:keySpec="&#x0E54;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0020: " " SPACE
U+0E39: " ู" THAI CHARACTER SARA UU -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E39;"
- latin:code="0x0E39"
+ latin:keySpec="&#x20;&#x0E39;|&#x0E39;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
<Key
- latin:keyLabel="&#x0E3F;"
+ latin:keySpec="&#x0E3F;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E55: "๕" THAI DIGIT FIVE -->
<Key
- latin:keyLabel="&#x0E55;"
+ latin:keySpec="&#x0E55;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E56: "๖" THAI DIGIT SIX -->
<Key
- latin:keyLabel="&#x0E56;"
+ latin:keySpec="&#x0E56;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E57: "๗" THAI DIGIT SEVEN -->
<Key
- latin:keyLabel="&#x0E57;"
+ latin:keySpec="&#x0E57;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E58: "๘" THAI DIGIT EIGHT -->
<Key
- latin:keyLabel="&#x0E58;"
+ latin:keySpec="&#x0E58;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E59: "๙" THAI DIGIT NINE -->
<Key
- latin:keyLabel="&#x0E59;"
+ latin:keySpec="&#x0E59;"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
<Key
- latin:keyLabel="&#x0E45;"
+ latin:keySpec="&#x0E45;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E51: "๑" THAI DIGIT ONE -->
<Key
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="&#x0E51;"
- latin:keyLabel="/" />
+ latin:keySpec="/" />
<!-- U+0E52: "๒" THAI DIGIT TWO -->
<Key
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="&#x0E52;"
- latin:keyLabel="_" />
+ latin:keySpec="_" />
<!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO
U+0E53: "๓" THAI DIGIT THREE -->
<Key
- latin:keyLabel="&#x0E20;"
+ latin:keySpec="&#x0E20;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys="&#x0E53;"
@@ -104,7 +103,7 @@
<!-- U+0E16: "ถ" THAI CHARACTER THO THUNG
U+0E54: "๔" THAI DIGIT FOUR -->
<Key
- latin:keyLabel="&#x0E16;"
+ latin:keySpec="&#x0E16;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
latin:moreKeys="&#x0E54;"
@@ -114,21 +113,19 @@
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E38;"
- latin:code="0x0E38"
+ latin:keySpec="&#x20;&#x0E38;|&#x0E38;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E36: " ึ" THAI CHARACTER SARA UE -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E36;"
- latin:code="0x0E36"
+ latin:keySpec="&#x20;&#x0E36;|&#x0E36;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI
U+0E55: "๕" THAI DIGIT FIVE -->
<Key
- latin:keyLabel="&#x0E04;"
+ latin:keySpec="&#x0E04;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
latin:moreKeys="&#x0E55;"
@@ -136,7 +133,7 @@
<!-- U+0E15: "ต" THAI CHARACTER TO TAO
U+0E56: "๖" THAI DIGIT SIX -->
<Key
- latin:keyLabel="&#x0E15;"
+ latin:keySpec="&#x0E15;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
latin:moreKeys="&#x0E56;"
@@ -144,7 +141,7 @@
<!-- U+0E08: "จ" THAI CHARACTER CHO CHAN
U+0E57: "๗" THAI DIGIT SEVEN -->
<Key
- latin:keyLabel="&#x0E08;"
+ latin:keySpec="&#x0E08;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
latin:moreKeys="&#x0E57;"
@@ -152,7 +149,7 @@
<!-- U+0E02: "ข" THAI CHARACTER KHO KHAI
U+0E58: "๘" THAI DIGIT EIGHT -->
<Key
- latin:keyLabel="&#x0E02;"
+ latin:keySpec="&#x0E02;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:moreKeys="&#x0E58;"
@@ -160,7 +157,7 @@
<!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG
U+0E59: "๙" THAI DIGIT NINE -->
<Key
- latin:keyLabel="&#x0E0A;"
+ latin:keySpec="&#x0E0A;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
latin:moreKeys="&#x0E59;"
diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml
index 4bcbbbf8d..7ab036a05 100644
--- a/java/res/xml/rowkeys_thai2.xml
+++ b/java/res/xml/rowkeys_thai2.xml
@@ -27,117 +27,113 @@
>
<!-- U+0E50: "๐" THAI DIGIT ZERO -->
<Key
- latin:keyLabel="&#x0E50;"
+ latin:keySpec="&#x0E50;"
latin:keyLabelFlags="fontNormal" />
<Key
- latin:keyLabel="&quot;" />
+ latin:keySpec="&quot;" />
<!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->
<Key
- latin:keyLabel="&#x0E0E;"
+ latin:keySpec="&#x0E0E;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->
<Key
- latin:keyLabel="&#x0E11;"
+ latin:keySpec="&#x0E11;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->
<Key
- latin:keyLabel="&#x0E18;"
+ latin:keySpec="&#x0E18;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0020: " " SPACE
U+0E4D: " ํ" THAI CHARACTER THANTHAKHAT -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E4D;"
- latin:code="0x0E4D"
+ latin:keySpec="&#x20;&#x0E4D;|&#x0E4D;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E4A: " ๊" THAI CHARACTER MAI TRI -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E4A;"
- latin:code="0x0E4A"
+ latin:keySpec="&#x20;&#x0E4A;|&#x0E4A;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->
<Key
- latin:keyLabel="&#x0E13;"
+ latin:keySpec="&#x0E13;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
<Key
- latin:keyLabel="&#x0E2F;"
+ latin:keySpec="&#x0E2F;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E0D: "ญ" THAI CHARACTER YO YING -->
<Key
- latin:keyLabel="&#x0E0D;"
+ latin:keySpec="&#x0E0D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E10: "ฐ" THAI CHARACTER THO THAN -->
<Key
- latin:keyLabel="&#x0E10;"
+ latin:keySpec="&#x0E10;"
latin:keyLabelFlags="fontNormal" />
<Key
- latin:keyLabel="," />
+ latin:keySpec="," />
</case>
<default>
<!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK
U+0E50: "๐" THAI DIGIT ZERO -->
<Key
- latin:keyLabel="&#x0E46;"
+ latin:keySpec="&#x0E46;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0"
latin:moreKeys="&#x0E50;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI -->
<Key
- latin:keyLabel="&#x0E44;"
+ latin:keySpec="&#x0E44;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E33: "ำ" THAI CHARACTER SARA AM -->
<Key
- latin:keyLabel="&#x0E33;"
+ latin:keySpec="&#x0E33;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
<Key
- latin:keyLabel="&#x0E1E;"
+ latin:keySpec="&#x0E1E;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E30: "ะ" THAI CHARACTER SARA A -->
<Key
- latin:keyLabel="&#x0E30;"
+ latin:keySpec="&#x0E30;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0020: " " SPACE
U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E31;"
- latin:code="0x0E31"
+ latin:keySpec="&#x20;&#x0E31;|&#x0E31;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E35: " ี" HAI CHARACTER SARA II -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E35;"
- latin:code="0x0E35"
+ latin:keySpec="&#x20;&#x0E35;|&#x0E35;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E23: "ร" THAI CHARACTER RO RUA -->
<Key
- latin:keyLabel="&#x0E23;"
+ latin:keySpec="&#x0E23;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E19: "น" THAI CHARACTER NO NU -->
<Key
- latin:keyLabel="&#x0E19;"
+ latin:keySpec="&#x0E19;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E22: "ย" THAI CHARACTER YO YAK -->
<Key
- latin:keyLabel="&#x0E22;"
+ latin:keySpec="&#x0E22;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->
<Key
- latin:keyLabel="&#x0E1A;"
+ latin:keySpec="&#x0E1A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E25: "ล" THAI CHARACTER LO LING -->
<Key
- latin:keyLabel="&#x0E25;"
+ latin:keySpec="&#x0E25;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml
index 7b6e6372e..098d8a780 100644
--- a/java/res/xml/rowkeys_thai3.xml
+++ b/java/res/xml/rowkeys_thai3.xml
@@ -27,107 +27,103 @@
>
<!-- U+0E24: "ฤ" THAI CHARACTER RU -->
<Key
- latin:keyLabel="&#x0E24;"
+ latin:keySpec="&#x0E24;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->
<Key
- latin:keyLabel="&#x0E06;"
+ latin:keySpec="&#x0E06;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK -->
<Key
- latin:keyLabel="&#x0E0F;"
+ latin:keySpec="&#x0E0F;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E42: "โ" THAI CHARACTER SARA O -->
<Key
- latin:keyLabel="&#x0E42;"
+ latin:keySpec="&#x0E42;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
<Key
- latin:keyLabel="&#x0E0C;"
+ latin:keySpec="&#x0E0C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0020: " " SPACE
U+0E47: " ็" THAI CHARACTER MAITAIKHU -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E47;"
- latin:code="0x0E47"
+ latin:keySpec="&#x20;&#x0E47;|&#x0E47;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E4B;"
- latin:code="0x0E4B"
+ latin:keySpec="&#x20;&#x0E4B;|&#x0E4B;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E29: "ษ" THAI CHARACTER SO RUSI -->
<Key
- latin:keyLabel="&#x0E29;"
+ latin:keySpec="&#x0E29;"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
+ <!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
<Key
- latin:keyLabel="&#x0E28;"
+ latin:keySpec="&#x0E28;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E0B: "ซ" THAI CHARACTER SO SO -->
<Key
- latin:keyLabel="&#x0E0B;"
+ latin:keySpec="&#x0E0B;"
latin:keyLabelFlags="fontNormal" />
<Key
- latin:keyLabel="." />
+ latin:keySpec="." />
</case>
<default>
<!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN -->
<Key
- latin:keyLabel="&#x0E1F;"
+ latin:keySpec="&#x0E1F;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->
<Key
- latin:keyLabel="&#x0E2B;"
+ latin:keySpec="&#x0E2B;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E01: "ก" THAI CHARACTER KO KAI -->
<Key
- latin:keyLabel="&#x0E01;"
+ latin:keySpec="&#x0E01;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E14: "ด" THAI CHARACTER DO DEK -->
<Key
- latin:keyLabel="&#x0E14;"
+ latin:keySpec="&#x0E14;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E40: "เ" THAI CHARACTER SARA E -->
<Key
- latin:keyLabel="&#x0E40;"
+ latin:keySpec="&#x0E40;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0020: " " SPACE
U+0E49: " ้" THAI CHARACTER MAI THO -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E49;"
- latin:code="0x0E49"
+ latin:keySpec="&#x20;&#x0E49;|&#x0E49;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E48: " ่" THAI CHARACTER MAI EK -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E48;"
- latin:code="0x0E48"
+ latin:keySpec="&#x20;&#x0E48;|&#x0E48;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E32: "า" THAI CHARACTER SARA AA -->
<Key
- latin:keyLabel="&#x0E32;"
+ latin:keySpec="&#x0E32;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E2A: "ส" THAI CHARACTER SO SUA -->
<Key
- latin:keyLabel="&#x0E2A;"
+ latin:keySpec="&#x0E2A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E27: "ว" THAI CHARACTER WO WAEN -->
<Key
- latin:keyLabel="&#x0E27;"
+ latin:keySpec="&#x0E27;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E07: "ง" THAI CHARACTER NGO NGU -->
<Key
- latin:keyLabel="&#x0E07;"
+ latin:keySpec="&#x0E07;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_thai4.xml b/java/res/xml/rowkeys_thai4.xml
index 8a784242c..332d09d7e 100644
--- a/java/res/xml/rowkeys_thai4.xml
+++ b/java/res/xml/rowkeys_thai4.xml
@@ -26,96 +26,92 @@
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
- latin:keyLabel="(" />
+ latin:keySpec="(" />
<Key
- latin:keyLabel=")" />
+ latin:keySpec=")" />
<!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING -->
<Key
- latin:keyLabel="&#x0E09;"
+ latin:keySpec="&#x0E09;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK -->
<Key
- latin:keyLabel="&#x0E2E;"
+ latin:keySpec="&#x0E2E;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0020: " " SPACE
U+0E3A: " ฺ" THAI CHARACTER PHINTHU -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E3A;"
- latin:code="0x0E3A"
+ latin:keySpec="&#x20;&#x0E3A;|&#x0E3A;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E4C: " ์" THAI CHARACTER THANTHAKHAT -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E4C;"
- latin:code="0x0E4C"
+ latin:keySpec="&#x20;&#x0E4C;|&#x0E4C;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<Key
- latin:keyLabel="\?" />
+ latin:keySpec="\?" />
<!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO -->
<Key
- latin:keyLabel="&#x0E12;"
+ latin:keySpec="&#x0E12;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA -->
<Key
- latin:keyLabel="&#x0E2C;"
+ latin:keySpec="&#x0E2C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E26: "ฦ" THAI CHARACTER LU -->
<Key
- latin:keyLabel="&#x0E26;"
+ latin:keySpec="&#x0E26;"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG -->
<Key
- latin:keyLabel="&#x0E1C;"
+ latin:keySpec="&#x0E1C;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E1B: "ป" THAI CHARACTER PO PLA -->
<Key
- latin:keyLabel="&#x0E1B;"
+ latin:keySpec="&#x0E1B;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E41: "แ" THAI CHARACTER SARA AE -->
<Key
- latin:keyLabel="&#x0E41;"
+ latin:keySpec="&#x0E41;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E2D: "อ" THAI CHARACTER O ANG -->
<Key
- latin:keyLabel="&#x0E2D;"
+ latin:keySpec="&#x0E2D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0020: " " SPACE
U+0E34: " ิ" THAI CHARACTER SARA I -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E34;"
- latin:code="0x0E34"
+ latin:keySpec="&#x20;&#x0E34;|&#x0E34;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E37: " ื" THAI CHARACTER SARA UEE -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel="&#x20;&#x0E37;"
- latin:code="0x0E37"
+ latin:keySpec="&#x20;&#x0E37;|&#x0E37;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E17: "ท" THAI CHARACTER THO THAHAN -->
<Key
- latin:keyLabel="&#x0E17;"
+ latin:keySpec="&#x0E17;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E21: "ม" THAI CHARACTER MO MA -->
<Key
- latin:keyLabel="&#x0E21;"
+ latin:keySpec="&#x0E21;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN -->
<Key
- latin:keyLabel="&#x0E43;"
+ latin:keySpec="&#x0E43;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E1D: "ฝ" THAI CHARACTER FO FA -->
<Key
- latin:keyLabel="&#x0E1D;"
+ latin:keySpec="&#x0E1D;"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rows_colemak.xml b/java/res/xml/rows_colemak.xml
index d74c2c9ec..ec553c244 100644
--- a/java/res/xml/rows_colemak.xml
+++ b/java/res/xml/rows_colemak.xml
@@ -28,8 +28,6 @@
>
<include
latin:keyboardLayout="@xml/rowkeys_colemak1" />
- <include
- latin:keyboardLayout="@xml/key_colemak_colon" />
</Row>
<Row
latin:keyWidth="10%p"
diff --git a/java/res/xml/rows_greek.xml b/java/res/xml/rows_greek.xml
index ca6d24005..e00b927a0 100644
--- a/java/res/xml/rows_greek.xml
+++ b/java/res/xml/rows_greek.xml
@@ -27,8 +27,6 @@
latin:keyWidth="10%p"
>
<include
- latin:keyboardLayout="@xml/key_greek_semicolon" />
- <include
latin:keyboardLayout="@xml/rowkeys_greek1" />
</Row>
<Row
diff --git a/java/res/xml/rows_hindi_compact.xml b/java/res/xml/rows_hindi_compact.xml
new file mode 100644
index 000000000..a60cf2b02
--- /dev/null
+++ b/java/res/xml/rows_hindi_compact.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
+ </Row>
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
+ </Row>
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml/rows_myanmar.xml b/java/res/xml/rows_myanmar.xml
new file mode 100644
index 000000000..5de47f7b8
--- /dev/null
+++ b/java/res/xml/rows_myanmar.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="10.0%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_myanmar1" />
+ </Row>
+ <Row
+ latin:keyWidth="10.0%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_myanmar2" />
+ </Row>
+ <Row
+ latin:keyWidth="10.0%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_myanmar3" />
+ </Row>
+ <Row
+ latin:keyWidth="10.0%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle" />
+ <include
+ latin:keyboardLayout="@xml/rowkeys_myanmar4" />
+ <Key
+ latin:keyStyle="deleteKeyStyle" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml
index 291018a14..859a1624a 100644
--- a/java/res/xml/rows_number_normal.xml
+++ b/java/res/xml/rows_number_normal.xml
@@ -23,16 +23,16 @@
>
<Row>
<Key
- latin:keyLabel="1"
+ latin:keySpec="1"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="2"
+ latin:keySpec="2"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="3"
+ latin:keySpec="3"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numFunctionalKeyStyle"
@@ -40,20 +40,20 @@
</Row>
<Row>
<Key
- latin:keyLabel="4"
+ latin:keySpec="4"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="5"
+ latin:keySpec="5"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="6"
+ latin:keySpec="6"
latin:keyStyle="numKeyStyle" />
<switch>
<case
latin:mode="date"
>
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight" />
</case>
@@ -61,15 +61,15 @@
latin:mode="time|datetime"
>
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_am_pm"
+ latin:moreKeys="!text/morekeys_am_pm"
latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight" />
</case>
<default>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight" />
</default>
@@ -77,13 +77,13 @@
</Row>
<Row>
<Key
- latin:keyLabel="7"
+ latin:keySpec="7"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="8"
+ latin:keySpec="8"
latin:keyStyle="numKeyStyle"/>
<Key
- latin:keyLabel="9"
+ latin:keySpec="9"
latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -93,36 +93,34 @@
<Key
latin:keyStyle="numSpaceKeyStyle" />
<Key
- latin:keyLabel="0"
+ latin:keySpec="0"
latin:keyStyle="numKeyStyle" />
<switch>
<case
latin:mode="date"
>
<Key
- latin:keyLabel="/"
+ latin:keySpec="/"
latin:keyStyle="numKeyStyle" />
</case>
<case
latin:mode="time"
>
<Key
- latin:keyLabel=":"
+ latin:keySpec=":"
latin:keyStyle="numKeyStyle" />
</case>
<case
latin:mode="datetime"
>
- <!-- U+002F: "/" SOLIDUS -->
<Key
- latin:code="0x002F"
- latin:keyLabel="/ :"
+ latin:keySpec="/ :|/"
latin:moreKeys="!noPanelAutoMoreKey!,:"
latin:keyStyle="numKeyStyle" />
</case>
<default>
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyStyle="numKeyStyle" />
</default>
</switch>
diff --git a/java/res/xml/rows_pcqwerty.xml b/java/res/xml/rows_pcqwerty.xml
index 884698963..a5ed74518 100644
--- a/java/res/xml/rows_pcqwerty.xml
+++ b/java/res/xml/rows_pcqwerty.xml
@@ -26,19 +26,8 @@
<Row
latin:keyWidth="7.692%p"
>
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
- >
- <include
- latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
- </case>
- <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
- <default>
- <include
- latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
- </default>
- </switch>
+ <include
+ latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
</Row>
<Row
latin:keyWidth="7.692%p"
diff --git a/java/res/xml/rows_phone.xml b/java/res/xml/rows_phone.xml
index d8dcfbd62..03e45419a 100644
--- a/java/res/xml/rows_phone.xml
+++ b/java/res/xml/rows_phone.xml
@@ -33,7 +33,7 @@
<Key
latin:keyStyle="num3KeyStyle" />
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numFunctionalKeyStyle"
@@ -47,7 +47,7 @@
<Key
latin:keyStyle="num6KeyStyle" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight" />
</Row>
@@ -68,8 +68,7 @@
<!-- U+0030: "0" DIGIT ZERO -->
<Key
latin:keyStyle="num0KeyStyle"
- latin:code="0x0030"
- latin:keyLabel="0 +"
+ latin:keySpec="0 +|0"
latin:moreKeys="!noPanelAutoMoreKey!,+" />
<Key
latin:keyStyle="numSpaceKeyStyle" />
diff --git a/java/res/xml/rows_phone_symbols.xml b/java/res/xml/rows_phone_symbols.xml
index 8c10a2d71..983bfb5c8 100644
--- a/java/res/xml/rows_phone_symbols.xml
+++ b/java/res/xml/rows_phone_symbols.xml
@@ -27,16 +27,16 @@
latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<Key
- latin:keyLabel="("
+ latin:keySpec="("
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="/"
+ latin:keySpec="/"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel=")"
+ latin:keySpec=")"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numFunctionalKeyStyle"
@@ -44,17 +44,17 @@
</Row>
<Row>
<Key
- latin:keyLabel="N"
+ latin:keySpec="N"
latin:keyStyle="numKeyBaseStyle" />
<!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
has changed. -->
<Key
latin:keyStyle="numPauseKeyStyle" />
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight" />
</Row>
@@ -65,7 +65,7 @@
<Key
latin:keyStyle="numWaitKeyStyle" />
<Key
- latin:keyLabel="\#"
+ latin:keySpec="\#"
latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -75,7 +75,7 @@
<Key
latin:keyStyle="numPhoneToNumericKeyStyle" />
<Key
- latin:keyLabel="+"
+ latin:keySpec="+"
latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="numSpaceKeyStyle" />
diff --git a/java/res/xml/rows_swiss.xml b/java/res/xml/rows_swiss.xml
new file mode 100644
index 000000000..03e412940
--- /dev/null
+++ b/java/res/xml/rows_swiss.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_swiss1" />
+ </Row>
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_swiss2" />
+ </Row>
+ <Row
+ latin:keyWidth="9.2%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="15%p"
+ latin:visualInsetsRight="1%p" />
+ <Spacer
+ latin:keyWidth="2.8%p" />
+ <include
+ latin:keyboardLayout="@xml/rowkeys_qwertz3" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-15%p"
+ latin:keyWidth="fillRight"
+ latin:visualInsetsLeft="1%p" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml
index d0606c63b..6fd876f4e 100644
--- a/java/res/xml/rows_symbols.xml
+++ b/java/res/xml/rows_symbols.xml
@@ -54,6 +54,7 @@
</Row>
<Row
latin:keyWidth="10%p"
+ latin:backgroundType="functional"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
index c4bdb9f38..64f6e6114 100644
--- a/java/res/xml/rows_symbols_shift.xml
+++ b/java/res/xml/rows_symbols_shift.xml
@@ -54,6 +54,7 @@
</Row>
<Row
latin:keyWidth="10%p"
+ latin:backgroundType="functional"
>
<Key
latin:keyStyle="toAlphaKeyStyle"