aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/anim/more_keys_keyboard_fadein.xml (renamed from java/res/anim/mini_keyboard_fadein.xml)2
-rw-r--r--java/res/anim/more_keys_keyboard_fadeout.xml (renamed from java/res/anim/mini_keyboard_fadeout.xml)2
-rw-r--r--java/res/layout/input_view.xml2
-rw-r--r--java/res/layout/more_keys_keyboard.xml (renamed from java/res/layout/mini_keyboard.xml)6
-rw-r--r--java/res/layout/more_suggestions.xml4
-rw-r--r--java/res/values-af/strings.xml53
-rw-r--r--java/res/values-am/strings.xml40
-rw-r--r--java/res/values-ar/donottranslate-more-keys.xml202
-rw-r--r--java/res/values-ar/donottranslate.xml27
-rw-r--r--java/res/values-ar/strings.xml40
-rw-r--r--java/res/values-be/donottranslate-more-keys.xml (renamed from java/res/values-fr-rCH/donottranslate-more-keys.xml)9
-rw-r--r--java/res/values-be/strings.xml40
-rw-r--r--java/res/values-bg/strings.xml49
-rw-r--r--java/res/values-ca/donottranslate-more-keys.xml60
-rw-r--r--java/res/values-ca/strings.xml40
-rw-r--r--java/res/values-cs/donottranslate-more-keys.xml79
-rw-r--r--java/res/values-cs/strings.xml49
-rw-r--r--java/res/values-da/donottranslate-more-keys.xml64
-rw-r--r--java/res/values-da/strings.xml40
-rw-r--r--java/res/values-de/donottranslate-more-keys.xml41
-rw-r--r--java/res/values-de/strings.xml40
-rw-r--r--java/res/values-el/strings.xml49
-rw-r--r--java/res/values-en-rGB/strings.xml40
-rw-r--r--java/res/values-en/additional-proximitychars.xml62
-rw-r--r--java/res/values-en/donottranslate-more-keys.xml8
-rw-r--r--java/res/values-en/whitelist.xml4
-rw-r--r--java/res/values-es-rUS/strings.xml50
-rw-r--r--java/res/values-es/donottranslate-more-keys.xml56
-rw-r--r--java/res/values-es/strings.xml40
-rw-r--r--java/res/values-et/donottranslate-more-keys.xml115
-rw-r--r--java/res/values-et/strings.xml40
-rw-r--r--java/res/values-fa/strings.xml40
-rw-r--r--java/res/values-fi/donottranslate-more-keys.xml44
-rw-r--r--java/res/values-fi/strings.xml42
-rw-r--r--java/res/values-fr/donottranslate-more-keys.xml57
-rw-r--r--java/res/values-fr/strings.xml40
-rw-r--r--java/res/values-hi/strings.xml40
-rw-r--r--java/res/values-hr/donottranslate-more-keys.xml22
-rw-r--r--java/res/values-hr/strings.xml46
-rw-r--r--java/res/values-hu/donottranslate-more-keys.xml48
-rw-r--r--java/res/values-hu/strings.xml40
-rw-r--r--java/res/values-in/strings.xml40
-rw-r--r--java/res/values-it/donottranslate-more-keys.xml46
-rw-r--r--java/res/values-it/strings.xml40
-rw-r--r--java/res/values-iw/donottranslate-more-keys.xml52
-rw-r--r--java/res/values-iw/donottranslate.xml25
-rw-r--r--java/res/values-iw/strings.xml40
-rw-r--r--java/res/values-ja/strings.xml49
-rw-r--r--java/res/values-ko/strings.xml49
-rw-r--r--java/res/values-ky/donottranslate-more-keys.xml27
-rw-r--r--java/res/values-land/dimens.xml5
-rw-r--r--java/res/values-lt/donottranslate-more-keys.xml93
-rw-r--r--java/res/values-lt/strings.xml40
-rw-r--r--java/res/values-lv/donottranslate-more-keys.xml97
-rw-r--r--java/res/values-lv/strings.xml40
-rw-r--r--java/res/values-ms/strings.xml49
-rw-r--r--java/res/values-nb/donottranslate-more-keys.xml47
-rw-r--r--java/res/values-nb/strings.xml40
-rw-r--r--java/res/values-nl/donottranslate-more-keys.xml48
-rw-r--r--java/res/values-nl/strings.xml40
-rw-r--r--java/res/values-pl/donottranslate-more-keys.xml52
-rw-r--r--java/res/values-pl/strings.xml42
-rw-r--r--java/res/values-pt-rPT/strings.xml40
-rw-r--r--java/res/values-pt/donottranslate-more-keys.xml50
-rw-r--r--java/res/values-pt/strings.xml40
-rw-r--r--java/res/values-rm/donottranslate-more-keys.xml9
-rw-r--r--java/res/values-rm/strings.xml79
-rw-r--r--java/res/values-ro/donottranslate-more-keys.xml28
-rw-r--r--java/res/values-ro/strings.xml40
-rw-r--r--java/res/values-ru/donottranslate-more-keys.xml5
-rw-r--r--java/res/values-ru/strings.xml48
-rw-r--r--java/res/values-sk/donottranslate-more-keys.xml100
-rw-r--r--java/res/values-sk/strings.xml49
-rw-r--r--java/res/values-sl/donottranslate-more-keys.xml30
-rw-r--r--java/res/values-sl/strings.xml40
-rw-r--r--java/res/values-sr/strings.xml40
-rw-r--r--java/res/values-sv/donottranslate-more-keys.xml41
-rw-r--r--java/res/values-sv/strings.xml40
-rw-r--r--java/res/values-sw/strings.xml40
-rw-r--r--java/res/values-sw600dp-land/dimens.xml1
-rw-r--r--java/res/values-sw600dp/config.xml12
-rw-r--r--java/res/values-sw600dp/dimens.xml7
-rw-r--r--java/res/values-sw768dp-land/dimens.xml1
-rw-r--r--java/res/values-sw768dp/config.xml12
-rw-r--r--java/res/values-sw768dp/dimens.xml7
-rw-r--r--java/res/values-th/strings.xml40
-rw-r--r--java/res/values-tl/strings.xml40
-rw-r--r--java/res/values-tr/donottranslate-more-keys.xml43
-rw-r--r--java/res/values-tr/strings.xml40
-rw-r--r--java/res/values-uk/donottranslate-more-keys.xml (renamed from java/res/values-fr-rCA/donottranslate-more-keys.xml)8
-rw-r--r--java/res/values-uk/strings.xml40
-rw-r--r--java/res/values-vi/donottranslate-more-keys.xml95
-rw-r--r--java/res/values-vi/strings.xml40
-rw-r--r--java/res/values-zh-rCN/strings.xml49
-rw-r--r--java/res/values-zh-rTW/strings.xml51
-rw-r--r--java/res/values-zu/strings.xml49
-rw-r--r--java/res/values/additional-proximitychars.xml (renamed from java/res/values-de-rZZ/donottranslate-more-keys.xml)6
-rw-r--r--java/res/values/attrs.xml168
-rw-r--r--java/res/values/config.xml57
-rw-r--r--java/res/values/dimens.xml13
-rw-r--r--java/res/values/donottranslate-more-keys.xml156
-rw-r--r--java/res/values/donottranslate.xml30
-rw-r--r--java/res/values/keyboard-icons-black.xml7
-rw-r--r--java/res/values/keyboard-icons-ics.xml9
-rw-r--r--java/res/values/keyboard-icons-white.xml8
-rw-r--r--java/res/values/keycodes.xml11
-rw-r--r--java/res/values/strings.xml81
-rw-r--r--java/res/values/styles.xml165
-rw-r--r--java/res/values/themes-basic-highcontrast.xml8
-rw-r--r--java/res/values/themes-basic.xml8
-rw-r--r--java/res/values/themes-gingerbread.xml8
-rw-r--r--java/res/values/themes-ics.xml8
-rw-r--r--java/res/values/themes-stone-bold.xml8
-rw-r--r--java/res/values/themes-stone.xml8
-rw-r--r--java/res/xml-ar/keyboard_set.xml42
-rw-r--r--java/res/xml-be/keyboard_set.xml42
-rw-r--r--java/res/xml-bg/keyboard_set.xml42
-rw-r--r--java/res/xml-cs/keyboard_set.xml42
-rw-r--r--java/res/xml-da/keyboard_set.xml42
-rw-r--r--java/res/xml-de-rZZ/keyboard_set.xml42
-rw-r--r--java/res/xml-de/kbd_qwerty.xml27
-rw-r--r--java/res/xml-de/keyboard_set.xml42
-rw-r--r--java/res/xml-es/kbd_qwerty.xml27
-rw-r--r--java/res/xml-es/keyboard_set.xml42
-rw-r--r--java/res/xml-et/keyboard_set.xml42
-rw-r--r--java/res/xml-fi/kbd_qwerty.xml27
-rw-r--r--java/res/xml-fi/keyboard_set.xml42
-rw-r--r--java/res/xml-fr-rCA/kbd_qwerty.xml27
-rw-r--r--java/res/xml-fr-rCA/keyboard_set.xml42
-rw-r--r--java/res/xml-fr-rCH/kbd_qwerty.xml27
-rw-r--r--java/res/xml-fr-rCH/keyboard_set.xml42
-rw-r--r--java/res/xml-fr/keyboard_set.xml42
-rw-r--r--java/res/xml-hr/kbd_qwerty.xml28
-rw-r--r--java/res/xml-hr/keyboard_set.xml42
-rw-r--r--java/res/xml-hu/keyboard_set.xml42
-rw-r--r--java/res/xml-iw/kbd_qwerty.xml28
-rw-r--r--java/res/xml-iw/kbd_symbols.xml27
-rw-r--r--java/res/xml-iw/kbd_symbols_shift.xml27
-rw-r--r--java/res/xml-iw/keyboard_set.xml42
-rw-r--r--java/res/xml-ky/keyboard_set.xml42
-rw-r--r--java/res/xml-land/kbd_number.xml2
-rw-r--r--java/res/xml-land/kbd_phone.xml2
-rw-r--r--java/res/xml-land/kbd_phone_symbols.xml (renamed from java/res/xml-land/kbd_phone_shift.xml)2
-rw-r--r--java/res/xml-nb/kbd_qwerty.xml27
-rw-r--r--java/res/xml-nb/keyboard_set.xml42
-rw-r--r--java/res/xml-pl/keyboard_set.xml42
-rw-r--r--java/res/xml-pt/kbd_qwerty.xml27
-rw-r--r--java/res/xml-pt/keyboard_set.xml42
-rw-r--r--java/res/xml-ro/keyboard_set.xml42
-rw-r--r--java/res/xml-ru/kbd_qwerty.xml27
-rw-r--r--java/res/xml-ru/keyboard_set.xml42
-rw-r--r--java/res/xml-sk/keyboard_set.xml42
-rw-r--r--java/res/xml-sl/keyboard_set.xml42
-rw-r--r--java/res/xml-sr/kbd_qwerty.xml27
-rw-r--r--java/res/xml-sr/keyboard_set.xml42
-rw-r--r--java/res/xml-sv/kbd_qwerty.xml27
-rw-r--r--java/res/xml-sv/keyboard_set.xml42
-rw-r--r--java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml (renamed from java/res/xml-sw600dp-land/kbd_mini_keyboard_template.xml)2
-rw-r--r--java/res/xml-sw600dp-land/kbd_number.xml (renamed from java/res/xml-ar/kbd_symbols.xml)5
-rw-r--r--java/res/xml-sw600dp-land/kbd_phone.xml (renamed from java/res/xml-ar/kbd_qwerty.xml)6
-rw-r--r--java/res/xml-sw600dp-land/kbd_phone_symbols.xml29
-rw-r--r--java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml (renamed from java/res/xml-sw600dp/kbd_mini_keyboard_template.xml)2
-rw-r--r--java/res/xml-sw600dp/kbd_number.xml186
-rw-r--r--java/res/xml-sw600dp/kbd_phone.xml100
-rw-r--r--java/res/xml-sw600dp/kbd_phone_symbols.xml28
-rw-r--r--java/res/xml-sw600dp/kbd_rows_arabic.xml217
-rw-r--r--java/res/xml-sw600dp/kbd_rows_hebrew.xml147
-rw-r--r--java/res/xml-sw600dp/kbd_rows_russian.xml140
-rw-r--r--java/res/xml-sw600dp/kbd_rows_serbian.xml118
-rw-r--r--java/res/xml-sw600dp/key_f2.xml (renamed from java/res/xml-sw600dp/kbd_qwerty_f2.xml)0
-rw-r--r--java/res/xml-sw600dp/key_smiley.xml (renamed from java/res/xml-sw600dp/kbd_row3_smiley.xml)16
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml (renamed from java/res/xml-sw600dp/kbd_key_styles.xml)85
-rw-r--r--java/res/xml-sw600dp/keys_apostrophe_dash.xml (renamed from java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml)12
-rw-r--r--java/res/xml-sw600dp/row_qwerty1.xml (renamed from java/res/xml-sw600dp/kbd_qwerty_row1.xml)9
-rw-r--r--java/res/xml-sw600dp/row_qwerty2.xml (renamed from java/res/xml-sw600dp/kbd_qwerty_row2.xml)2
-rw-r--r--java/res/xml-sw600dp/row_qwerty3.xml (renamed from java/res/xml-sw600dp/kbd_qwerty_row3.xml)6
-rw-r--r--java/res/xml-sw600dp/row_qwerty4.xml (renamed from java/res/xml-sw600dp/kbd_qwerty_row4.xml)10
-rw-r--r--java/res/xml-sw600dp/rows_arabic.xml192
-rw-r--r--java/res/xml-sw600dp/rows_azerty.xml (renamed from java/res/xml-sw600dp/kbd_rows_azerty.xml)46
-rw-r--r--java/res/xml-sw600dp/rows_bulgarian.xml147
-rw-r--r--java/res/xml-sw600dp/rows_hebrew.xml142
-rw-r--r--java/res/xml-sw600dp/rows_number_normal.xml138
-rw-r--r--java/res/xml-sw600dp/rows_number_password.xml81
-rw-r--r--java/res/xml-sw600dp/rows_phone.xml (renamed from java/res/xml-sw600dp/kbd_phone_shift.xml)51
-rw-r--r--java/res/xml-sw600dp/rows_qwerty.xml (renamed from java/res/xml-sw600dp/kbd_rows_qwerty.xml)10
-rw-r--r--java/res/xml-sw600dp/rows_qwertz.xml (renamed from java/res/xml-sw600dp/kbd_rows_qwertz.xml)43
-rw-r--r--java/res/xml-sw600dp/rows_scandinavian.xml (renamed from java/res/xml-sw600dp/kbd_rows_scandinavian.xml)25
-rw-r--r--java/res/xml-sw600dp/rows_serbian.xml151
-rw-r--r--java/res/xml-sw600dp/rows_slavic.xml155
-rw-r--r--java/res/xml-sw600dp/rows_spanish.xml (renamed from java/res/xml-sw600dp/kbd_rows_spanish.xml)13
-rw-r--r--java/res/xml-sw600dp/rows_symbols.xml (renamed from java/res/xml-sw600dp/kbd_rows_symbols.xml)42
-rw-r--r--java/res/xml-sw600dp/rows_symbols_shift.xml (renamed from java/res/xml-sw600dp/kbd_rows_symbols_shift.xml)91
-rw-r--r--java/res/xml-sw768dp-land/kbd_more_keys_keyboard_template.xml (renamed from java/res/xml-sw768dp-land/kbd_mini_keyboard_template.xml)2
-rw-r--r--java/res/xml-sw768dp-land/kbd_number.xml28
-rw-r--r--java/res/xml-sw768dp-land/kbd_phone.xml (renamed from java/res/xml-ar/kbd_symbols_shift.xml)5
-rw-r--r--java/res/xml-sw768dp-land/kbd_phone_symbols.xml29
-rw-r--r--java/res/xml-sw768dp/kbd_more_keys_keyboard_template.xml (renamed from java/res/xml-sw768dp/kbd_mini_keyboard_template.xml)2
-rw-r--r--java/res/xml-sw768dp/kbd_number.xml203
-rw-r--r--java/res/xml-sw768dp/kbd_phone.xml119
-rw-r--r--java/res/xml-sw768dp/kbd_phone_symbols.xml (renamed from java/res/xml-da/kbd_qwerty.xml)5
-rw-r--r--java/res/xml-sw768dp/kbd_row3_comma_period.xml46
-rw-r--r--java/res/xml-sw768dp/kbd_rows_arabic.xml193
-rw-r--r--java/res/xml-sw768dp/kbd_rows_hebrew.xml120
-rw-r--r--java/res/xml-sw768dp/kbd_rows_russian.xml127
-rw-r--r--java/res/xml-sw768dp/kbd_rows_serbian.xml123
-rw-r--r--java/res/xml-sw768dp/key_styles_common.xml (renamed from java/res/xml-sw768dp/kbd_key_styles.xml)97
-rw-r--r--java/res/xml-sw768dp/keys_apostrophe_dash.xml (renamed from java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml)12
-rw-r--r--java/res/xml-sw768dp/row_qwerty1.xml (renamed from java/res/xml-sw768dp/kbd_qwerty_row1.xml)11
-rw-r--r--java/res/xml-sw768dp/row_qwerty2.xml (renamed from java/res/xml-sw768dp/kbd_qwerty_row2.xml)4
-rw-r--r--java/res/xml-sw768dp/row_qwerty3.xml (renamed from java/res/xml-sw768dp/kbd_qwerty_row3.xml)2
-rw-r--r--java/res/xml-sw768dp/row_qwerty4.xml (renamed from java/res/xml-sw768dp/kbd_qwerty_row4.xml)12
-rw-r--r--java/res/xml-sw768dp/rows_arabic.xml197
-rw-r--r--java/res/xml-sw768dp/rows_azerty.xml (renamed from java/res/xml-sw768dp/kbd_rows_azerty.xml)47
-rw-r--r--java/res/xml-sw768dp/rows_bulgarian.xml152
-rw-r--r--java/res/xml-sw768dp/rows_hebrew.xml147
-rw-r--r--java/res/xml-sw768dp/rows_number_normal.xml159
-rw-r--r--java/res/xml-sw768dp/rows_number_password.xml79
-rw-r--r--java/res/xml-sw768dp/rows_phone.xml (renamed from java/res/xml-sw768dp/kbd_phone_shift.xml)31
-rw-r--r--java/res/xml-sw768dp/rows_qwerty.xml (renamed from java/res/xml-sw768dp/kbd_rows_qwerty.xml)10
-rw-r--r--java/res/xml-sw768dp/rows_qwertz.xml (renamed from java/res/xml-sw768dp/kbd_rows_qwertz.xml)41
-rw-r--r--java/res/xml-sw768dp/rows_scandinavian.xml (renamed from java/res/xml-sw768dp/kbd_rows_scandinavian.xml)23
-rw-r--r--java/res/xml-sw768dp/rows_serbian.xml154
-rw-r--r--java/res/xml-sw768dp/rows_slavic.xml160
-rw-r--r--java/res/xml-sw768dp/rows_spanish.xml (renamed from java/res/xml-sw768dp/kbd_rows_spanish.xml)15
-rw-r--r--java/res/xml-sw768dp/rows_symbols.xml (renamed from java/res/xml-sw768dp/kbd_rows_symbols.xml)44
-rw-r--r--java/res/xml-sw768dp/rows_symbols_shift.xml (renamed from java/res/xml-sw768dp/kbd_rows_symbols_shift.xml)92
-rw-r--r--java/res/xml-tr/kbd_qwerty.xml27
-rw-r--r--java/res/xml-tr/keyboard_set.xml42
-rw-r--r--java/res/xml-uk/keyboard_set.xml42
-rw-r--r--java/res/xml-vi/keyboard_set.xml42
-rw-r--r--java/res/xml/kbd_arabic.xml (renamed from java/res/xml-de-rZZ/kbd_qwerty.xml)3
-rw-r--r--java/res/xml/kbd_azerty.xml (renamed from java/res/xml-pl/kbd_qwerty.xml)3
-rw-r--r--java/res/xml/kbd_bulgarian.xml (renamed from java/res/xml-fr/kbd_qwerty.xml)7
-rw-r--r--java/res/xml/kbd_hebrew.xml (renamed from java/res/xml-hu/kbd_qwerty.xml)3
-rw-r--r--java/res/xml/kbd_more_keys_keyboard_template.xml (renamed from java/res/xml/kbd_mini_keyboard_template.xml)2
-rw-r--r--java/res/xml/kbd_number.xml2
-rw-r--r--java/res/xml/kbd_phone.xml2
-rw-r--r--java/res/xml/kbd_phone_symbols.xml (renamed from java/res/xml/kbd_phone_shift.xml)2
-rw-r--r--java/res/xml/kbd_qwerty.xml3
-rw-r--r--java/res/xml/kbd_qwertz.xml (renamed from java/res/xml-cs/kbd_qwerty.xml)3
-rw-r--r--java/res/xml/kbd_rows_arabic.xml189
-rw-r--r--java/res/xml/kbd_rows_hebrew.xml109
-rw-r--r--java/res/xml/kbd_rows_number.xml132
-rw-r--r--java/res/xml/kbd_rows_russian.xml133
-rw-r--r--java/res/xml/kbd_rows_serbian.xml130
-rw-r--r--java/res/xml/kbd_scandinavian.xml26
-rw-r--r--java/res/xml/kbd_serbian.xml26
-rw-r--r--java/res/xml/kbd_slavic.xml26
-rw-r--r--java/res/xml/kbd_spanish.xml26
-rw-r--r--java/res/xml/kbd_symbols.xml2
-rw-r--r--java/res/xml/kbd_symbols_shift.xml2
-rw-r--r--java/res/xml/key_f1.xml (renamed from java/res/xml/kbd_qwerty_f1.xml)0
-rw-r--r--java/res/xml/key_settings_or_tab.xml (renamed from java/res/xml/kbd_settings_or_tab.xml)3
-rw-r--r--java/res/xml/key_styles_common.xml (renamed from java/res/xml/kbd_key_styles.xml)126
-rw-r--r--java/res/xml/key_styles_currency.xml (renamed from java/res/xml/kbd_currency_key_styles.xml)10
-rw-r--r--java/res/xml/key_styles_currency_dollar.xml (renamed from java/res/xml/kbd_currency_dollar_key_styles.xml)0
-rw-r--r--java/res/xml/key_styles_currency_euro.xml (renamed from java/res/xml/kbd_currency_euro_key_styles.xml)0
-rw-r--r--java/res/xml/key_styles_enter_phone.xml124
-rw-r--r--java/res/xml/key_styles_enter_tablet.xml111
-rw-r--r--java/res/xml/key_styles_number.xml (renamed from java/res/xml/kbd_numkey_styles.xml)46
-rw-r--r--java/res/xml/key_symbols_f1.xml (renamed from java/res/xml/kbd_symbols_f1.xml)0
-rw-r--r--java/res/xml/keyboard_set.xml42
-rw-r--r--java/res/xml/keys_comma_period.xml (renamed from java/res/xml-sw600dp/kbd_row3_comma_period.xml)10
-rw-r--r--java/res/xml/keys_curly_brackets.xml30
-rw-r--r--java/res/xml/keys_less_greater.xml32
-rw-r--r--java/res/xml/keys_parentheses.xml32
-rw-r--r--java/res/xml/keys_square_brackets.xml30
-rw-r--r--java/res/xml/method.xml73
-rw-r--r--java/res/xml/prefs_for_debug.xml6
-rw-r--r--java/res/xml/row_qwerty1.xml (renamed from java/res/xml/kbd_qwerty_row1.xml)13
-rw-r--r--java/res/xml/row_qwerty2.xml (renamed from java/res/xml/kbd_qwerty_row2.xml)0
-rw-r--r--java/res/xml/row_qwerty3.xml (renamed from java/res/xml/kbd_qwerty_row3.xml)0
-rw-r--r--java/res/xml/row_qwerty4.xml (renamed from java/res/xml/kbd_qwerty_row4.xml)10
-rw-r--r--java/res/xml/row_symbols4.xml (renamed from java/res/xml/kbd_symbols_row4.xml)10
-rw-r--r--java/res/xml/row_symbols_shift4.xml (renamed from java/res/xml/kbd_symbols_shift_row4.xml)22
-rw-r--r--java/res/xml/rows_arabic.xml207
-rw-r--r--java/res/xml/rows_azerty.xml (renamed from java/res/xml/kbd_rows_azerty.xml)27
-rw-r--r--java/res/xml/rows_bulgarian.xml160
-rw-r--r--java/res/xml/rows_hebrew.xml143
-rw-r--r--java/res/xml/rows_number.xml41
-rw-r--r--java/res/xml/rows_number_normal.xml81
-rw-r--r--java/res/xml/rows_number_password.xml62
-rw-r--r--java/res/xml/rows_phone.xml (renamed from java/res/xml/kbd_rows_phone.xml)8
-rw-r--r--java/res/xml/rows_phone_symbols.xml (renamed from java/res/xml/kbd_rows_phone_shift.xml)19
-rw-r--r--java/res/xml/rows_qwerty.xml (renamed from java/res/xml/kbd_rows_qwerty.xml)10
-rw-r--r--java/res/xml/rows_qwertz.xml (renamed from java/res/xml/kbd_rows_qwertz.xml)19
-rw-r--r--java/res/xml/rows_scandinavian.xml (renamed from java/res/xml/kbd_rows_scandinavian.xml)24
-rw-r--r--java/res/xml/rows_serbian.xml161
-rw-r--r--java/res/xml/rows_slavic.xml165
-rw-r--r--java/res/xml/rows_spanish.xml (renamed from java/res/xml/kbd_rows_spanish.xml)11
-rw-r--r--java/res/xml/rows_symbols.xml (renamed from java/res/xml/kbd_rows_symbols.xml)33
-rw-r--r--java/res/xml/rows_symbols_shift.xml (renamed from java/res/xml/kbd_rows_symbols_shift.xml)76
-rw-r--r--java/res/xml/spell_checker_settings.xml6
-rw-r--r--java/res/xml/spellchecker.xml15
294 files changed, 8700 insertions, 5444 deletions
diff --git a/java/res/anim/mini_keyboard_fadein.xml b/java/res/anim/more_keys_keyboard_fadein.xml
index f80e8b8de..c781f36ad 100644
--- a/java/res/anim/mini_keyboard_fadein.xml
+++ b/java/res/anim/more_keys_keyboard_fadein.xml
@@ -25,5 +25,5 @@
<alpha
android:fromAlpha="0.5"
android:toAlpha="1.0"
- android:duration="@integer/config_mini_keyboard_fadein_anim_time" />
+ android:duration="@integer/config_more_keys_keyboard_fadein_anim_time" />
</set>
diff --git a/java/res/anim/mini_keyboard_fadeout.xml b/java/res/anim/more_keys_keyboard_fadeout.xml
index 535b100ae..32fae6bd8 100644
--- a/java/res/anim/mini_keyboard_fadeout.xml
+++ b/java/res/anim/more_keys_keyboard_fadeout.xml
@@ -25,5 +25,5 @@
<alpha
android:fromAlpha="1.0"
android:toAlpha="0.0"
- android:duration="@integer/config_mini_keyboard_fadeout_anim_time" />
+ android:duration="@integer/config_more_keys_keyboard_fadeout_anim_time" />
</set>
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index 2e0cddc28..b9451f8ae 100644
--- a/java/res/layout/input_view.xml
+++ b/java/res/layout/input_view.xml
@@ -43,7 +43,7 @@
android:layout_width="@dimen/suggestions_strip_padding"
android:layout_height="@dimen/suggestions_strip_height"
style="?attr/suggestionsStripBackgroundStyle" />
- <com.android.inputmethod.latin.SuggestionsView
+ <com.android.inputmethod.latin.suggestions.SuggestionsView
android:id="@+id/suggestions_view"
android:layout_weight="1.0"
android:layout_width="0dp"
diff --git a/java/res/layout/mini_keyboard.xml b/java/res/layout/more_keys_keyboard.xml
index 6964ec5d6..89161c6b4 100644
--- a/java/res/layout/mini_keyboard.xml
+++ b/java/res/layout/more_keys_keyboard.xml
@@ -22,11 +22,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- style="?attr/miniKeyboardPanelStyle"
+ style="?attr/moreKeysKeyboardPanelStyle"
>
- <com.android.inputmethod.keyboard.MiniKeyboardView
+ <com.android.inputmethod.keyboard.MoreKeysKeyboardView
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/mini_keyboard_view"
+ android:id="@+id/more_keys_keyboard_view"
android:layout_alignParentBottom="true"
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 6aa82e197..34f54f974 100644
--- a/java/res/layout/more_suggestions.xml
+++ b/java/res/layout/more_suggestions.xml
@@ -22,9 +22,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- style="?attr/miniKeyboardPanelStyle"
+ style="?attr/moreKeysKeyboardPanelStyle"
>
- <com.android.inputmethod.latin.MoreSuggestionsView
+ <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_alignParentBottom="true"
diff --git a/java/res/values-af/strings.xml b/java/res/values-af/strings.xml
index 36c9d4bc4..67dd11b8d 100644
--- a/java/res/values-af/strings.xml
+++ b/java/res/values-af/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android-sleutelbord"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android-sleutelbord (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android-sleutelbordinstellings"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Invoeropsies"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android-korrigering"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Speltoetser se instellings"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Gebruik nabyheidsdata"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Gebruik \'n sleutelbordagtige nabyheidsalgoritme vir die speltoetser"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Soek kontakname op"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Speltoetser gebruik inskrywings uit jou kontaklys"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibreer met sleuteldruk"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Klank met sleuteldruk"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Opspring met sleuteldruk"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Tekskorrigering"</string>
<string name="misc_category" msgid="6894192814868233453">"Ander opsies"</string>
<string name="advanced_settings" msgid="362895144495591463">"Gevorderde instellings"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opsies vir gevorderde gebruikers"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Sleutelopspringer-wagperiode"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Geen wagperiode nie"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Verstek"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Gestoor"</string>
<string name="label_go_key" msgid="1635148082137219148">"Gaan"</string>
<string name="label_next_key" msgid="362972844525672568">"Volgende"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Vorige"</string>
<string name="label_done_key" msgid="2441578748772529288">"Klaar"</string>
<string name="label_send_key" msgid="2815056534433717444">"Stuur"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Geen teks ingevoer nie"</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="954941524766465022">"Shift geaktiveer"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Bokas-slot geaktiveer"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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_comma" msgid="4970844442999724586">"Komma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Tydperk"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Links-hakie"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Regs-hakie"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dubbelpunt"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Kommapunt"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Uitroepteken"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Vraagteken"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Dubbel-aanhalingsteken"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Enkel-aanhalingsteken"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Punt"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Vierkantswortel"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Handelsmerk"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Per adres"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Ster"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Pond"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellips"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Onderste dubbel-aanhalingsteken"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"Steminvoering"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Steminvoering vir jou taal word nie tans ondersteun nie, maar werk wel in Engels."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Steminvoer gebruik Google se spraakherkenning. "<a href="http://m.google.com/privacy">"Die Mobiel-privaatheidsbeleid"</a>" is van toepassing."</string>
@@ -144,10 +144,9 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Aktiveer gebruikerterugvoer"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Help hierdie invoermetode-redigeerder te verbeter deur gebruikstatistiek en omvalverslae outomaties na Google te stuur."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Sleutelbordtema"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Duitse QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Engels (VK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engels (VS)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Bruikbaarheidstudie-modus"</string>
- <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Vibrasie-tydsduur met sleuteldruk"</string>
- <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Volume met sleuteldruk"</string>
+ <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Sleuteldruk se vibrasie-tydsduurinstellings"</string>
+ <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Sleuteldruk se klankvolume-instellings"</string>
</resources>
diff --git a/java/res/values-am/strings.xml b/java/res/values-am/strings.xml
index d5280bc64..6cf420300 100644
--- a/java/res/values-am/strings.xml
+++ b/java/res/values-am/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"የAndroid ቁልፍሰሌዳ"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"የAndroid ቁልፍ ሰሌዳ (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"የAndroid ቁልፍሰሌዳ ቅንብሮች"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"ግቤት አማራጮች"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"የAndroid ማስተካከያ"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"የፊደል አራሚ ቅንብሮች"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"የቀረቤታ ውሂብ ተጠቀም"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"ለፊደል አራሚ የሰሌዳ ቁልፍ አይነት የቀረበ ስልተ ቀመር ተጠቀም"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"ፅሁፍ አስተካክል"</string>
<string name="misc_category" msgid="6894192814868233453">"ሌሎች አማራጮች"</string>
<string name="advanced_settings" msgid="362895144495591463">"የላቁ ቅንብሮች"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"ለብቁ ተጠቃሚዎች አማራጮች"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : ተቀምጧል"</string>
<string name="label_go_key" msgid="1635148082137219148">"ሂድ"</string>
<string name="label_next_key" msgid="362972844525672568">"በመቀጠል"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"ቀዳሚ"</string>
<string name="label_done_key" msgid="2441578748772529288">"ተከናውኗል"</string>
<string name="label_send_key" msgid="2815056534433717444">" ይላኩ"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"ምንም ፅሁፍ አልገባም"</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="954941524766465022">"መቀያየሪያ ቁልፍ ነቅቷል"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"አቢያት ማርጊያነቅቷል"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"ነጠላ ሰረዝ"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"ክፍለ ጊዜ"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"የግራ ቅንፍ"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"የቀኝ ቅንፍ"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"ሁለት ነጥብ"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"ድርብ ሰረዝ"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"ቃል አጋኖ"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"ጥያቄ ምልክት"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"ድርብ ጥቅስ"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"ነጠላ ትምህርተ ጥቅስ"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"ነጥብ"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"ስክዌር ሩት"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"ዴልታ"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"የንግድምልክት"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"መጠንቀቅ"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"ኮከብ"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"ፓውንድ"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellipsis"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"ዝቅ ያለ ድርብ ትምህርተ ጥቅስ"</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="voice_warning_title" msgid="4419354150908395008">"የድምፅ ግቤ ት"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"የድምፅ ግቤት በአሁኑ ጊዜ ለእርስዎን ቋንቋ አይደግፍም፣ ግን በእንግሊዘኛ ይሰራል።"</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"የድምፅ ግቤት የGoogleን ንግግር ለይቶ ማወቂያ ይጠቀማል።"<a href="http://m.google.com/privacy">"የተንቀሳቃሽ ስልክ ግላዊ ፖሊሲ"</a>" ይተገበራል።"</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"የተጠቃሚ ግብረ ምላሽ አንቃ"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"ወደ Google የተሰናከለ ሪፖርቶች እና አጠቃቀም ስታስቲክስ በራስ ሰር በመላክ ይህን ግቤት ሜተድ አርትኢ እገዛ ያሻሽላል።"</string>
<string name="keyboard_layout" msgid="8451164783510487501">"የቁልፍ ሰሌዳ ገጽታ"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"የጀመርን QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"እንግሊዘኛ (የታላቋ ብሪታንያ)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"እንግሊዘኛ (ዩ.ኤስ)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"የተገልጋይነት ጥናት ሁነታ"</string>
diff --git a/java/res/values-ar/donottranslate-more-keys.xml b/java/res/values-ar/donottranslate-more-keys.xml
index cde686084..e294e95d5 100644
--- a/java/res/values-ar/donottranslate-more-keys.xml
+++ b/java/res/values-ar/donottranslate-more-keys.xml
@@ -18,94 +18,150 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- \u060c: ARABIC COMMA
- \u061b: ARABIC SEMICOLON
- \u061f: ARABIC QUESTION MARK -->
- <!-- \u0650: ARABIC KASRA
- \u064e: ARABIC FATHA
- \u064b: ARABIC FATHATAN
- \u0640: ARABIC TATWEEL
- \u064d: ARABIC KASRATAN
- \u0670: ARABIC LETTER SUPERSCRIPT ALEF
- \u0656: ARABIC SUBSCRIPT ALEF
- \u0654: ARABIC HAMZA ABOVE
- \u0655: ARABIC HAMZA BELOW -->
- <!-- \u0651: ARABIC SHADDA
- \u0652: ARABIC SUKUN
- \u064c: ARABIC DAMMATAN
- \u0653: ARABIC MADDAH ABOVE
- \u064f: ARABIC DAMMA -->
+ <!-- \u060c: "،" ARABIC COMMA
+ \u061b: "؛" ARABIC SEMICOLON
+ \u061f: "؟" ARABIC QUESTION MARK -->
+ <!-- \u0650: "ِ" ARABIC KASRA
+ \u064e: "َ" ARABIC FATHA
+ \u064b: "ً" ARABIC FATHATAN
+ \u0640: "ـ" ARABIC TATWEEL
+ \u064d: "ٍ" ARABIC KASRATAN
+ \u0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF
+ \u0656: "ٖ" ARABIC SUBSCRIPT ALEF
+ \u0654: "ٔ" ARABIC HAMZA ABOVE
+ \u0655: "ٕ" ARABIC HAMZA BELOW -->
+ <!-- \u0651: "ّ" ARABIC SHADDA
+ \u0652: "ْ" ARABIC SUKUN
+ \u064c: "ٌ" ARABIC DAMMATAN
+ \u0653: "ٓ" ARABIC MADDAH ABOVE
+ \u064f: "ُ" ARABIC DAMMA -->
<!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
<!-- TODO: Will introduce "grouping marks" to the more characters specification. -->
<string name="more_keys_for_punctuation">"\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0640\u0640\u0640|\u0640,\u064e,\u0650,\u064b,\u064d,\u0670,\u0656,\u0655,\u0654,\u0653,\u0652,\u0651,\u064c,\u064f"</string>
- <integer name="mini_keyboard_column_for_punctuation">9</integer>
+ <integer name="more_keys_keyboard_column_for_punctuation">9</integer>
<string name="keyhintlabel_for_punctuation">\u064b</string>
- <string name="keylabel_for_symbols_1">"١"</string>
- <string name="keylabel_for_symbols_2">"٢"</string>
- <string name="keylabel_for_symbols_3">"٣"</string>
- <string name="keylabel_for_symbols_4">"٤"</string>
- <string name="keylabel_for_symbols_5">"٥"</string>
- <string name="keylabel_for_symbols_6">"٦"</string>
- <string name="keylabel_for_symbols_7">"٧"</string>
- <string name="keylabel_for_symbols_8">"٨"</string>
- <string name="keylabel_for_symbols_9">"٩"</string>
- <string name="keylabel_for_symbols_0">"٠"</string>
- <string name="more_keys_for_symbols_1">1</string>
- <string name="more_keys_for_symbols_2">2</string>
- <string name="more_keys_for_symbols_3">3</string>
- <string name="more_keys_for_symbols_4">4</string>
- <string name="more_keys_for_symbols_5">5</string>
- <string name="more_keys_for_symbols_6">6</string>
- <string name="more_keys_for_symbols_7">7</string>
- <string name="more_keys_for_symbols_8">8</string>
- <string name="more_keys_for_symbols_9">9</string>
- <!-- \u066b: ARABIC DECIMAL SEPARATOR
- \u066c: ARABIC THOUSANDS SEPARATOR -->
- <string name="more_keys_for_symbols_0">0,\u066b,\u066c</string>
+ <!-- \u0661: "١" ARABIC-INDIC DIGIT ONE -->
+ <string name="keylabel_for_symbols_1">\u0661</string>
+ <!-- \u0662: "٢" ARABIC-INDIC DIGIT TWO -->
+ <string name="keylabel_for_symbols_2">\u0662</string>
+ <!-- \u0663: "٣" ARABIC-INDIC DIGIT THREE -->
+ <string name="keylabel_for_symbols_3">\u0663</string>
+ <!-- \u0664: "٤" ARABIC-INDIC DIGIT FOUR -->
+ <string name="keylabel_for_symbols_4">\u0664</string>
+ <!-- \u0665: "٥" ARABIC-INDIC DIGIT FIVE -->
+ <string name="keylabel_for_symbols_5">\u0665</string>
+ <!-- \u0666: "٦" ARABIC-INDIC DIGIT SIX -->
+ <string name="keylabel_for_symbols_6">\u0666</string>
+ <!-- \u0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
+ <string name="keylabel_for_symbols_7">\u0667</string>
+ <!-- \u0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
+ <string name="keylabel_for_symbols_8">\u0668</string>
+ <!-- \u0669: "٩" ARABIC-INDIC DIGIT NINE -->
+ <string name="keylabel_for_symbols_9">\u0669</string>
+ <!-- \u0660: "٠" ARABIC-INDIC DIGIT ZERO -->
+ <string name="keylabel_for_symbols_0">\u0660</string>
+ <string name="additional_more_keys_for_symbols_1">1</string>
+ <string name="additional_more_keys_for_symbols_2">2</string>
+ <string name="additional_more_keys_for_symbols_3">3</string>
+ <string name="additional_more_keys_for_symbols_4">4</string>
+ <string name="additional_more_keys_for_symbols_5">5</string>
+ <string name="additional_more_keys_for_symbols_6">6</string>
+ <string name="additional_more_keys_for_symbols_7">7</string>
+ <string name="additional_more_keys_for_symbols_8">8</string>
+ <string name="additional_more_keys_for_symbols_9">9</string>
+ <!-- \u066b: "٫" ARABIC DECIMAL SEPARATOR
+ \u066c: "٬" ARABIC THOUSANDS SEPARATOR -->
+ <string name="additional_more_keys_for_symbols_0">0,\u066b,\u066c</string>
<string name="keylabel_for_comma">\u060c</string>
<string name="keylabel_for_f1">\u060c</string>
<string name="keylabel_for_symbols_question">\u061f</string>
<string name="keylabel_for_symbols_semicolon">\u061b</string>
- <!-- \u066a: ARABIC PERCENT SIGN -->
+ <!-- \u066a: "٪" ARABIC PERCENT SIGN -->
<string name="keylabel_for_symbols_percent">\u066a</string>
<string name="more_keys_for_comma">,</string>
<string name="more_keys_for_f1">,</string>
- <!-- @icon/3 is iconSettingsKey -->
- <string name="more_keys_for_f1_settings">\\,,\@icon/3|\@integer/key_settings</string>
- <!-- @icon/7 is iconTabKey -->
- <string name="more_keys_for_f1_navigate">\\,,\@icon/7|\@integer/key_tab</string>
+ <string name="more_keys_for_f1_settings">\\,,\@icon/settingsKey|\@integer/key_settings</string>
+ <string name="more_keys_for_f1_navigate">\\,,\@icon/tabKey|\@integer/key_tab</string>
<string name="more_keys_for_symbols_question">\?</string>
<string name="more_keys_for_symbols_semicolon">;</string>
- <string name="more_keys_for_symbols_percent">%,‰</string>
- <!-- \u060c: ARABIC COMMA
- \u061b: ARABIC SEMICOLON
- \u061f: ARABIC QUESTION MARK -->
- <string name="keylabel_for_apostrophe">"\u060c"</string>
+ <!-- \u2030: "‰" PER MILLE SIGN -->
+ <string name="more_keys_for_symbols_percent">%,\u2030</string>
+ <!-- \u060c: "،" ARABIC COMMA
+ \u061b: "؛" ARABIC SEMICOLON
+ \u061f: "؟" ARABIC QUESTION MARK -->
+ <string name="keylabel_for_apostrophe">\u060c</string>
<string name="keylabel_for_dash">"."</string>
- <string name="keyhintlabel_for_apostrophe">"\u061f"</string>
- <string name="keyhintlabel_for_dash">"\u064b"</string>
+ <string name="keyhintlabel_for_apostrophe">\u061f</string>
+ <string name="keyhintlabel_for_dash">\u064b</string>
<string name="more_keys_for_apostrophe">"\u061f,\u061b,!,:,-,/,\',\""</string>
- <!-- \u0651: ARABIC SHADDA
- \u0652: ARABIC SUKUN
- \u064c: ARABIC DAMMATAN
- \u0653: ARABIC MADDAH ABOVE
- \u064f: ARABIC DAMMA -->
- <!-- \u0650: ARABIC KASRA
- \u064e: ARABIC FATHA
- \u064b: ARABIC FATHATAN
- \u0640: ARABIC TATWEEL
- \u064d: ARABIC KASRATAN -->
- <!-- \u0670: ARABIC LETTER SUPERSCRIPT ALEF
- \u0656: ARABIC SUBSCRIPT ALEF
- \u0654: ARABIC HAMZA ABOVE
- \u0655: ARABIC HAMZA BELOW -->
+ <!-- \u0651: "ّ" ARABIC SHADDA
+ \u0652: "ْ" ARABIC SUKUN
+ \u064c: "ٌ" ARABIC DAMMATAN
+ \u0653: "ٓ" ARABIC MADDAH ABOVE
+ \u064f: "ُ" ARABIC DAMMA -->
+ <!-- \u0650: "ِ" ARABIC KASRA
+ \u064e: "َ" ARABIC FATHA
+ \u064b: "ً" ARABIC FATHATAN
+ \u0640: "ـ" ARABIC TATWEEL
+ \u064d: "ٍ" ARABIC KASRATAN -->
+ <!-- \u0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF
+ \u0656: "ٖ" ARABIC SUBSCRIPT ALEF
+ \u0654: "ٔ" ARABIC HAMZA ABOVE
+ \u0655: "ٕ" ARABIC HAMZA BELOW -->
<!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
<string name="more_keys_for_dash">"\u0651,\u0652,\u064c,\u0653,\u064f,\u0650,\u064e,\u064b,\u0640\u0640\u0640|\u0640,\u064d,\u0654,\u0656,\u0655,\u0670"</string>
- <string name="more_keys_for_bullet">♪</string>
- <!-- \u066d: ARABIC FIVE POINTED STAR -->
- <string name="more_keys_for_star">★,\u066d</string>
- <!-- \ufd3e: ORNATE LEFT PARENTHESIS -->
- <string name="more_keys_for_left_parenthesis">[,{,&lt;,\ufd3e</string>
- <!-- \ufd3f: ORNATE RIGHT PARENTHESIS -->
- <string name="more_keys_for_right_parenthesis">],},&gt;,\ufd3f</string>
+ <!-- \u266a: "♪" EIGHTH NOTE -->
+ <string name="more_keys_for_bullet">\u266a</string>
+ <!-- \u2605: "★" BLACK STAR
+ \u066d: "٭" ARABIC FIVE POINTED STAR -->
+ <string name="more_keys_for_star">\u2605,\u066d</string>
+ <!-- The all letters need to be mirrored are found at
+ http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
+ <!-- 0x0029: ")" RIGHT PARENTHESIS -->
+ <integer name="keycode_for_left_parenthesis">0x0029</integer>
+ <!-- 0x0028: "(" LEFT PARENTHESIS -->
+ <integer name="keycode_for_right_parenthesis">0x0028</integer>
+ <!-- \ufd3e: "﴾" ORNATE LEFT PARENTHESIS
+ \ufd3f: "﴿" ORNATE RIGHT PARENTHESIS -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \ufd3e ORNATE LEFT PARENTHESIS -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \ufd3f ORNATE RIGHT PARENTHESIS -->
+ <string name="more_keys_for_left_parenthesis">[|],{|},&lt;|&gt;,\ufd3e|\ufd3f</string>
+ <string name="more_keys_for_right_parenthesis">]|[,}|{,&gt;|&lt;,\ufd3f|\ufd3e</string>
+ <!-- 0x003e: ">" GREATER-THAN SIGN -->
+ <integer name="keycode_for_less_than">0x003e</integer>
+ <!-- 0x003c: "<" LESS-THAN SIGN -->
+ <integer name="keycode_for_greater_than">0x003c</integer>
+ <!-- \u2264: "≤" LESS-THAN OR EQUAL TO
+ \u2265: "≥" GREATER-THAN EQUAL TO
+ \u00ab: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ \u00bb: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+ \u2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+ \u203a: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+ The following characters don't need BIDI mirroring.
+ \u2018: "‘" LEFT SINGLE QUOTATION MARK
+ \u2019: "’" RIGHT SINGLE QUOTATION MARK
+ \u201a: "‚" SINGLE LOW-9 QUOTATION MARK
+ \u201b: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+ \u201c: "“" LEFT DOUBLE QUOTATION MARK
+ \u201d: "”" RIGHT DOUBLE QUOTATION MARK
+ \u201e: "„" DOUBLE LOW-9 QUOTATION MARK
+ \u201f: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+ <string name="more_keys_for_less_than">\u2264|\u2265,\u00ab|\u00bb,\u2039|\u203a</string>
+ <string name="more_keys_for_greater_than">\u2265|\u2264,\u00bb|\u00ab,\u203a|\u2039</string>
+ <!-- 0x005d: "]" RIGHT SQUARE BRACKET -->
+ <integer name="keycode_for_left_square_bracket">0x005d</integer>
+ <!-- 0x005b: "[" LEFT SQUARE BRACKET -->
+ <integer name="keycode_for_right_square_bracket">0x005b</integer>
+ <!-- 0x007d: "}" RIGHT CURLY BRACKET -->
+ <integer name="keycode_for_left_curly_bracket">0x007d</integer>
+ <!-- 0x007b: "{" LEFT CURLY BRACKET -->
+ <integer name="keycode_for_right_curly_bracket">0x007b</integer>
+ <!-- TODO: Neither DroidSans nor Roboto have the glyph for \u201f DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+ <!-- <string name="more_keys_for_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb</string> -->
+ <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
+ <string name="more_keys_for_double_quote">\u201d,\u00ab|\u00bb,\u201c,\u00bb|\u00ab</string>
+ <!-- TODO: Neither DroidSans nor Roboto have the glyph for \u201f DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+ <!-- <string name="more_keys_for_tablet_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb,\u2018,\u2019,\u201a,\u201b</string> -->
+ <!-- The 8-more keys with maxMoreKeysColumn=4 will be displayed in order of "3,1,2,4|7,5,6,8". -->
+ <string name="more_keys_for_tablet_double_quote">\u201d,\u00ab|\u00bb,\u201c,\u00bb|\u00ab,\u2019,\u201a,\u2018,\u201b</string>
</resources>
diff --git a/java/res/values-ar/donottranslate.xml b/java/res/values-ar/donottranslate.xml
new file mode 100644
index 000000000..968a7309f
--- /dev/null
+++ b/java/res/values-ar/donottranslate.xml
@@ -0,0 +1,27 @@
+<?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 -->
+ <!-- \u0022: """ QUOTATION MARK (double quotation mark)
+ \u0027: "'" APOSTROPHE (single quotation mark) -->
+ <string name="suggested_punctuations">!,?,\\,,:,;,\u0022,(|),)|(,\u0027,-,/,@,_</string>
+</resources>
diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml
index dca73659a..9f570ab16 100644
--- a/java/res/values-ar/strings.xml
+++ b/java/res/values-ar/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"لوحة مفاتيح Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"لوحة مفاتيح Android ‏(AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"إعدادات لوحة مفاتيح Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"خيارات الإرسال"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"تصحيح Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"إعدادات التدقيق الإملائي"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"استخدام بيانات التقريب"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"استخدام خوارزمية تقريب شبيهة بلوحة المفاتيح لإجراء التدقيق الإملائي"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"تصحيح النص"</string>
<string name="misc_category" msgid="6894192814868233453">"خيارات أخرى"</string>
<string name="advanced_settings" msgid="362895144495591463">"الإعدادات المتقدمة"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"خيارات للمستخدمين الخبراء"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : تم الحفظ"</string>
<string name="label_go_key" msgid="1635148082137219148">"تنفيذ"</string>
<string name="label_next_key" msgid="362972844525672568">"التالي"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"السابق"</string>
<string name="label_done_key" msgid="2441578748772529288">"تم"</string>
<string name="label_send_key" msgid="2815056534433717444">"إرسال"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"أ ب ج"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"لم يتم إدخال نص"</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="954941524766465022">"تم تمكين العالي"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"تمكين Caps lock"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"فاصلة"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"نقطة"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"قوس أيسر"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"قوس أيمن"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"نقطتان"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"فاصلة منقوطة"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"علامة التعجب"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"علامة استفهام"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"علامة الاقتباس المزدوجة"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"علامة الاقتباس المفردة"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"نقطة"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"جذر تربيعي"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"باي"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"دلتا"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"علامة تجارية"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"رعاية"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"نجمة"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"جنيه"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"علامة حذف"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"علامة الاقتباس المزدوجة السفلية"</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="voice_warning_title" msgid="4419354150908395008">"الإدخال الصوتي"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"الإدخال الصوتي غير معتمد حاليًا للغتك، ولكنه يعمل باللغة الإنجليزية."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"يستخدم الإدخال الصوتي خاصية التعرف على الكلام من Google. تنطبق "<a href="http://m.google.com/privacy">"سياسة خصوصية الجوال"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"تمكين ملاحظات المستخدم"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"المساعدة في تحسين محرر طريقة الإرسال هذا من خلال إرسال إحصاءات الاستخدام وتقارير الأعطال تلقائيًا إلى Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"مظهر لوحة المفاتيح"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"الألمانية (QWERTY)"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"الإنجليزية (المملكة المتحدة)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"الإنجليزية (الولايات المتحدة)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"وضع سهولة الاستخدام"</string>
diff --git a/java/res/values-fr-rCH/donottranslate-more-keys.xml b/java/res/values-be/donottranslate-more-keys.xml
index 561c5e52f..0110de04b 100644
--- a/java/res/values-fr-rCH/donottranslate-more-keys.xml
+++ b/java/res/values-be/donottranslate-more-keys.xml
@@ -18,9 +18,8 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">à,â,æ,á,ä,ã,å,ā,ª</string>
- <string name="more_keys_for_y">ÿ</string>
- <string name="more_keys_for_q">1</string>
- <string name="more_keys_for_w">2</string>
- <string name="more_keys_for_z">6</string>
+ <!-- \u045e: "ў" CYRILLIC SMALL LETTER SHORT U -->
+ <string name="keylabel_for_slavic_shcha">\u045e</string>
+ <!-- \u0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
+ <string name="keylabel_for_slavic_i">\u0456</string>
</resources>
diff --git a/java/res/values-be/strings.xml b/java/res/values-be/strings.xml
index 1ed944caf..53507e7a3 100644
--- a/java/res/values-be/strings.xml
+++ b/java/res/values-be/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Клавіятура Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Клавіятура Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Налады клавіятуры Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Параметры ўводу"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Папраўкі Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Налады праверкі арфаграфіі"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Выкарыстоўвайць дадзеныя аб блізкасці"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Для праверкі арфаграфіі выкарыстоўваць алгарытм блізкасці, падобны на клавіятуру"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Выпраўленне тэксту"</string>
<string name="misc_category" msgid="6894192814868233453">"Іншыя параметры"</string>
<string name="advanced_settings" msgid="362895144495591463">"Адмысловыя налады"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Парам. для дасведч. карыст."</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Захаваныя"</string>
<string name="label_go_key" msgid="1635148082137219148">"Пачаць"</string>
<string name="label_next_key" msgid="362972844525672568">"Далей"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Назад"</string>
<string name="label_done_key" msgid="2441578748772529288">"Гатова"</string>
<string name="label_send_key" msgid="2815056534433717444">"Адправіць"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Тэкст не ўведзены"</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="954941524766465022">"Зрух уключаны"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps Lock уключаны"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Коска"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Кропка"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Адчыняючая дужка"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Дужка, якая зачыняе"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Двукроп\'е"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Кропка з коскай"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Клічнік"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Пытальнік"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Двукоссі"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Паўдвукоссі"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Кропка"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Квадратны корань"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Пі"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Дэльта"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Гандлёвая марка"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Працэнт"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Пазначыць"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Фунт"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Шматкроп\'е"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Нізкія падвойныя двукоссі"</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="voice_warning_title" msgid="4419354150908395008">"Галасавы ўвод"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Галасавы ўвод пакуль не падтрымліваецца для вашай мовы, але працуе на англійскай мове."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Галасавы набор выкарыстоўвае распазнанне гаворкі Google. Ужываецца "<a href="http://m.google.com/privacy">"палiтыка прыватнасцi для мабiльных прылад"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Уключыць зваротную сувязь з карыстальнікамі"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Дапамажыце палепшыць гэты рэдактар ​​метаду ўводу, аўтаматычна адпраўляючы статыстыку выкарыстання і справаздачы аб збоях Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Тэма клавіятуры"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Нямецкая QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Англійская (ЗК)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Англійская (ЗША)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Рэжым даследвання выкарыстальнасці"</string>
diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml
index 30fe132d8..1a6859516 100644
--- a/java/res/values-bg/strings.xml
+++ b/java/res/values-bg/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Клавиатура на Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Клавиатура на Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Настройки на клавиатурата на Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Опции за въвеждане"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Корекция на Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Настройки за проверка на правописа"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Използване на близост"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Проверка на правописа: Използвайте алгоритъм за близост"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Корекция на текста"</string>
<string name="misc_category" msgid="6894192814868233453">"Други опции"</string>
<string name="advanced_settings" msgid="362895144495591463">"Разширени настройки"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Опции за потребителите експерти"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Запазено"</string>
<string name="label_go_key" msgid="1635148082137219148">"Старт"</string>
<string name="label_next_key" msgid="362972844525672568">"Напред"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Пред."</string>
<string name="label_done_key" msgid="2441578748772529288">"Готово"</string>
<string name="label_send_key" msgid="2815056534433717444">"Изпращане"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"АБВ"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Няма въведен текст"</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="954941524766465022">"„Shift“ е активиран"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"„Caps Lock“ е активиран"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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_comma" msgid="4970844442999724586">"Запетая"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Точка"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Лява кръгла скоба"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Дясна кръгла скоба"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Двоеточие"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Точка и запетая"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Удивителен знак"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Въпросителен знак"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Двойни кавички"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Единични кавички"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Точка"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Корен квадратен"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Пи"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Делта"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Запазена марка"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"По адрес"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Звездичка"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Диез"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Многоточие"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Долни двойни кавички"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"Гласово въвеждане"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"За вашия език понастоящем не се поддържа гласово въвеждане, но можете да го използвате на английски."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Гласовото въвеждане използва функцията на Google за разпознаване на говор. В сила е "<a href="http://m.google.com/privacy">"Декларацията за поверителност за мобилни устройства"</a>"."</string>
@@ -144,7 +144,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Активиране на отзивите от потребителите"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Помогнете за подобряването на този редактор за въвеждане чрез автоматично изпращане до Google на статистически данни за употребата и сигнали за сривове."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Тема на клавиатурата"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"немски, „QWERTY“"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"английски (Великобритания)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"английски (САЩ)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Режим за изучаване на използваемостта"</string>
diff --git a/java/res/values-ca/donottranslate-more-keys.xml b/java/res/values-ca/donottranslate-more-keys.xml
index bd9fb7ccd..68d7f9071 100644
--- a/java/res/values-ca/donottranslate-more-keys.xml
+++ b/java/res/values-ca/donottranslate-more-keys.xml
@@ -18,12 +18,56 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">à,á,ä,â,ã,å,ą,æ,ā,ª</string>
- <string name="more_keys_for_e">3,è,é,ë,ê,ę,ė,ē</string>
- <string name="more_keys_for_i">8,í,ï,ì,î,į,ī</string>
- <string name="more_keys_for_o">9,ò,ó,ö,ô,õ,ø,œ,ō,º</string>
- <string name="more_keys_for_u">7,ú,ü,ù,û,ū</string>
- <string name="more_keys_for_n">ñ,ń</string>
- <string name="more_keys_for_c">ç,ć,č</string>
- <string name="more_keys_for_l">ŀ,ł</string>
+ <!-- \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u0105: "ą" LATIN SMALL LETTER A WITH OGONEK
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+ \u00aa: "ª" FEMININE ORDINAL INDICATOR -->
+ <string name="more_keys_for_a">\u00e0,\u00e1,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa</string>
+ <!-- \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+ <string name="more_keys_for_e">\u00e8,\u00e9,\u00eb,\u00ea,\u0119,\u0117,\u0113</string>
+ <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON -->
+ <string name="more_keys_for_i">\u00ed,\u00ef,\u00ec,\u00ee,\u012f,\u012b</string>
+ <!-- \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON
+ \u00ba: "º" MASCULINE ORDINAL INDICATOR -->
+ <string name="more_keys_for_o">\u00f2,\u00f3,\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba</string>
+ <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fa,\u00fc,\u00f9,\u00fb,\u016b</string>
+ <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u00f1,\u0144</string>
+ <!-- \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ \u010d: "č" LATIN SMALL LETTER C WITH CARON -->
+ <string name="more_keys_for_c">\u00e7,\u0107,\u010d</string>
+ <!-- \u0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT
+ \u0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
+ <string name="more_keys_for_l">\u0140,\u0142</string>
</resources>
diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml
index a58d8faa9..5266f1461 100644
--- a/java/res/values-ca/strings.xml
+++ b/java/res/values-ca/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Teclat Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Teclat d\'Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Configuració del teclat d\'Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Opcions d\'entrada"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Correcció d\'Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Configuració de la correcció ortogràfica"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Utilitza les dades de proximitat"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Utilitza un algorisme de proximitat similar al teclat per comprovar l\'ortografia"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Cerca noms de contactes"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"El corrector ortogràfic utilitza entrades de la llista de cont."</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibra en prémer tecles"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"So en prémer una tecla"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Finestra emergent en prémer un botó"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Correcció de text"</string>
<string name="misc_category" msgid="6894192814868233453">"Altres opcions"</string>
<string name="advanced_settings" msgid="362895144495591463">"Configuració avançada"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opcions per a usuaris experts"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Retard d\'om. em. de tecla"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Sense retard"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Predeterminat"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: desada"</string>
<string name="label_go_key" msgid="1635148082137219148">"Vés"</string>
<string name="label_next_key" msgid="362972844525672568">"Següent"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Ant."</string>
<string name="label_done_key" msgid="2441578748772529288">"Fet"</string>
<string name="label_send_key" msgid="2815056534433717444">"Envia"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"No s\'ha introduït cap text"</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="954941524766465022">"Maj activat"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Bloq Maj activat"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Coma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punt"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Parèntesi esquerre"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Parèntesi dret"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Coma"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Punt i coma"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Signe d\'admiració"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Signe d\'interrogació"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Cometes dobles"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Cometes simples"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Punt"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Arrel quadrada"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Marca comercial"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Percentatge"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Destaca"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Coixinet"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Punts suspensius"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Cometes angulars"</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="voice_warning_title" msgid="4419354150908395008">"Entrada de veu"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Actualment, l\'entrada de veu no és compatible amb el vostre idioma, però funciona en anglès."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"L\'entrada de veu utilitza el reconeixement de veu de Google. S\'hi aplica la "<a href="http://m.google.com/privacy">"Política de privadesa de Google per a mòbils"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Activa els comentaris de l\'usuari"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Ajuda a millorar aquest editor de mètodes d\'entrada enviant automàticament estadístiques d\'ús i informes de bloqueigs a Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema del teclat"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY alemany"</string>
<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="prefs_usability_study_mode" msgid="1261130555134595254">"Mode d\'estudi d\'usabilitat"</string>
diff --git a/java/res/values-cs/donottranslate-more-keys.xml b/java/res/values-cs/donottranslate-more-keys.xml
index 70b3f3ee7..475b589f6 100644
--- a/java/res/values-cs/donottranslate-more-keys.xml
+++ b/java/res/values-cs/donottranslate-more-keys.xml
@@ -18,17 +18,70 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">á,à,â,ä,æ,ã,å,ā</string>
- <string name="more_keys_for_e">3,é,ě,è,ê,ë,ę,ė,ē</string>
- <string name="more_keys_for_i">8,í,î,ï,ì,į,ī</string>
- <string name="more_keys_for_o">9,ó,ö,ô,ò,õ,œ,ø,ō</string>
- <string name="more_keys_for_u">7,ú,ů,û,ü,ù,ū</string>
- <string name="more_keys_for_s">š,ß,ś</string>
- <string name="more_keys_for_n">ň,ñ,ń</string>
- <string name="more_keys_for_c">č,ç,ć</string>
- <string name="more_keys_for_y">ý,ÿ</string>
- <string name="more_keys_for_d">ď</string>
- <string name="more_keys_for_r">4,ř</string>
- <string name="more_keys_for_t">5,ť</string>
- <string name="more_keys_for_z">6,ž,ź,ż</string>
+ <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+ <string name="more_keys_for_a">\u00e1,\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101</string>
+ <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u011b: "ě" LATIN SMALL LETTER E WITH CARON
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+ <string name="more_keys_for_e">\u00e9,\u011b,\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113</string>
+ <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON -->
+ <string name="more_keys_for_i">\u00ed,\u00ee,\u00ef,\u00ec,\u012f,\u012b</string>
+ <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+ <string name="more_keys_for_o">\u00f3,\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d</string>
+ <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u016f: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fa,\u016f,\u00fb,\u00fc,\u00f9,\u016b</string>
+ <!-- \u0161: "š" LATIN SMALL LETTER S WITH CARON
+ \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE -->
+ <string name="more_keys_for_s">\u0161,\u00df,\u015b</string>
+ <!-- \u0148: "ň" LATIN SMALL LETTER N WITH CARON
+ \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u0148,\u00f1,\u0144</string>
+ <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+ \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+ <string name="more_keys_for_c">\u010d,\u00e7,\u0107</string>
+ <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+ \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+ <string name="more_keys_for_y">\u00fd,\u00ff</string>
+ <!-- \u010f: "ď" LATIN SMALL LETTER D WITH CARON -->
+ <string name="more_keys_for_d">\u010f</string>
+ <!-- \u0159: "ř" LATIN SMALL LETTER R WITH CARON -->
+ <string name="more_keys_for_r">\u0159</string>
+ <!-- \u0165: "ť" LATIN SMALL LETTER T WITH CARON -->
+ <string name="more_keys_for_t">\u0165</string>
+ <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+ \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE
+ \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
+ <string name="more_keys_for_z">\u017e,\u017a,\u017c</string>
</resources>
diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index d57ccaa28..ce532d7a1 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Klávesnice Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Klávesnice Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Nastavení klávesnice Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Možnosti zadávání textu a dat"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Opravy Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Nastavení kontroly pravopisu"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Použít údaje o blízkosti"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Při kontrole pravopisu uvažovat blízkost písmen na klávesnici"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Vyhledat kontakty"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Kontrola pravopisu používá záznamy z vašeho seznamu kontaktů."</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Při stisku klávesy vibrovat"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Zvuk při stisku klávesy"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Zobrazit znaky při stisku klávesy"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Oprava textu"</string>
<string name="misc_category" msgid="6894192814868233453">"Další možnosti"</string>
<string name="advanced_settings" msgid="362895144495591463">"Pokročilá nastavení"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Možnosti pro zkušené uživatele"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Prodleva vysk. okna kláv."</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez prodlevy"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Výchozí"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Uloženo"</string>
<string name="label_go_key" msgid="1635148082137219148">"Přejít"</string>
<string name="label_next_key" msgid="362972844525672568">"Další"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Před."</string>
<string name="label_done_key" msgid="2441578748772529288">"Hotovo"</string>
<string name="label_send_key" msgid="2815056534433717444">"Odeslat"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Není zadán žádný text"</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="954941524766465022">"Klávesa Shift je aktivní"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Klávesa Caps Lock je aktivní"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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_comma" msgid="4970844442999724586">"Čárka"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Tečka"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Levá závorka"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Pravá závorka"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dvojtečka"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Středník"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Vykřičník"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Otazník"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Uvozovky"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Apostrof"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Tečka"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Odmocnina"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pí"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Ochranná známka"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Procento"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Hvězdička"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Libra"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Tři tečky"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Uvozovky dole"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"Hlasový vstup"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Pro váš jazyk aktuálně není hlasový vstup podporován, ale funguje v angličtině."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Hlasový vstup používá rozpoznávání hlasu Google a vztahují se na něj "<a href="http://m.google.com/privacy">"Zásady ochrany osobních údajů pro mobilní služby"</a>"."</string>
@@ -144,7 +144,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Aktivovat zasílání statistik užívání a zpráv o selhání"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Automatickým zasíláním statistik o užívání editoru zadávání dat a zpráv o jeho selhání do Googlu můžete přispět k vylepšení tohoto nástroje."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Motiv klávesnice"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"němčina (QWERTY)"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"angličtina (Spojené království)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"angličtina (USA)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Režim studie použitelnosti"</string>
diff --git a/java/res/values-da/donottranslate-more-keys.xml b/java/res/values-da/donottranslate-more-keys.xml
index 12c1ebfe1..84dc1bf07 100644
--- a/java/res/values-da/donottranslate-more-keys.xml
+++ b/java/res/values-da/donottranslate-more-keys.xml
@@ -18,18 +18,54 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">á,ä,à,â,ã,ā</string>
- <string name="more_keys_for_e">3,é,ë</string>
- <string name="more_keys_for_i">8,í,ï</string>
- <string name="more_keys_for_o">9,ó,ô,ò,õ,œ,ō</string>
- <string name="more_keys_for_u">7,ú,ü,û,ù,ū</string>
- <string name="more_keys_for_s">ß,ś,š</string>
- <string name="more_keys_for_n">ñ,ń</string>
- <string name="more_keys_for_y">6,ý,ÿ</string>
- <string name="more_keys_for_d">ð</string>
- <string name="more_keys_for_l">ł</string>
- <string name="keylabel_for_scandinavia_row2_10">æ</string>
- <string name="keylabel_for_scandinavia_row2_11">ø</string>
- <string name="more_keys_for_scandinavia_row2_10">ä</string>
- <string name="more_keys_for_scandinavia_row2_11">ö</string>
+ <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+ <string name="more_keys_for_a">\u00e1,\u00e4,\u00e0,\u00e2,\u00e3,\u0101</string>
+ <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS -->
+ <string name="more_keys_for_e">\u00e9,\u00eb</string>
+ <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS -->
+ <string name="more_keys_for_i">\u00ed,\u00ef</string>
+ <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+ <string name="more_keys_for_o">\u00f3,\u00f4,\u00f2,\u00f5,\u0153,\u014d</string>
+ <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fa,\u00fc,\u00fb,\u00f9,\u016b</string>
+ <!-- \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u0161: "š" LATIN SMALL LETTER S WITH CARON -->
+ <string name="more_keys_for_s">\u00df,\u015b,\u0161</string>
+ <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u00f1,\u0144</string>
+ <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+ \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+ <string name="more_keys_for_y">\u00fd,\u00ff</string>
+ <!-- \u00f0: "ð" LATIN SMALL LETTER ETH -->
+ <string name="more_keys_for_d">\u00f0</string>
+ <!-- \u0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
+ <string name="more_keys_for_l">\u0142</string>
+ <!-- \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
+ <string name="keylabel_for_scandinavia_row1_11">\u00e5</string>
+ <!-- \u00e6: "æ" LATIN SMALL LETTER AE -->
+ <string name="keylabel_for_scandinavia_row2_10">\u00e6</string>
+ <!-- \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+ <string name="keylabel_for_scandinavia_row2_11">\u00f8</string>
+ <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+ <string name="more_keys_for_scandinavia_row2_10">\u00e4</string>
+ <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+ <string name="more_keys_for_scandinavia_row2_11">\u00f6</string>
</resources>
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index b91acaa90..9c46b9a98 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android-tastatur"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android-tastatur (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android-tastatur-indstillinger"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Indstillinger for input"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android-rettelse"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Indstillinger for stavekontrol"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Brug nærhedsdata"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Brug en tastaturlignende nærhedsalgoritme til stavekontrol"</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="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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Tekstkorrigering"</string>
<string name="misc_category" msgid="6894192814868233453">"Andre valgmuligheder"</string>
<string name="advanced_settings" msgid="362895144495591463">"Avancerede indstillinger"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Muligheder for ekspertbrugere"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Forsink. afvis. af taste-pop op"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Ingen forsink."</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Standard"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Gemt"</string>
<string name="label_go_key" msgid="1635148082137219148">"Gå"</string>
<string name="label_next_key" msgid="362972844525672568">"Næste"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Forr."</string>
<string name="label_done_key" msgid="2441578748772529288">"Udfør"</string>
<string name="label_send_key" msgid="2815056534433717444">"Send"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Der er ingen indtastet tekst"</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="954941524766465022">"Shift-tasten er aktiveret"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock er aktiveret"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Komma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punktum"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Venstre parentes"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Højre parentes"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Kolon"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Semikolon"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Udråbstegn"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Spørgsmålstegn"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Dobbelt anførselstegn"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Enkelt anførselstegn"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Punktum"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Kvadratrod"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Varemærke"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"De bedste hilsner"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Stjerne"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Pund"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellipse"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Lave dobbelte anførelsestegn"</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="voice_warning_title" msgid="4419354150908395008">"Stemmeinput"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Stemmeinput understøttes i øjeblikket ikke for dit sprog, men fungerer på engelsk."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Stemmeinput anvender Googles stemmegenkendelse. "<a href="http://m.google.com/privacy">"Fortrolighedspolitikken for mobilenheder"</a>" gælder."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Aktiver brugerfeedback"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Vær med til at forbedre denne inputmetode ved at sende anvendelsesstatistikker og rapporter om nedbrud til Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tastaturtema"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Tysk QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Engelsk (Storbritannien)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engelsk (USA)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Tilstand for brugsstudie"</string>
diff --git a/java/res/values-de/donottranslate-more-keys.xml b/java/res/values-de/donottranslate-more-keys.xml
index 80aa32ae2..b8dca393c 100644
--- a/java/res/values-de/donottranslate-more-keys.xml
+++ b/java/res/values-de/donottranslate-more-keys.xml
@@ -18,12 +18,37 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">ä,â,à,á,æ,ã,å,ā</string>
- <string name="more_keys_for_e">3,ė</string>
- <string name="more_keys_for_o">9,ö,ô,ò,ó,õ,œ,ø,ō</string>
- <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string>
- <string name="more_keys_for_s">ß,ś,š</string>
- <string name="more_keys_for_n">ñ,ń</string>
- <string name="more_keys_for_y"></string>
- <string name="more_keys_for_z">6</string>
+ <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+ <string name="more_keys_for_a">\u00e4,\u00e2,\u00e0,\u00e1,\u00e6,\u00e3,\u00e5,\u0101</string>
+ <!-- \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE -->
+ <string name="more_keys_for_e">\u0117</string>
+ <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+ <string name="more_keys_for_o">\u00f6,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u00f8,\u014d</string>
+ <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fc,\u00fb,\u00f9,\u00fa,\u016b</string>
+ <!-- \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u0161: "š" LATIN SMALL LETTER S WITH CARON -->
+ <string name="more_keys_for_s">\u00df,\u015b,\u0161</string>
+ <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u00f1,\u0144</string>
</resources>
diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index d329f3271..a38b85650 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android-Tastatur"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android-Tastatur (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android-Tastatureinstellungen"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Eingabeoptionen"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Rechtschreibprüfung für Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Einstellungen für Rechtschreibprüfung"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Näherungsdaten verwenden"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Tastaturähnl. Abstandsalgorith. für Rechtschreibprüfung verwenden"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Kontaktnamen prüfen"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Rechtschreibprüfung verwendet Einträge aus Ihrer Kontaktliste."</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Bei Tastendruck vibrieren"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Ton bei Tastendruck"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Pop-up bei Tastendruck"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Textkorrektur"</string>
<string name="misc_category" msgid="6894192814868233453">"Sonstige Optionen"</string>
<string name="advanced_settings" msgid="362895144495591463">"Erweiterte Einstellungen"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Optionen für Experten"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: gespeichert"</string>
<string name="label_go_key" msgid="1635148082137219148">"Los"</string>
<string name="label_next_key" msgid="362972844525672568">"Weiter"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Vorh."</string>
<string name="label_done_key" msgid="2441578748772529288">"Fertig"</string>
<string name="label_send_key" msgid="2815056534433717444">"Senden"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Kein Text eingegeben"</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="954941524766465022">"Umschalttaste aktiviert"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Feststelltaste aktiviert"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Komma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punkt"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Öffnende Klammer"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Schließende Klammer"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Doppelpunkt"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Semikolon"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Ausrufezeichen"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Fragezeichen"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Anführungszeichen"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Einfaches Anführungszeichen"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Aufzählungspunkt"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Quadratwurzel"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Trademark"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"c/o"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Sternchen"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Raute"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Auslassungszeichen"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Anführungszeichen unten"</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="voice_warning_title" msgid="4419354150908395008">"Spracheingabe"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Spracheingaben werden zurzeit nicht für Ihre Sprache unterstützt, funktionieren jedoch in Englisch."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Die Spracheingabe verwendet die Spracherkennung von Google. Es gelten die "<a href="http://m.google.com/privacy">"Google Mobile-Datenschutzbestimmungen"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Nutzer-Feedback aktivieren"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Tragen Sie zur Verbesserung dieses Eingabemethodeneditors bei, indem Sie automatisch Nutzungsstatistiken und Absturzberichte an Google senden."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tastaturdesign"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Deutsche QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Englisch (Großbritannien)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Englisch (USA)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modus der Studie zur Benutzerfreundlichkeit"</string>
diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml
index 6fe191ee7..ee2d63c06 100644
--- a/java/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Πληκτρολόγιο Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Πληκτρολόγιο Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Ρυθμίσεις πληκτρολογίου Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Επιλογές εισόδου"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Διόρθωση Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Ρυθμίσεις ορθογραφικού ελέγχου"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Χρ. δεδ. εγγύτ."</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Χρησ. αλγόρ. εγγύτ. τύπου πληκτρ., για ορθ. έλεγχο"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Διόρθωση κειμένου"</string>
<string name="misc_category" msgid="6894192814868233453">"Άλλες επιλογές"</string>
<string name="advanced_settings" msgid="362895144495591463">"Σύνθετες ρυθμίσεις"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Επιλογές για έμπειρους χρήστες"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Αποθηκεύτηκε"</string>
<string name="label_go_key" msgid="1635148082137219148">"Μετ."</string>
<string name="label_next_key" msgid="362972844525672568">"Επόμενο"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Προηγ"</string>
<string name="label_done_key" msgid="2441578748772529288">"Τέλος"</string>
<string name="label_send_key" msgid="2815056534433717444">"Αποστολή"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ΑΒΓ"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Δεν υπάρχει κείμενο"</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="954941524766465022">"Shift ενεργοποιημένο"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock ενεργοποιημένο"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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_comma" msgid="4970844442999724586">"Κόμμα"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Τελεία"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Αριστερή παρένθεση"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Δεξιά παρένθεση"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Άνω και κάτω τελεία"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Ερωτηματικό"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Θαυμαστικό"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Ερωτηματικό"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Διπλά εισαγωγικά"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Μονό εισαγωγικό"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Κουκκίδα"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Τετραγωνική ρίζα"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"πι"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Δέλτα"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Εμπορικό σήμα"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Υπεύθυνος"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Αστερίσκος"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Δίεση"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Αποσιωπητικά"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Χαμηλό διπλό εισαγωγικό"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"Φωνητική είσοδος"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Η φωνητική είσοδος δεν υποστηρίζεται αυτή τη στιγμή για τη γλώσσα σας, ωστόσο λειτουργεί στα Αγγλικά."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Οι φωνητικές εντολές χρησιμοποιούν την τεχνολογία αναγνώρισης φωνής της Google. Ισχύει "<a href="http://m.google.com/privacy">"η Πολιτική Απορρήτου για κινητά"</a>"."</string>
@@ -144,7 +144,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Ενεργοποίηση σχολίων χρηστών"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Βοηθήστε μας να βελτιώσουμε αυτό το πρόγραμμα επεξεργασίας μεθόδου εισόδου στέλνοντας αυτόματα στατιστικά στοιχεία και αναφορές σφαλμάτων στην Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Θέμα πληκτρολογίου"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Γερμανικά QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Αγγλικά (Η.Β.)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Αγγλικά (Η.Π.Α)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Λειτουργία μελέτης χρηστικότητας"</string>
diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml
index a7d50860c..3b86b8542 100644
--- a/java/res/values-en-rGB/strings.xml
+++ b/java/res/values-en-rGB/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android keyboard"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android keyboard (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android keyboard settings"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Input options"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android correction"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Spellchecking settings"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Use proximity data"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Use a keyboard-like proximity algorithm for spellchecking"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Look up contact names"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Spell checker uses entries from your contact list"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrate on key-press"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Sound on key-press"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Pop-up on key press"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Text correction"</string>
<string name="misc_category" msgid="6894192814868233453">"Other Options"</string>
<string name="advanced_settings" msgid="362895144495591463">"Advanced settings"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Options for expert users"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Key pop-up dismiss delay"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"No delay"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Default"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Saved"</string>
<string name="label_go_key" msgid="1635148082137219148">"Go"</string>
<string name="label_next_key" msgid="362972844525672568">"Next"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Prev"</string>
<string name="label_done_key" msgid="2441578748772529288">"Done"</string>
<string name="label_send_key" msgid="2815056534433717444">"Send"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"No text entered"</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="954941524766465022">"Shift enabled"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock enabled"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Comma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Full stop"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Left parenthesis"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Right parenthesis"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Colon"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Semi-colon"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Exclamation mark"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Question mark"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Double quote"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Single quote"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Dot"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Square root"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Trademark"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Care of"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Star"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Pound"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellipsis"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Low double quote"</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="voice_warning_title" msgid="4419354150908395008">"Voice input"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Voice input is not currently supported for your language, but does work in English."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Voice input uses Google\'s speech recognition. "<a href="http://m.google.com/privacy">"The Mobile Privacy Policy"</a>" applies."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Enable user feedback"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Help improve this input method editor by sending usage statistics and crash reports automatically to Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Keyboard theme"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"German QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"English (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"English (US)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Usability study mode"</string>
diff --git a/java/res/values-en/additional-proximitychars.xml b/java/res/values-en/additional-proximitychars.xml
new file mode 100644
index 000000000..0e1276796
--- /dev/null
+++ b/java/res/values-en/additional-proximitychars.xml
@@ -0,0 +1,62 @@
+<?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">
+
+ <string-array name="additional_proximitychars">
+ <!-- Empty entry terminates the proximity chars array. -->
+
+ <!-- Additional proximity chars for a -->
+ <item>a</item>
+ <item>e</item>
+ <item>i</item>
+ <item>o</item>
+ <item>u</item>
+ <item></item>
+ <!-- Additional proximity chars for e -->
+ <item>e</item>
+ <item>a</item>
+ <item>i</item>
+ <item>o</item>
+ <item>u</item>
+ <item></item>
+ <!-- Additional proximity chars for i -->
+ <item>i</item>
+ <item>a</item>
+ <item>e</item>
+ <item>o</item>
+ <item>u</item>
+ <item></item>
+ <!-- Additional proximity chars for o -->
+ <item>o</item>
+ <item>a</item>
+ <item>e</item>
+ <item>i</item>
+ <item>u</item>
+ <item></item>
+ <!-- Additional proximity chars for u -->
+ <item>u</item>
+ <item>a</item>
+ <item>e</item>
+ <item>i</item>
+ <item>o</item>
+ <item></item>
+ </string-array>
+
+</resources> \ No newline at end of file
diff --git a/java/res/values-en/donottranslate-more-keys.xml b/java/res/values-en/donottranslate-more-keys.xml
index bc26c6aa0..9073d3b4f 100644
--- a/java/res/values-en/donottranslate-more-keys.xml
+++ b/java/res/values-en/donottranslate-more-keys.xml
@@ -19,11 +19,11 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="more_keys_for_a">à,á,â,ä,æ,ã,å,ā</string>
- <string name="more_keys_for_e">3,è,é,ê,ë,ē</string>
- <string name="more_keys_for_i">8,î,ï,í,ī,ì</string>
- <string name="more_keys_for_o">9,ô,ö,ò,ó,œ,ø,ō,õ</string>
+ <string name="more_keys_for_e">è,é,ê,ë,ē</string>
+ <string name="more_keys_for_i">î,ï,í,ī,ì</string>
+ <string name="more_keys_for_o">ô,ö,ò,ó,œ,ø,ō,õ</string>
<string name="more_keys_for_s">ß</string>
- <string name="more_keys_for_u">7,û,ü,ù,ú,ū</string>
+ <string name="more_keys_for_u">û,ü,ù,ú,ū</string>
<string name="more_keys_for_n">ñ</string>
<string name="more_keys_for_c">ç</string>
</resources>
diff --git a/java/res/values-en/whitelist.xml b/java/res/values-en/whitelist.xml
index f929cec23..fd79999bf 100644
--- a/java/res/values-en/whitelist.xml
+++ b/java/res/values-en/whitelist.xml
@@ -422,6 +422,10 @@
<item>needn\'t</item>
<item>255</item>
+ <item>nit</item>
+ <item>not</item>
+
+ <item>255</item>
<item>oclock</item>
<item>o\'clock</item>
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index 95e309ff7..1d01a1f52 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Teclado de Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Teclado de Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Configuración de teclado de Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Opciones de entrada"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Corrector de Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Configuración del corrector ortográfico"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Utilizar datos de prox."</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Utilizar algoritmo de prox. de teclado para corrector ortográfico"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Buscar nombres contactos"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"El corrector ortográfico usa entradas de tu lista de contactos."</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar al pulsar teclas"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Sonar al pulsar las teclas"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Aviso emergente al pulsar tecla"</string>
@@ -34,13 +35,14 @@
<string name="correction_category" msgid="2236750915056607613">"Corrección de texto"</string>
<string name="misc_category" msgid="6894192814868233453">"Otras opciones"</string>
<string name="advanced_settings" msgid="362895144495591463">"Configuración avanzada"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opciones para usuarios expertos"</string>
- <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Demora en rechazo de ventana emergente de clave"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
+ <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Retraso en rechazo de alerta de tecla"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Sin demora"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Predeterminada"</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="enable_span_insert" msgid="7204653105667167620">"Habilitar correcciones"</string>
+ <string name="enable_span_insert" msgid="7204653105667167620">"Activar correcciones"</string>
<string name="enable_span_insert_summary" msgid="2947317657871394467">"Establecer sugerencias para realizar correcciones"</string>
<string name="auto_cap" msgid="1719746674854628252">"Mayúsculas automáticas"</string>
<string name="configure_dictionaries_title" msgid="4238652338556902049">"Diccionarios complementarios"</string>
@@ -52,7 +54,7 @@
<string name="prefs_suggestion_visibility_hide_name" msgid="6309143926422234673">"Ocultar siempre"</string>
<string name="prefs_settings_key" msgid="4623341240804046498">"Mostrar tecla de configuración"</string>
<string name="auto_correction" msgid="4979925752001319458">"Corrección automática"</string>
- <string name="auto_correction_summary" msgid="5625751551134658006">"La barra espaciadora y puntuación insertan automáticamente las palabras corregidas"</string>
+ <string name="auto_correction_summary" msgid="5625751551134658006">"La barra espaciadora y las teclas de puntuación insertan automáticamente la palabra corregida"</string>
<string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"Desactivado"</string>
<string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Moderado"</string>
<string name="auto_correction_threshold_mode_aggeressive" msgid="3524029103734923819">"Total"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string>
<string name="label_go_key" msgid="1635148082137219148">"Ir"</string>
<string name="label_next_key" msgid="362972844525672568">"Siguiente"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Ant."</string>
<string name="label_done_key" msgid="2441578748772529288">"Hecho"</string>
<string name="label_send_key" msgid="2815056534433717444">"Enviar"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"No se ingresó texto."</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="954941524766465022">"Mayús habilitada"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Bloqueo de mayúsculas habilitado"</string>
+ <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Se activó el modo Alternancia (toca para inhabilitarlo)."</string>
+ <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Se activó el bloqueo de mayúsculas (toca para inhabilitarlo)."</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Coma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punto"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Paréntesis de apertura"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Paréntesis de cierre"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dos puntos"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Punto y coma"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Signo de admiración"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Signo de interrogación"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Comillas dobles"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Comillas simples"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Punto"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Raíz cuadrada"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Marca registrada"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"En atención de"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Destacar"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Numeral"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Elipsis"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Comillas bajas"</string>
+ <string name="spoken_description_shiftmode_on" msgid="5700440798609574589">"Se habilitó el modo Alternancia."</string>
+ <string name="spoken_description_shiftmode_locked" msgid="593175803181701830">"Se habilitó el bloqueo de mayúsculas."</string>
+ <string name="spoken_description_shiftmode_off" msgid="657219998449174808">"Se inhabilitó el modo Alternancia."</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="voice_warning_title" msgid="4419354150908395008">"Entrada por voz"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"La entrada por voz no está admitida en tu idioma, pero sí funciona en inglés."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"La entrada de voz usa el reconocimiento de voz de Google. "<a href="http://m.google.com/privacy">"Se aplica la política de privacidad para"</a>" celulares."</string>
@@ -128,7 +119,7 @@
<string name="voice_punctuation_hint" msgid="1611389463237317754"><b>"Sugerencia:"</b>" La próxima vez intenta decir la puntuación como \"punto\", \"coma\" o \"signo de pregunta\"."</string>
<string name="cancel" msgid="6830980399865683324">"Cancelar"</string>
<string name="ok" msgid="7898366843681727667">"Aceptar"</string>
- <string name="voice_input" msgid="3583258583521397548">"Clave de entrada de voz"</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>
@@ -141,10 +132,9 @@
<string name="select_language" msgid="3693815588777926848">"Idiomas de entrada"</string>
<string name="hint_add_to_dictionary" msgid="9006292060636342317">"← Tocar de nuevo para guardar"</string>
<string name="has_dictionary" msgid="6071847973466625007">"Diccionario disponible"</string>
- <string name="prefs_enable_log" msgid="6620424505072963557">"Habilitar los comentarios del usuario"</string>
+ <string name="prefs_enable_log" msgid="6620424505072963557">"Activar los comentarios del usuario"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Ayuda a mejorar este editor de método de introducción de texto al enviar las estadísticas de uso y los informes de error a Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema del teclado"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY alemán"</string>
<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="prefs_usability_study_mode" msgid="1261130555134595254">"Modo de estudio de usabilidad"</string>
diff --git a/java/res/values-es/donottranslate-more-keys.xml b/java/res/values-es/donottranslate-more-keys.xml
index d5a8ed19d..644229ad1 100644
--- a/java/res/values-es/donottranslate-more-keys.xml
+++ b/java/res/values-es/donottranslate-more-keys.xml
@@ -18,12 +18,54 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">á,à,ä,â,ã,å,ą,æ,ā,ª</string>
- <string name="more_keys_for_e">3,é,è,ë,ê,ę,ė,ē</string>
- <string name="more_keys_for_i">8,í,ï,ì,î,į,ī</string>
- <string name="more_keys_for_o">9,ó,ò,ö,ô,õ,ø,œ,ō,º</string>
- <string name="more_keys_for_u">7,ú,ü,ù,û,ū</string>
- <string name="more_keys_for_n">ñ,ń</string>
- <string name="more_keys_for_c">ç,ć,č</string>
+ <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u0105: "ą" LATIN SMALL LETTER A WITH OGONEK
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+ \u00aa: "ª" FEMININE ORDINAL INDICATOR -->
+ <string name="more_keys_for_a">\u00e1,\u00e0,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa</string>
+ <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+ <string name="more_keys_for_e">\u00e9,\u00e8,\u00eb,\u00ea,\u0119,\u0117,\u0113</string>
+ <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON -->
+ <string name="more_keys_for_i">\u00ed,\u00ef,\u00ec,\u00ee,\u012f,\u012b</string>
+ <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON
+ \u00ba: "º" MASCULINE ORDINAL INDICATOR -->
+ <string name="more_keys_for_o">\u00f3,\u00f2,\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba</string>
+ <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fa,\u00fc,\u00f9,\u00fb,\u016b</string>
+ <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u00f1,\u0144</string>
+ <!-- \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ \u010d: "č" LATIN SMALL LETTER C WITH CARON -->
+ <string name="more_keys_for_c">\u00e7,\u0107,\u010d</string>
<string name="more_keys_for_punctuation">"\\,,\?,!,¿,¡,:,-,\',\",),(,/,;,+,&amp;,\@"</string>
</resources>
diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index fcd65e1fc..d2a540ef0 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Teclado de Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Teclado Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Ajustes del teclado de Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Opciones introducción texto"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Corrector de Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Ajustes del corrector ortográfico"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Usar datos de proximidad"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Usar algoritmo de proximidad de teclado para corregir la ortografía"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Buscar nombres de contactos"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"El corrector ortográfico usa entradas de tu lista de contactos."</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar al pulsar tecla"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Sonido al pulsar tecla"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Pop-up al pulsar tecla"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Corrección ortográfica"</string>
<string name="misc_category" msgid="6894192814868233453">"Otras opciones"</string>
<string name="advanced_settings" msgid="362895144495591463">"Ajustes avanzados"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opciones para usuarios expertos"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Retraso de rechazo"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Sin retraso"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Predeterminado"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string>
<string name="label_go_key" msgid="1635148082137219148">"Ir"</string>
<string name="label_next_key" msgid="362972844525672568">"Sig."</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Anterior"</string>
<string name="label_done_key" msgid="2441578748772529288">"Ok"</string>
<string name="label_send_key" msgid="2815056534433717444">"Enviar"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"No se ha introducido texto."</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="954941524766465022">"Tecla Mayús habilitada"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Bloq Mayús habilitado"</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">"Suprimir"</string>
<string name="spoken_description_to_symbol" msgid="5486340107500448969">"Símbolos"</string>
<string name="spoken_description_to_alpha" msgid="23129338819771807">"Letras"</string>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Coma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punto"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Paréntesis de apertura"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Paréntesis de cierre"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dos puntos"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Punto y coma"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Signo de exclamación"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Signo de interrogación"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Comillas dobles"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Comillas simples"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Punto"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Raíz cuadrada"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Marca comercial"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Porcentaje"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Asterisco"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Almohadilla"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Puntos suspensivos"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Comillas dobles bajas"</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="voice_warning_title" msgid="4419354150908395008">"Introducción de voz"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Actualmente la introducción de voz no está disponible en tu idioma, pero se puede utilizar en inglés."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"La entrada de voz utiliza el reconocimiento de voz de Google. Se aplica la "<a href="http://m.google.com/privacy">"Política de privacidad de Google para móviles"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Habilitar comentarios de usuarios"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Ayuda a mejorar este editor de método de introducción de texto enviando estadísticas de uso e informes de error a Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema de teclado"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY alemán"</string>
<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="prefs_usability_study_mode" msgid="1261130555134595254">"Modo de estudio de usabilidad"</string>
diff --git a/java/res/values-et/donottranslate-more-keys.xml b/java/res/values-et/donottranslate-more-keys.xml
new file mode 100644
index 000000000..833c71687
--- /dev/null
+++ b/java/res/values-et/donottranslate-more-keys.xml
@@ -0,0 +1,115 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u0105: "ą" LATIN SMALL LETTER A WITH OGONEK -->
+ <string name="more_keys_for_a">\u00e4,\u0101,\u00e0,\u00e1,\u00e2,\u00e3,\u00e5,\u00e6,\u0105</string>
+ <!-- \u0113: "ē" LATIN SMALL LETTER E WITH MACRON
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u011b: "ě" LATIN SMALL LETTER E WITH CARON -->
+ <string name="more_keys_for_e">\u0113,\u00e8,\u0117,\u00e9,\u00ea,\u00eb,\u0119,\u011b</string>
+ <!-- \u012b: "ī" LATIN SMALL LETTER I WITH MACRON
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+ <string name="more_keys_for_i">\u012b,\u00ec,\u012f,\u00ed,\u00ee,\u00ef,\u0131</string>
+ <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+ <string name="more_keys_for_o">\u00f6,\u00f5,\u00f2,\u00f3,\u00f4,\u0153,\u0151,\u00f8</string>
+ <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON
+ \u0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u016f: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+ \u0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+ <string name="more_keys_for_u">\u00fc,\u016b,\u0173,\u00f9,\u00fa,\u00fb,\u016f,\u0171</string>
+ <!-- \u0161: "š" LATIN SMALL LETTER S WITH CARON
+ \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u015f: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
+ <string name="more_keys_for_s">\u0161,\u00df,\u015b,\u015f</string>
+ <!-- \u0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+ \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u0146,\u00f1,\u0144,\u0144</string>
+ <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+ \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+ <string name="more_keys_for_c">\u010d,\u00e7,\u0107</string>
+ <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+ \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+ <string name="more_keys_for_y">\u00fd,\u00ff</string>
+ <!-- \u010f: "ď" LATIN SMALL LETTER D WITH CARON -->
+ <string name="more_keys_for_d">\u010f</string>
+ <!-- \u0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
+ \u0159: "ř" LATIN SMALL LETTER R WITH CARON
+ \u0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE -->
+ <string name="more_keys_for_r">\u0157,\u0159,\u0155</string>
+ <!-- \u0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
+ \u0165: "ť" LATIN SMALL LETTER T WITH CARON -->
+ <string name="more_keys_for_t">\u0163,\u0165</string>
+ <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+ \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+ \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+ <string name="more_keys_for_z">\u017e,\u017c,\u017a</string>
+ <!-- \u0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
+ <string name="more_keys_for_k">\u0137</string>
+ <!-- \u013c: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+ \u0142: "ł" LATIN SMALL LETTER L WITH STROKE
+ \u013a: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+ \u013e: "ľ" LATIN SMALL LETTER L WITH CARON -->
+ <string name="more_keys_for_l">\u013c,\u0142,\u013a,\u013e</string>
+ <!-- \u0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
+ \u011f: "ğ" LATIN SMALL LETTER G WITH BREVE -->
+ <string name="more_keys_for_g">\u0123,\u011f</string>
+ <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
+ <string name="keylabel_for_scandinavia_row1_11">\u00fc</string>
+ <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+ <string name="keylabel_for_scandinavia_row2_10">\u00f6</string>
+ <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+ <string name="keylabel_for_scandinavia_row2_11">\u00e4</string>
+ <!-- \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE -->
+ <string name="more_keys_for_scandinavia_row2_10">\u00f5</string>
+ <string name="more_keys_for_scandinavia_row2_11"></string>
+</resources>
diff --git a/java/res/values-et/strings.xml b/java/res/values-et/strings.xml
index 2c69c99d3..ce7935c80 100644
--- a/java/res/values-et/strings.xml
+++ b/java/res/values-et/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Androidi klaviatuur"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android-klaviatuur (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Androidi klaviatuuriseaded"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Sisestusvalikud"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Androidi parandus"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Õigekirjakontrolli seaded"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Kasuta lähedusandmeid"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Kasuta õigekirjakontrollis klaviatuurisarnast lähedusalgoritmi"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Kontakti nimede kontroll."</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Õigekirjakontroll kasutab teie kontaktisikute loendi sissekandeid"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibreeri klahvivajutusel"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Heli klahvivajutusel"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Klahvivajutusel kuva hüpik"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Teksti parandamine"</string>
<string name="misc_category" msgid="6894192814868233453">"Muud valikud"</string>
<string name="advanced_settings" msgid="362895144495591463">"Täpsemad seaded"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Valikud ekspertkasutajatele"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Hüpiku loobumisviivitus"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Viivituseta"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Vaikeseade"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : salvestatud"</string>
<string name="label_go_key" msgid="1635148082137219148">"Mine"</string>
<string name="label_next_key" msgid="362972844525672568">"Edasi"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Eelm."</string>
<string name="label_done_key" msgid="2441578748772529288">"Valmis"</string>
<string name="label_send_key" msgid="2815056534433717444">"Saada"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Teksti ei ole sisestatud"</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="954941524766465022">"Tõstuklahv on lubatud"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Suurtähelukk on lubatud"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Koma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punkt"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Vasaksulg"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Paremsulg"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Koolon"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Semikoolon"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Hüüumärk"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Küsimärk"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Jutumärgid"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Üksikjutumärgid"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Punkt"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Ruutjuur"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pii"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Kaubamärk"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Vahendaja"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Tärn"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Nael"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Kolmikpunkt"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Alumised jutumärgid"</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="voice_warning_title" msgid="4419354150908395008">"Kõnesisend"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Kõnesisendit ei toetata praegu teie keeles, kuid see töötab inglise keeles."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Kõnesisend kasutab Google\'i kõnetuvastust. Kehtivad "<a href="http://m.google.com/privacy">"Mobile\'i privaatsuseeskirjad"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Luba kasutaja tagasiside"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Saatke Google\'ile automaatselt kasutusstatistikat ja krahhiaruandeid ning aidake seda sisestusmeetodi redigeerijat parandada."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Klaviatuuri teema"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Saksa QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Inglise (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Inglise (USA)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Kasutatavuse uurimisrežiim"</string>
diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml
index 7d8c1e941..954fe9951 100644
--- a/java/res/values-fa/strings.xml
+++ b/java/res/values-fa/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"صفحه کلید Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"صفحه کلید (Android (AOSP"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"تنظیمات صفحه کلید Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"گزینه های ورودی"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"تصحیح Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"تنظیمات غلط گیری املایی"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"استفاده از داده‌های مجاورت"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"استفاده از یک الگوریتم مجاورت مشابه صفحه کلید برای غلط گیری املایی"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"تصحیح متن"</string>
<string name="misc_category" msgid="6894192814868233453">"سایر گزینه ها"</string>
<string name="advanced_settings" msgid="362895144495591463">"تنظیمات پیشرفته"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"گزینه هایی برای کاربران حرفه ای"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : ذخیره شد"</string>
<string name="label_go_key" msgid="1635148082137219148">"برو"</string>
<string name="label_next_key" msgid="362972844525672568">"بعدی"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"قبلی"</string>
<string name="label_done_key" msgid="2441578748772529288">"انجام شد"</string>
<string name="label_send_key" msgid="2815056534433717444">"ارسال"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -80,8 +83,8 @@
<!-- 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="954941524766465022">"Shift فعال است"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock فعال شد"</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>
@@ -92,26 +95,14 @@
<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_comma" msgid="4970844442999724586">"کاما"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"نقطه"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"پرانتز چپ"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"پرانتز راست"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"دو نقطه"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"نقطه ویرگول"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"علامت تعجب"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"علامت سؤال"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"علامت نقل قول"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"علامت نقل قول تکی"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"نقطه"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"ریشه دوم"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"پی"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"دلتا"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"علامت تجاری"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"توسط"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"ستاره"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"پوند"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"سه نقطه"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"علامت نقل قول پایین"</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="voice_warning_title" msgid="4419354150908395008">"ورودی صوتی"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"ورودی صوتی در حال حاضر برای زبان شما پشتیبانی نمی شود اما برای زبان انگلیسی فعال است."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"ورودی صوتی از تشخیص صدای Google استفاده می کند. "<a href="http://m.google.com/privacy">"خط مشی رازداری Mobile "</a>" اعمال می شود."</string>
@@ -148,7 +139,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"فعال کردن بازخورد کاربر"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"با ارسال خودکار آمارهای کاربرد و گزارش های خرابی به Google، به بهبود این ویرایشگر روش ورودی کمک کنید."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"طرح زمینه صفحه کلید"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY آلمانی"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"انگیسی (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"انگیسی (US)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"حالت بررسی قابلیت استفاده"</string>
diff --git a/java/res/values-fi/donottranslate-more-keys.xml b/java/res/values-fi/donottranslate-more-keys.xml
index df67c69ba..af8b00e9a 100644
--- a/java/res/values-fi/donottranslate-more-keys.xml
+++ b/java/res/values-fi/donottranslate-more-keys.xml
@@ -18,13 +18,39 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">æ,à,á,â,ã,ā</string>
- <string name="more_keys_for_o">9,ø,ô,ò,ó,õ,œ,ō</string>
- <string name="more_keys_for_u">7,ü</string>
- <string name="more_keys_for_s">š,ß,ś</string>
- <string name="more_keys_for_z">ž,ź,ż</string>
- <string name="keylabel_for_scandinavia_row2_10">ö</string>
- <string name="keylabel_for_scandinavia_row2_11">ä</string>
- <string name="more_keys_for_scandinavia_row2_10">ø</string>
- <string name="more_keys_for_scandinavia_row2_11">æ</string>
+ <!-- \u00e6: "æ" LATIN SMALL LETTER AE
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+ <string name="more_keys_for_a">\u00e6,\u00e0,\u00e1,\u00e2,\u00e3,\u0101</string>
+ <!-- \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+ <string name="more_keys_for_o">\u00f8,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u014d</string>
+ <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
+ <string name="more_keys_for_u">\u00fc</string>
+ <!-- \u0161: "š" LATIN SMALL LETTER S WITH CARON
+ \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE -->
+ <string name="more_keys_for_s">\u0161,\u00df,\u015b</string>
+ <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+ \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE
+ \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
+ <string name="more_keys_for_z">\u017e,\u017a,\u017c</string>
+ <!-- \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
+ <string name="keylabel_for_scandinavia_row1_11">\u00e5</string>
+ <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+ <string name="keylabel_for_scandinavia_row2_10">\u00f6</string>
+ <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+ <string name="keylabel_for_scandinavia_row2_11">\u00e4</string>
+ <!-- \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+ <string name="more_keys_for_scandinavia_row2_10">\u00f8</string>
+ <!-- \u00e6: "æ" LATIN SMALL LETTER AE -->
+ <string name="more_keys_for_scandinavia_row2_11">\u00e6</string>
</resources>
diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml
index c77cd8107..39110dd48 100644
--- a/java/res/values-fi/strings.xml
+++ b/java/res/values-fi/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android-näppäimistö"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android-näppäimistö (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android-näppäimistön asetukset"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Syöttövalinnat"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android-korjaus"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Oikoluvun asetukset"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Käytä lähestymistietoja"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Käytä näppäimistön kaltaista lähestymisalgoritmia oikolukuun"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Hae kontaktien nimiä"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Oikeinkirjoituksen tarkistus käyttää kontaktiluettelosi tietoja."</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Käytä värinää näppäimiä painettaessa"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Toista ääni näppäimiä painettaessa"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Ponnahdusikkuna painalluksella"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Tekstin korjaus"</string>
<string name="misc_category" msgid="6894192814868233453">"Muut vaihtoehdot"</string>
<string name="advanced_settings" msgid="362895144495591463">"Lisäasetukset"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Valinnat kokeneille käyttäjille"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Näppäimen hylkäysviive"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Ei viivettä"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Oletus"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Tallennettu"</string>
<string name="label_go_key" msgid="1635148082137219148">"Siirry"</string>
<string name="label_next_key" msgid="362972844525672568">"Seur."</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Edell"</string>
<string name="label_done_key" msgid="2441578748772529288">"Valmis"</string>
<string name="label_send_key" msgid="2815056534433717444">"Lähetä"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Ei kirjoitettua tekstiä"</string>
<string name="spoken_description_unknown" msgid="3197434010402179157">"Näppäimen koodi %d"</string>
<string name="spoken_description_shift" msgid="244197883292549308">"Shift"</string>
- <string name="spoken_description_shift_shifted" msgid="954941524766465022">"Shift päällä"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock päällä"</string>
+ <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Vaihto päällä (napauta poistaaksesi käytöstä)"</string>
+ <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock päällä (napauta poistaaksesi käytöstä)"</string>
<string name="spoken_description_delete" msgid="8740376944276199801">"Poisto"</string>
<string name="spoken_description_to_symbol" msgid="5486340107500448969">"Symbolit"</string>
<string name="spoken_description_to_alpha" msgid="23129338819771807">"Kirjaimet"</string>
@@ -88,26 +91,14 @@
<string name="spoken_description_mic" msgid="615536748882611950">"Puheohjaus"</string>
<string name="spoken_description_smiley" msgid="2256309826200113918">"Hymiö"</string>
<string name="spoken_description_return" msgid="8178083177238315647">"Enter"</string>
- <string name="spoken_description_comma" msgid="4970844442999724586">"Pilkku"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Piste"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Vasen sulkumerkki"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Oikea sulkumerkki"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Kaksoispiste"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Puolipiste"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Huutomerkki"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Kysymysmerkki"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Lainausmerkki"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Puolilainausmerkki"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Piste"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Neliöjuuri"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pii"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Tavaramerkki"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"C/O"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Tähti"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Punta"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellipsi"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Rivinalinen lainausmerkki"</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="voice_warning_title" msgid="4419354150908395008">"Äänisyöte"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Äänisyötettä ei vielä tueta kielelläsi, mutta voit käyttää sitä englanniksi."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Äänisyöte käyttää Googlen puheentunnistusta. "<a href="http://m.google.com/privacy">"Mobile-tietosuojakäytäntö"</a>" on voimassa."</string>
@@ -123,7 +114,7 @@
<string name="voice_server_error" msgid="7807129913977261644">"Palvelinvirhe"</string>
<string name="voice_speech_timeout" msgid="8461817525075498795">"Puhetta ei kuulu"</string>
<string name="voice_no_match" msgid="4285117547030179174">"Ei vastineita"</string>
- <string name="voice_not_installed" msgid="5552450909753842415">"Äänihakua ei asennettu"</string>
+ <string name="voice_not_installed" msgid="5552450909753842415">"Puhehakua ei asennettu"</string>
<string name="voice_swipe_hint" msgid="6943546180310682021"><b>"Vihje:"</b>" liu\'uta sormea näppäimistöllä ja puhu"</string>
<string name="voice_punctuation_hint" msgid="1611389463237317754"><b>"Vihje:"</b>" kokeile seuraavalla kerralla puhua välimerkit, kuten \"period\" (piste), \"comma\" (pilkku) tai \"question mark\" (kysymysmerkki)."</string>
<string name="cancel" msgid="6830980399865683324">"Peruuta"</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Ota käyttäjäpalaute käyttöön"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Auta parantamaan tätä syöttötavan muokkausohjelmaa lähettämällä automaattisesti käyttötietoja ja kaatumisraportteja Googlelle."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Näppäimistöteema"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"saksa, QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"englanti (Iso-Britannia)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"englanti (Yhdysvallat)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Käytettävyystutkimustila"</string>
diff --git a/java/res/values-fr/donottranslate-more-keys.xml b/java/res/values-fr/donottranslate-more-keys.xml
index cd6d49bad..ac731afc5 100644
--- a/java/res/values-fr/donottranslate-more-keys.xml
+++ b/java/res/values-fr/donottranslate-more-keys.xml
@@ -18,14 +18,51 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">à,â,1,æ,á,ä,ã,å,ā,ª</string>
- <string name="more_keys_for_e">é,è,ê,ë,3,ę,ė,ē</string>
- <string name="more_keys_for_i">î,8,ï,ì,í,į,ī</string>
- <string name="more_keys_for_o">ô,œ,9,ö,ò,ó,õ,ø,ō,º</string>
- <string name="more_keys_for_u">ù,û,7,ü,ú,ū</string>
- <string name="more_keys_for_c">ç,ć,č</string>
- <string name="more_keys_for_y">6,ÿ</string>
- <string name="more_keys_for_q"></string>
- <string name="more_keys_for_w"></string>
- <string name="more_keys_for_z">2</string>
+ <!-- \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+ \u00aa: "ª" FEMININE ORDINAL INDICATOR -->
+ <string name="more_keys_for_a">\u00e0,\u00e2,%,\u00e6,\u00e1,\u00e4,\u00e3,\u00e5,\u0101,\u00aa</string>
+ <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+ <string name="more_keys_for_e">\u00e9,\u00e8,\u00ea,\u00eb,%,\u0119,\u0117,\u0113</string>
+ <!-- \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON -->
+ <string name="more_keys_for_i">\u00ee,%,\u00ef,\u00ec,\u00ed,\u012f,\u012b</string>
+ <!-- \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON
+ \u00ba: "º" MASCULINE ORDINAL INDICATOR -->
+ <string name="more_keys_for_o">\u00f4,\u0153,%,\u00f6,\u00f2,\u00f3,\u00f5,\u00f8,\u014d,\u00ba</string>
+ <!-- \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00f9,\u00fb,%,\u00fc,\u00fa,\u016b</string>
+ <!-- \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ \u010d: "č" LATIN SMALL LETTER C WITH CARON -->
+ <string name="more_keys_for_c">\u00e7,\u0107,\u010d</string>
+ <!-- \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+ <string name="more_keys_for_y">%,\u00ff</string>
</resources>
diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index 7b89edd54..d53e65bae 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Clavier Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Clavier Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Paramètres du clavier Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Options de saisie"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Correcteur Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Paramètre du correcteur orthographique"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Utiliser données proximité"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Utiliser algorithme de proximité clavier pour correcteur ortho"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Rechercher noms contacts"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Correcteur orthographique utilise entrées de liste de contacts."</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrer à chaque touche"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Son à chaque touche"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Agrandir les caractères"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Correction du texte"</string>
<string name="misc_category" msgid="6894192814868233453">"Autres options"</string>
<string name="advanced_settings" msgid="362895144495591463">"Paramètres avancés"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Options destinées aux utilisateurs expérimentés"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Masquer touche agrandie"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Sans délai"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Par défaut"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : enregistré"</string>
<string name="label_go_key" msgid="1635148082137219148">"OK"</string>
<string name="label_next_key" msgid="362972844525672568">"Suiv."</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Préc."</string>
<string name="label_done_key" msgid="2441578748772529288">"OK"</string>
<string name="label_send_key" msgid="2815056534433717444">"Envoi"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Aucun texte saisi"</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="954941524766465022">"Touche Maj activée"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Verrouillage des majuscules activé"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Virgule"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Point"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Parenthèse gauche"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Parenthèse droite"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Deux-points"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Point-virgule"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Point d\'exclamation"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Point d\'interrogation"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Guillemets doubles"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Apostrophe"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Point"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Racine carrée"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Marque commerciale"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"à l\'attention de"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Étoile"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Dièse"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellipse"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Guillemets bas doubles"</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="voice_warning_title" msgid="4419354150908395008">"Saisie vocale"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"La saisie vocale n\'est pas encore prise en charge pour votre langue, mais elle fonctionne en anglais."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"La saisie vocale fait appel à la reconnaissance vocale de Google. Les "<a href="http://m.google.com/privacy">"Règles de confidentialité Google Mobile"</a>" s\'appliquent."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Autoriser les commentaires des utilisateurs"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Contribuer à l\'amélioration de cet éditeur du mode de saisie grâce à l\'envoi automatique de statistiques d\'utilisation et de rapports d\'incident à Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Thème du clavier"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Clavier QWERTY allemand"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Anglais (Royaume-Uni)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Anglais (États-Unis)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Mode d\'étude de l\'utilisabilité"</string>
diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml
index de95ab8d7..fc3e9fdfe 100644
--- a/java/res/values-hi/strings.xml
+++ b/java/res/values-hi/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android कीबोर्ड"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android कीबोर्ड (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android कीबोर्ड सेटिंग"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"इनपुट विकल्‍प"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android correction"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"वर्तनी जांच सेटिंग"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"निकटस्थ डेटा उपयोग करें"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"वर्तनी जांचने के लि‍ए कीबोर्ड जैसे नि‍कटस्‍थ एल्‍गोरि‍दम का उपयोग करें"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"पाठ सुधार"</string>
<string name="misc_category" msgid="6894192814868233453">"अन्य विकल्प"</string>
<string name="advanced_settings" msgid="362895144495591463">"उन्नत सेटिंग"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"विशेषज्ञ उपयोगकर्ताओं के लिए विकल्‍प"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: सहेजा गया"</string>
<string name="label_go_key" msgid="1635148082137219148">"जाएं"</string>
<string name="label_next_key" msgid="362972844525672568">"अगला"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"पिछला"</string>
<string name="label_done_key" msgid="2441578748772529288">"पूर्ण"</string>
<string name="label_send_key" msgid="2815056534433717444">"भेजें"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"कोई पाठ दर्ज नहीं किया गया"</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="954941524766465022">"शिफ़्ट सक्षम किया गया है"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"कैप्स लॉक सक्षम किया गया है"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"अल्पविराम"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"पूर्णविराम"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"बायां कोष्ठक"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"दायां कोष्ठक"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"अपूर्ण विराम"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"अर्द्धविराम"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"विस्मयादिबोधक चिह्न"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"प्रश्नचिह्न"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"दोहरा उद्धरण"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"एकल उद्धरण"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"बिंदु"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"वर्गमूल"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"पाइ"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"डेल्टा"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"ट्रेडमार्क"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"संरक्षक"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"तारा"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"पाउंड"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"पदलोप चिह्न"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"निम्न दोहरा उद्धरण"</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="voice_warning_title" msgid="4419354150908395008">"ध्‍वनि इनपुट"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"ध्‍वनि इनपुट आपकी भाषा के लिए अभी समर्थित नहीं है, पर अंग्रेज़ी में कार्य करता है."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"ध्‍वनि इनपुट Google की वाक् पहचान का उपयोग करता है. "<a href="http://m.google.com/privacy">"मोबाइल गोपनीयता नीति"</a>" लागू होती है."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"उपयोगकर्ता फ़ीडबैक सक्षम करें"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"उपयोग के आंकड़े और क्रैश रिपोर्ट Google को स्वचालित रूप से भेज कर इस इनपुट पद्धति संपादक को बेहतर बनाने में सहायता करें."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"कीबोर्ड थीम"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"जर्मन QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"अंग्रेज़ी (यूके)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"अंग्रेज़ी (यूएस)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"उपयोगिता अध्ययन मोड"</string>
diff --git a/java/res/values-hr/donottranslate-more-keys.xml b/java/res/values-hr/donottranslate-more-keys.xml
index c34e0e646..9ec04f7dd 100644
--- a/java/res/values-hr/donottranslate-more-keys.xml
+++ b/java/res/values-hr/donottranslate-more-keys.xml
@@ -18,10 +18,22 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_s">š,ś,ß</string>
- <string name="more_keys_for_n">ñ,ń</string>
+ <!-- \u0161: "š" LATIN SMALL LETTER S WITH CARON
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u00df: "ß" LATIN SMALL LETTER SHARP S -->
+ <string name="more_keys_for_s">\u0161,\u015b,\u00df</string>
+ <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u00f1,\u0144</string>
<string name="more_keys_for_y"></string>
- <string name="more_keys_for_z">6,ž,ź,ż</string>
- <string name="more_keys_for_c">č,ć,ç</string>
- <string name="more_keys_for_d">đ</string>
+ <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+ \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE
+ \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
+ <string name="more_keys_for_z">\u017e,\u017a,\u017c</string>
+ <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
+ <string name="more_keys_for_c">\u010d,\u0107,\u00e7</string>
+ <!-- \u0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
+ <string name="more_keys_for_d">\u0111</string>
</resources>
diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml
index 30c20b3cc..b537caf15 100644
--- a/java/res/values-hr/strings.xml
+++ b/java/res/values-hr/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android tipkovnica"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android tipkovnica (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Postavke tipkovnice za Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Opcije ulaza"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Ispravak za Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Postavke provjere pravopisa"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Upotreba podataka blizine"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Za prov. pravopisa upotrijebi algoritam blizine kao na tipkovnici"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Potražite imena kontakata"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Provjera pravopisa upotrebljava unose iz vašeg popisa kontakata"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibracija pri pritisku na tipku"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Zvuk pri pritisku tipke"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Povećanja na pritisak tipke"</string>
@@ -34,8 +35,9 @@
<string name="correction_category" msgid="2236750915056607613">"Ispravak teksta"</string>
<string name="misc_category" msgid="6894192814868233453">"Ostale opcije"</string>
<string name="advanced_settings" msgid="362895144495591463">"Napredne postavke"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opcije za stručne korisnike"</string>
- <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Bez odgode klj. skočnih"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
+ <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Odgoda prikaza tipki"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez odgode"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Zadano"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Predlaži imena kontakata"</string>
@@ -52,7 +54,7 @@
<string name="prefs_suggestion_visibility_hide_name" msgid="6309143926422234673">"Uvijek sakrij"</string>
<string name="prefs_settings_key" msgid="4623341240804046498">"Prikaži tipku postavki"</string>
<string name="auto_correction" msgid="4979925752001319458">"Samoispravak"</string>
- <string name="auto_correction_summary" msgid="5625751551134658006">"Razm. i intrp. aut. ispr. kr. rči."</string>
+ <string name="auto_correction_summary" msgid="5625751551134658006">"Razmak i interpunkcija automatski ispravljaju krive riječi"</string>
<string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"Isključeno"</string>
<string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Skromno"</string>
<string name="auto_correction_threshold_mode_aggeressive" msgid="3524029103734923819">"Agresivno"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Spremljeno"</string>
<string name="label_go_key" msgid="1635148082137219148">"Idi"</string>
<string name="label_next_key" msgid="362972844525672568">"Dalje"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Pret."</string>
<string name="label_done_key" msgid="2441578748772529288">"Gotovo"</string>
<string name="label_send_key" msgid="2815056534433717444">"Pošalji"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Nije unesen tekst"</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="954941524766465022">"Shift je omogućen"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps Lock omogućen"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Zarez"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Točka"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Lijeva zagrada"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Desna zagrada"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dvotočka"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Točka-zarez"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Uskličnik"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Upitnik"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Dvostruki navodnici"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Jednostruki navodnici"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Točka"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Kvadratni korijen"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Zaštitni znak"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"U ruke"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Zvjezdica"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"funta"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Tri točke"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Donji dvostruki navodnici"</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="voice_warning_title" msgid="4419354150908395008">"Glasovni ulaz"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Vaš jezik trenutno nije podržan za glasovni unos, ali radi za engleski."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Glasovni unos upotrebljava Googleovo prepoznavanje govora. Primjenjuju se "<a href="http://m.google.com/privacy">"Pravila o privatnosti za uslugu Mobile"</a>"."</string>
@@ -132,7 +123,7 @@
<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">"Mik. na gl. tipk."</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="selectInputMethod" msgid="315076553378705821">"Odabir ulazne metode"</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Omogući korisničke povratne informacije"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Pomozite u poboljšanju ovog urednika ulazne metode automatskim slanjem statistike upotrebe i padova Googleu."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema tipkovnice"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"njemački QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Engleski (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engleski (SAD)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Način studije upotrebljivosti"</string>
diff --git a/java/res/values-hu/donottranslate-more-keys.xml b/java/res/values-hu/donottranslate-more-keys.xml
index 42b330199..b707c53e6 100644
--- a/java/res/values-hu/donottranslate-more-keys.xml
+++ b/java/res/values-hu/donottranslate-more-keys.xml
@@ -18,11 +18,45 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">á,à,â,ä,æ,ã,å,ā</string>
- <string name="more_keys_for_e">3,é,è,ê,ë,ę,ė,ē</string>
- <string name="more_keys_for_i">8,í,î,ï,ì,į,ī</string>
- <string name="more_keys_for_o">9,ó,ö,ő,ô,ò,õ,œ,ø,ō</string>
- <string name="more_keys_for_u">7,ú,ü,ű,û,ù,ū</string>
- <string name="more_keys_for_y"></string>
- <string name="more_keys_for_z">6</string>
+ <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+ <string name="more_keys_for_a">\u00e1,\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101</string>
+ <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+ <string name="more_keys_for_e">\u00e9,\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113</string>
+ <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON -->
+ <string name="more_keys_for_i">\u00ed,\u00ee,\u00ef,\u00ec,\u012f,\u012b</string>
+ <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+ <string name="more_keys_for_o">\u00f3,\u00f6,\u0151,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d</string>
+ <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fa,\u00fc,\u0171,\u00fb,\u00f9,\u016b</string>
</resources>
diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml
index 180b6fcf9..dc094cb3b 100644
--- a/java/res/values-hu/strings.xml
+++ b/java/res/values-hu/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android-billentyűzet"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android-billentyűzet (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android billentyűzetbeállítások"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Beviteli beállítások"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android korrekció"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Helyesírás-ellenőrzés beállításai"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Közelségi adatok haszn."</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Billentyűzetszerű algoritmus a helyesírás-ellenőrzéshez"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Névjegyek keresése"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"A helyesírás-ellenőrző használja a névjegyek bejegyzéseit"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Rezgés billentyű megnyomása esetén"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Hangjelzés billentyű megnyomása esetén"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Legyen nagyobb billentyű lenyomásakor"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Szövegjavítás"</string>
<string name="misc_category" msgid="6894192814868233453">"Egyéb beállítások"</string>
<string name="advanced_settings" msgid="362895144495591463">"Speciális beállítások"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Beállítások gyakorlott felhasználóknak"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Gombeltüntetés késése"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Nincs késés"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Alapbeállítás"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : mentve"</string>
<string name="label_go_key" msgid="1635148082137219148">"Ugrás"</string>
<string name="label_next_key" msgid="362972844525672568">"Tovább"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Előző"</string>
<string name="label_done_key" msgid="2441578748772529288">"Kész"</string>
<string name="label_send_key" msgid="2815056534433717444">"Küldés"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Szöveg nincs megadva"</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="954941524766465022">"Shift engedélyezve"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock bekapcsolva"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Vessző"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Pont"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Nyitó zárójel"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Berekesztő zárójel"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Kettőspont"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Pontosvessző"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Felkiáltójel"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Kérdőjel"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Dupla idézőjel"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Szimpla idézőjel"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Pont"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Négyzetgyök"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Védjegy"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Százalék"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Csillag"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Kettős kereszt"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Kihagyás"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Alsó dupla idézőjel"</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="voice_warning_title" msgid="4419354150908395008">"Hangbevitel"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"A hangbevitel szolgáltatás jelenleg nem támogatja az Ön nyelvét, ám angolul működik."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"A hangbevitel a Google beszédfelismerő technológiáját használja, amelyre a "<a href="http://m.google.com/privacy">"Mobil adatvédelmi irányelvek"</a>" érvényesek."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Felhasználói visszajelzés engedélyezése"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Segíthet ennek a beviteli módszernek a javításában, ha engedélyezi a használati statisztikák és a hibajelentések elküldését a Google-nak."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Billentyűzettéma"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Német QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"angol (brit)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"angol (amerikai)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Használhatósági teszt"</string>
diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml
index a023b6477..364e360d3 100644
--- a/java/res/values-in/strings.xml
+++ b/java/res/values-in/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Keyboard Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Keyboard Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Setelan keyboard Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Opsi masukan"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Koreksi android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Setelan pemeriksaan ejaan"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Gunakan data kedekatan"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Gunakan algoritme kedekatan seperti keyboard untuk memeriksa ejaan"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Cari nama kenalan"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Pemeriksa ejaan menggunakan entri dari daftar kenalan Anda"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Getar jika tombol ditekan"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Berbunyi jika tombol ditekan"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Muncul saat tombol ditekan"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Koreksi teks"</string>
<string name="misc_category" msgid="6894192814868233453">"Opsi lain"</string>
<string name="advanced_settings" msgid="362895144495591463">"Setelan lanjutan"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Pilihan untuk pengguna ahli"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tundaan singkir munculan kunci"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Tanpa penundaan"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Bawaan"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Telah disimpan"</string>
<string name="label_go_key" msgid="1635148082137219148">"Buka"</string>
<string name="label_next_key" msgid="362972844525672568">"Berikutnya"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Sblm"</string>
<string name="label_done_key" msgid="2441578748772529288">"Selesai"</string>
<string name="label_send_key" msgid="2815056534433717444">"Kirimkan"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Tidak ada teks yang dimasukkan"</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="954941524766465022">"Shift diaktifkan"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock diaktifkan"</string>
+ <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift aktif (ketuk untuk menonaktifkan)"</string>
+ <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps lock aktif (ketuk untuk menonaktifkan)"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Koma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Titik"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Kurung tutup"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Kurung buka"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Titik Dua"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Titik koma"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Tanda seru"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Tanda tanya"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Tanda petik"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Petik tunggal"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Titik"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Akar pangkat dua"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Merek dagang"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Dengan alamat"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Bintang"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Pon"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Elipsis"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Tanda petik bawah"</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 ponsel"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Mode simbol ponsel"</string>
<string name="voice_warning_title" msgid="4419354150908395008">"Masukan suara"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Masukan suara saat ini tidak didukung untuk bahasa Anda, tetapi bekerja dalam Bahasa Inggris."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Masukan suara menggunakan pengenalan ucapan Google. "<a href="http://m.google.com/privacy">"Kebijakan Privasi Seluler"</a>" berlaku."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Aktifkan umpan balik pengguna"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Bantu tingkatkan metode editor masukan dengan mengirim statistik penggunaan dan laporan kerusakan ke Google secara otomatis."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema keyboard"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY Jerman"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Inggris (Inggris)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Inggris (AS)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modus studi daya guna"</string>
diff --git a/java/res/values-it/donottranslate-more-keys.xml b/java/res/values-it/donottranslate-more-keys.xml
index fa1537bec..01a4c5f5f 100644
--- a/java/res/values-it/donottranslate-more-keys.xml
+++ b/java/res/values-it/donottranslate-more-keys.xml
@@ -18,9 +18,45 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">à,á,â,ä,æ,ã,å,ā,ª</string>
- <string name="more_keys_for_e">3,è,é,ê,ë,ę,ė,ē</string>
- <string name="more_keys_for_i">8,ì,í,î,ï,į,ī</string>
- <string name="more_keys_for_o">9,ò,ó,ô,ö,õ,œ,ø,ō,º</string>
- <string name="more_keys_for_u">7,ù,ú,û,ü,ū</string>
+ <!-- \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+ \u00aa: "ª" FEMININE ORDINAL INDICATOR -->
+ <string name="more_keys_for_a">\u00e0,\u00e1,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101,\u00aa</string>
+ <!-- \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+ <string name="more_keys_for_e">\u00e8,\u00e9,\u00ea,\u00eb,\u0119,\u0117,\u0113</string>
+ <!-- \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON -->
+ <string name="more_keys_for_i">\u00ec,\u00ed,\u00ee,\u00ef,\u012f,\u012b</string>
+ <!-- \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON
+ \u00ba: "º" MASCULINE ORDINAL INDICATOR -->
+ <string name="more_keys_for_o">\u00f2,\u00f3,\u00f4,\u00f6,\u00f5,\u0153,\u00f8,\u014d,\u00ba</string>
+ <!-- \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00f9,\u00fa,\u00fb,\u00fc,\u016b</string>
</resources>
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index 58c0e2c3b..b256c6c1e 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Tastiera Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Tastiera Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Impostazioni tastiera Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Opzioni inserimento"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Correzione Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Impostazioni di controllo ortografico"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Usa i dati di prossimità"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Usa algoritmo prossimità (come in tastiere) per controllo ortografico"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Cerca in nomi contatti"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"La funzione di controllo ortografico usa voci dell\'elenco contatti"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrazione tasti"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Suono tasti"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Popup sui tasti"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Correzione testo"</string>
<string name="misc_category" msgid="6894192814868233453">"Altre opzioni"</string>
<string name="advanced_settings" msgid="362895144495591463">"Impostazioni avanzate"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opzioni per utenti esperti"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Ritardo eliminaz. popup tasto"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Nessun ritardo"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Predefinito"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : parola salvata"</string>
<string name="label_go_key" msgid="1635148082137219148">"Vai"</string>
<string name="label_next_key" msgid="362972844525672568">"Avanti"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Prec."</string>
<string name="label_done_key" msgid="2441578748772529288">"Fine"</string>
<string name="label_send_key" msgid="2815056534433717444">"Invia"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Nessun testo inserito"</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="954941524766465022">"Maiuscolo attivo"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Blocco maiuscole attivo"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Virgola"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punto"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Parentesi aperta"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Parentesi chiusa"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Due punti"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Punto e virgola"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Punto esclamativo"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Punto interrogativo"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Virgolette doppie"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Virgolette semplici"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Pallino"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Radice quadrata"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi greco"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Marchio commerciale"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Presso"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Asterisco"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Cancelletto"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellissi"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Virgolette doppie basse"</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="voice_warning_title" msgid="4419354150908395008">"Comandi vocali"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"I comandi vocali non sono attualmente supportati per la tua lingua ma funzionano in inglese."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"L\'input vocale utilizza il riconoscimento vocale di Google. Sono valide le "<a href="http://m.google.com/privacy">"norme sulla privacy di Google Mobile"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Attiva commenti degli utenti"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Aiuta a migliorare l\'editor del metodo di inserimento inviando automaticamente a Google statistiche sull\'utilizzo e segnalazioni sugli arresti anomali."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema della tastiera"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY tedesca"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Inglese (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Inglese (USA)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modalità Studio sull\'usabilità"</string>
diff --git a/java/res/values-iw/donottranslate-more-keys.xml b/java/res/values-iw/donottranslate-more-keys.xml
index 829486f7b..32dc11146 100644
--- a/java/res/values-iw/donottranslate-more-keys.xml
+++ b/java/res/values-iw/donottranslate-more-keys.xml
@@ -18,6 +18,54 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_star">★</string>
- <string name="more_keys_for_plus">±,﬩</string>
+ <!-- \u2605: "★" BLACK STAR -->
+ <string name="more_keys_for_star">\u2605</string>
+ <!-- \u00b1: "±" PLUS-MINUS SIGN
+ \ufb29: "﬩" HEBREW LETTER ALTERNATIVE PLUS SIGN -->
+ <string name="more_keys_for_plus">\u00b1,\ufb29</string>
+ <!-- The all letters need to be mirrored are found at
+ http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
+ <!-- 0x0029: ")" RIGHT PARENTHESIS -->
+ <integer name="keycode_for_left_parenthesis">0x0029</integer>
+ <!-- 0x0028: "(" LEFT PARENTHESIS -->
+ <integer name="keycode_for_right_parenthesis">0x0028</integer>
+ <string name="more_keys_for_left_parenthesis">[|],{|},&lt;|&gt;</string>
+ <string name="more_keys_for_right_parenthesis">]|[,}|{,&gt;|&lt;</string>
+ <!-- 0x003e: ">" GREATER-THAN SIGN -->
+ <integer name="keycode_for_less_than">0x003e</integer>
+ <!-- 0x003c: "<" LESS-THAN SIGN -->
+ <integer name="keycode_for_greater_than">0x003c</integer>
+ <!-- \u2264: "≤" LESS-THAN OR EQUAL TO
+ \u2265: "≥" GREATER-THAN EQUAL TO
+ \u00ab: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ \u00bb: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+ \u2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+ \u203a: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+ The following characters don't need BIDI mirroring.
+ \u2018: "‘" LEFT SINGLE QUOTATION MARK
+ \u2019: "’" RIGHT SINGLE QUOTATION MARK
+ \u201a: "‚" SINGLE LOW-9 QUOTATION MARK
+ \u201b: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+ \u201c: "“" LEFT DOUBLE QUOTATION MARK
+ \u201d: "”" RIGHT DOUBLE QUOTATION MARK
+ \u201e: "„" DOUBLE LOW-9 QUOTATION MARK
+ \u201f: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+ <string name="more_keys_for_less_than">\u2264|\u2265,\u00ab|\u00bb,\u2039|\u203a</string>
+ <string name="more_keys_for_greater_than">\u2265|\u2264,\u00bb|\u00ab,\u203a|\u2039</string>
+ <!-- 0x005d: "]" RIGHT SQUARE BRACKET -->
+ <integer name="keycode_for_left_square_bracket">0x005d</integer>
+ <!-- 0x005b: "[" LEFT SQUARE BRACKET -->
+ <integer name="keycode_for_right_square_bracket">0x005b</integer>
+ <!-- 0x007d: "}" RIGHT CURLY BRACKET -->
+ <integer name="keycode_for_left_curly_bracket">0x007d</integer>
+ <!-- 0x007b: "{" LEFT CURLY BRACKET -->
+ <integer name="keycode_for_right_curly_bracket">0x007b</integer>
+ <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+ <!-- <string name="more_keys_for_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb</string> -->
+ <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
+ <string name="more_keys_for_double_quote">\u201d,\u00ab|\u00bb,\u201c,\u00bb|\u00ab</string>
+ <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+ <!-- <string name="more_keys_for_tablet_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb,\u2018,\u2019,\u201a,\u201b</string> -->
+ <!-- The 8-more keys with maxMoreKeysColumn=4 will be displayed in order of "3,1,2,4|7,5,6,8". -->
+ <string name="more_keys_for_tablet_double_quote">\u201d,\u00ab|\u00bb,\u201c,\u00bb|\u00ab,\u2019,\u201a,\u2018,\u201b</string>
</resources>
diff --git a/java/res/values-iw/donottranslate.xml b/java/res/values-iw/donottranslate.xml
new file mode 100644
index 000000000..a9aad4e3c
--- /dev/null
+++ b/java/res/values-iw/donottranslate.xml
@@ -0,0 +1,25 @@
+<?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 -->
+ <string name="suggested_punctuations">!,?,\\,,:,;,\u0022,(|),)|(,\u0027,-,/,@,_</string>
+</resources>
diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml
index 292517c68..baca298ce 100644
--- a/java/res/values-iw/strings.xml
+++ b/java/res/values-iw/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"מקלדת Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"מקלדת Android ‏(AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"הגדרות מקלדת של Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"אפשרויות קלט"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"תיקון Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"הגדרות בדיקת איות"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"שימוש בנתוני הקירבה"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"השתמש באלגוריתם קירבה דמוי-מקלדת עבור בדיקת איות"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"תיקון טקסט"</string>
<string name="misc_category" msgid="6894192814868233453">"אפשרויות אחרות"</string>
<string name="advanced_settings" msgid="362895144495591463">"הגדרות מתקדמות"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"אפשרויות עבור משתמשים מתקדמים"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : נשמרה"</string>
<string name="label_go_key" msgid="1635148082137219148">"בצע"</string>
<string name="label_next_key" msgid="362972844525672568">"הבא"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"הקודם"</string>
<string name="label_done_key" msgid="2441578748772529288">"סיום"</string>
<string name="label_send_key" msgid="2815056534433717444">"שלח"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"אבג"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"לא הוזן טקסט"</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="954941524766465022">"Shift מופעל"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps Lock מופעל"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"פסיק"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"נקודה"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"סוגריים שמאליים"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"סוגריים ימניים"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"נקודתיים"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"נקודה פסיק"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"סימן קריאה"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"סימן שאלה"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"מרכאות כפולות"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"גרש בודד"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"נקודה"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"שורש ריבועי"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"פאי"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"דלתה"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"סימן מסחרי"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"לכבוד"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"כוכב"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"סולמית"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"שלוש נקודות"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"מרכאות כפולות תחתונות"</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="voice_warning_title" msgid="4419354150908395008">"קלט קולי"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"קלט קולי אינו נתמך בשלב זה בשפתך, אך הוא פועל באנגלית."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"קלט קולי משתמש בזיהוי דיבור של Google.‏ "<a href="http://m.google.com/privacy">"מדיניות הפרטיות של \'Google לנייד\'"</a>" חלה במקרה זה."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"הפוך משוב ממשתמשים לפעיל"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"עזור לשפר את עורך שיטת הקלט על ידי שליחה אוטומטית של סטטיסטיקת שימוש ודוחות קריסת מחשב ל-Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"עיצוב מקלדת"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"מקלדת QWERTY גרמנית"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"אנגלית (בריטניה)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"אנגלית (ארה\"ב)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"מצב מחקר שימושיות"</string>
diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index 540bb4688..c7e06fe7b 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Androidキーボード"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Androidキーボード(AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Androidキーボードの設定"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"入力オプション"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Androidスペルチェッカー"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"スペルチェックの設定"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"近接データを使用"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"スペルチェックでキーボードと同じような近接アルゴリズムを使用する"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"テキストの修正"</string>
<string name="misc_category" msgid="6894192814868233453">"他のオプション"</string>
<string name="advanced_settings" msgid="362895144495591463">"詳細設定"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"上級ユーザー向けオプション"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>:保存しました"</string>
<string name="label_go_key" msgid="1635148082137219148">"実行"</string>
<string name="label_next_key" msgid="362972844525672568">"次へ"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"前"</string>
<string name="label_done_key" msgid="2441578748772529288">"完了"</string>
<string name="label_send_key" msgid="2815056534433717444">"送信"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"テキストが入力されていません"</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="954941524766465022">"Shift有効"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock有効"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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_comma" msgid="4970844442999724586">"カンマ"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"ピリオド"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"左かっこ"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"右かっこ"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"コロン"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"セミコロン"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"感嘆符"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"疑問符"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"二重引用符"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"単一引用符"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"中点"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"平方根"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"円周率記号"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"デルタ"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"商標記号"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"宛名記号"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"アスタリスク"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"ナンバー記号"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"省略記号"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"下付き二重引用符"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"音声入力"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"音声入力は現在英語には対応していますが、日本語には対応していません。"</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"音声入力ではGoogleの音声認識技術を利用します。"<a href="http://m.google.com/privacy">"モバイルプライバシーポリシー"</a>"が適用されます。"</string>
@@ -144,7 +144,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"ユーザーフィードバックを有効にする"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"IMEの機能向上のため、使用統計状況やクラッシュレポートをGoogleに自動送信します。"</string>
<string name="keyboard_layout" msgid="8451164783510487501">"キーボードのテーマ"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"ドイツ語QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"英語(英国)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"英語(米国)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"使いやすさの研究モード"</string>
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index bc2b6289c..746d76a1a 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android 키보드"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android 키보드(AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android 키보드 설정"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"입력 옵션"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android 교정"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"맞춤법 검사 설정"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"근접 데이터 사용"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"맞춤법 검사에 대해 키보드와 유사한 근접 알고리즘 사용"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"텍스트 수정"</string>
<string name="misc_category" msgid="6894192814868233453">"기타 옵션"</string>
<string name="advanced_settings" msgid="362895144495591463">"고급 설정"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"전문 사용자용 옵션"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: 저장됨"</string>
<string name="label_go_key" msgid="1635148082137219148">"이동"</string>
<string name="label_next_key" msgid="362972844525672568">"다음"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"이전"</string>
<string name="label_done_key" msgid="2441578748772529288">"완료"</string>
<string name="label_send_key" msgid="2815056534433717444">"전송"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"입력한 텍스트 없음"</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="954941524766465022">"Shift 키 누름"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps Lock 키 켜짐"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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_comma" msgid="4970844442999724586">"쉼표"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"마침표"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"왼쪽 괄호"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"오른쪽 괄호"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"콜론"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"세미콜론"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"느낌표"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"물음표"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"큰따옴표"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"작은따옴표"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"점"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"제곱근"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"파이"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"델타"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"상표(™)"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"퍼센트 키"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"별표"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"파운드"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"생략 부호"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"아래쪽 큰따옴표"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"음성 입력"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"음성 입력은 현재 자국어로 지원되지 않으며 영어로 작동됩니다."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"음성 입력에서는 Google의 음성 인식 기능을 사용합니다. "<a href="http://m.google.com/privacy">"모바일 개인정보취급방침"</a>"이 적용됩니다."</string>
@@ -144,7 +144,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"사용자 의견 사용"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"사용 통계 및 충돌 보고서를 Google에 자동으로 전송하여 입력 방법 편집기의 개선에 도움을 줍니다."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"키보드 테마"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"독일어 QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"영어(영국)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"영어(미국)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"가용성 연구 모드"</string>
diff --git a/java/res/values-ky/donottranslate-more-keys.xml b/java/res/values-ky/donottranslate-more-keys.xml
new file mode 100644
index 000000000..563a19970
--- /dev/null
+++ b/java/res/values-ky/donottranslate-more-keys.xml
@@ -0,0 +1,27 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- \u04af: "ү" CYRILLIC SMALL LETTER STRAIGHT U -->
+ <string name="more_keys_for_slavic_u">\u04af</string>
+ <!-- \u04a3: "ң" CYRILLIC SMALL LETTER EN WITH DESCENDER -->
+ <string name="more_keys_for_slavic_en">\u04a3</string>
+ <!-- \u04e9: "ө" CYRILLIC SMALL LETTER BARRED O -->
+ <string name="more_keys_for_slavic_o">\u04e9</string>
+</resources>
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
index 4a5c5a44c..f9cce839a 100644
--- a/java/res/values-land/dimens.xml
+++ b/java/res/values-land/dimens.xml
@@ -53,6 +53,7 @@
<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">0.08in</dimen>
<dimen name="key_preview_offset_ics">0.01in</dimen>
@@ -65,7 +66,7 @@
<dimen name="key_preview_backing_height">72dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.2 -->
- <dimen name="mini_keyboard_slide_allowance">0.336in</dimen>
+ <dimen name="more_keys_keyboard_slide_allowance">0.336in</dimen>
<!-- popup_key_height x -1.0 -->
- <dimen name="mini_keyboard_vertical_correction">-0.280in</dimen>
+ <dimen name="more_keys_keyboard_vertical_correction">-0.280in</dimen>
</resources>
diff --git a/java/res/values-lt/donottranslate-more-keys.xml b/java/res/values-lt/donottranslate-more-keys.xml
index 6b81e4509..ec450816d 100644
--- a/java/res/values-lt/donottranslate-more-keys.xml
+++ b/java/res/values-lt/donottranslate-more-keys.xml
@@ -18,11 +18,90 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">ą,à,á,â,ä,æ,ã,å,ā</string>
- <string name="more_keys_for_e">3,ė,ę,è,é,ê,ë,ē</string>
- <string name="more_keys_for_i">8,į,î,ï,ì,í,ī</string>
- <string name="more_keys_for_u">7,ų,ū,û,ü,ù,ú</string>
- <string name="more_keys_for_s">š,ß,ś</string>
- <string name="more_keys_for_c">č,ç,ć</string>
- <string name="more_keys_for_z">ž,ź,ż</string>
+ <!-- \u0105: "ą" LATIN SMALL LETTER A WITH OGONEK
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u00e6: "æ" LATIN SMALL LETTER AE -->
+ <string name="more_keys_for_a">\u0105,\u00e4,\u0101,\u00e0,\u00e1,\u00e2,\u00e3,\u00e5,\u00e6</string>
+ <!-- \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u011b: "ě" LATIN SMALL LETTER E WITH CARON -->
+ <string name="more_keys_for_e">\u0117,\u0119,\u0113,\u00e8,\u00e9,\u00ea,\u00eb,\u011b</string>
+ <!-- \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+ <string name="more_keys_for_i">\u012f,\u012b,\u00ec,\u00ed,\u00ee,\u00ef,\u0131</string>
+ <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+ <string name="more_keys_for_o">\u00f6,\u00f5,\u00f2,\u00f3,\u00f4,\u0153,\u0151,\u00f8</string>
+ <!-- \u016b: "ū" LATIN SMALL LETTER U WITH MACRON
+ \u0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u016f: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+ \u0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+ <string name="more_keys_for_u">\u016b,\u0173,\u00fc,\u016b,\u00f9,\u00fa,\u00fb,\u016f,\u0171</string>
+ <!-- \u0161: "š" LATIN SMALL LETTER S WITH CARON
+ \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u015f: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
+ <string name="more_keys_for_s">\u0161,\u00df,\u015b,\u015f</string>
+ <!-- \u0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+ \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u0146,\u00f1,\u0144,\u0144</string>
+ <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+ \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+ <string name="more_keys_for_c">\u010d,\u00e7,\u0107</string>
+ <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+ \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+ <string name="more_keys_for_y">\u00fd,\u00ff</string>
+ <!-- \u010f: "ď" LATIN SMALL LETTER D WITH CARON -->
+ <string name="more_keys_for_d">\u010f</string>
+ <!-- \u0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
+ \u0159: "ř" LATIN SMALL LETTER R WITH CARON
+ \u0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE -->
+ <string name="more_keys_for_r">\u0157,\u0159,\u0155</string>
+ <!-- \u0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
+ \u0165: "ť" LATIN SMALL LETTER T WITH CARON -->
+ <string name="more_keys_for_t">\u0163,\u0165</string>
+ <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+ \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+ \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+ <string name="more_keys_for_z">\u017e,\u017c,\u017a</string>
+ <!-- \u0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
+ <string name="more_keys_for_k">\u0137</string>
+ <!-- \u013c: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+ \u0142: "ł" LATIN SMALL LETTER L WITH STROKE
+ \u013a: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+ \u013e: "ľ" LATIN SMALL LETTER L WITH CARON -->
+ <string name="more_keys_for_l">\u013c,\u0142,\u013a,\u013e</string>
+ <!-- \u0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
+ \u011f: "ğ" LATIN SMALL LETTER G WITH BREVE -->
+ <string name="more_keys_for_g">\u0123,\u011f</string>
</resources>
diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml
index 6263f6706..9ab696780 100644
--- a/java/res/values-lt/strings.xml
+++ b/java/res/values-lt/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"„Android“ klaviatūra"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"„Android“ klaviatūra (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"„Android“ klaviatūros nustatymai"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Įvesties parinktys"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"„Android“ korekcijos"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Rašybos tikrinimo nustatymai"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Naudoti artimumo duomenis"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Naudokite klaviatūros tipo artimumo algoritmą rašybai patikrinti"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Kontaktų vardų paieška"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Rašybos tikrinimo progr. naudoja įrašus, esančius kontaktų sąraše"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibruoti, kai paspaudžiami klavišai"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Klavišo paspaudimo garsas"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Iššoka paspaudus klavišą"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Teksto taisymas"</string>
<string name="misc_category" msgid="6894192814868233453">"Kitos parinktys"</string>
<string name="advanced_settings" msgid="362895144495591463">"Išplėstiniai nustatymai"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Parinktys ekspertams"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Pagr. išš. l. atsis. d."</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Be delsos"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Numatytasis"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: išsaugota"</string>
<string name="label_go_key" msgid="1635148082137219148">"Pradėti"</string>
<string name="label_next_key" msgid="362972844525672568">"Kitas"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Anks."</string>
<string name="label_done_key" msgid="2441578748772529288">"Atlikta"</string>
<string name="label_send_key" msgid="2815056534433717444">"Siųsti"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Nėra įvesto teksto"</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="954941524766465022">"Antrojo lygio klavišas įgalintas"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Įgalintas didžiųjų raidžių 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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Kablelis"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Taškas"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Kairysis skliaustas"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Dešinysis skliaustas"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dvitaškis"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Kabliataškis"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Šauktukas"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Klaustukas"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Dvigubos kabutės"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Viengubos kabutės"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Taškas"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Kvadratinė šaknis"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Prekės ženklas"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Perduoti"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Pažymėti žvaigždute"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Svaras"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Daugtaškis"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Apatinės dvigubos kabutės"</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="voice_warning_title" msgid="4419354150908395008">"Balso įvestis"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Šiuo metu balso įvestis jūsų kompiuteryje nepalaikoma, bet ji veikia anglų k."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Balso įvesčiai naudojamas „Google“ kalbos atpažinimas. Taikoma "<a href="http://m.google.com/privacy">"privatumo politika mobiliesiems"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Įgalinti naudotojų atsiliepimus"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Padėkite patobulinti šią įvesties metodo redagavimo programą automatiškai „Google“ siųsdami naudojimo statistiką ir strigčių ataskaitas."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Klaviatūros tema"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Vokiška QWERTY klaviatūra"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Anglų k. (JK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Anglų k. (JAV)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Tinkamumo tyrimo režimas"</string>
diff --git a/java/res/values-lv/donottranslate-more-keys.xml b/java/res/values-lv/donottranslate-more-keys.xml
index 77e1c26a0..7d3a3d82d 100644
--- a/java/res/values-lv/donottranslate-more-keys.xml
+++ b/java/res/values-lv/donottranslate-more-keys.xml
@@ -18,16 +18,89 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">ā,à,á,â,ä,æ,ã,å</string>
- <string name="more_keys_for_e">3,ē,è,é,ê,ë,ę,ė</string>
- <string name="more_keys_for_i">8,ī,î,ï,ì,í,į</string>
- <string name="more_keys_for_u">7,ū,û,ü,ù,ú</string>
- <string name="more_keys_for_s">š,ß,ś</string>
- <string name="more_keys_for_n">ņ,ñ,ń</string>
- <string name="more_keys_for_c">č,ç,ć</string>
- <string name="more_keys_for_r">4,ŗ</string>
- <string name="more_keys_for_z">ž,ź,ż</string>
- <string name="more_keys_for_k">ķ</string>
- <string name="more_keys_for_l">ļ,ł</string>
- <string name="more_keys_for_g">ģ</string>
+ <!-- \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u0105: "ą" LATIN SMALL LETTER A WITH OGONEK -->
+ <string name="more_keys_for_a">\u0101,\u00e0,\u00e1,\u00e2,\u00e3,\u00e4,\u00e5,\u00e6,\u0105</string>
+ <!-- \u0113: "ē" LATIN SMALL LETTER E WITH MACRON
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u011b: "ě" LATIN SMALL LETTER E WITH CARON -->
+ <string name="more_keys_for_e">\u0113,\u0117,\u00e8,\u00e9,\u00ea,\u00eb,\u0119,\u011b</string>
+ <!-- \u012b: "ī" LATIN SMALL LETTER I WITH MACRON
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+ <string name="more_keys_for_i">\u012b,\u012f,\u00ec,\u00ed,\u00ee,\u00ef,\u0131</string>
+ <!-- \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+ <string name="more_keys_for_o">\u00f2,\u00f3,\u00f4,\u00f5,\u00f6,\u0153,\u0151,\u00f8</string>
+ <!-- \u016b: "ū" LATIN SMALL LETTER U WITH MACRON
+ \u0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u016f: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+ \u0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+ <string name="more_keys_for_u">\u016b,\u0173,\u00f9,\u00fa,\u00fb,\u00fc,\u016f,\u0171</string>
+ <!-- \u0161: "š" LATIN SMALL LETTER S WITH CARON
+ \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u015f: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
+ <string name="more_keys_for_s">\u0161,\u00df,\u015b,\u015f</string>
+ <!-- \u0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+ \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u0146,\u00f1,\u0144,\u0144</string>
+ <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+ \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+ <string name="more_keys_for_c">\u010d,\u00e7,\u0107</string>
+ <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+ \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+ <string name="more_keys_for_y">\u00fd,\u00ff</string>
+ <!-- \u010f: "ď" LATIN SMALL LETTER D WITH CARON -->
+ <string name="more_keys_for_d">\u010f</string>
+ <!-- \u0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
+ \u0159: "ř" LATIN SMALL LETTER R WITH CARON
+ \u0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE -->
+ <string name="more_keys_for_r">\u0157,\u0159,\u0155</string>
+ <!-- \u0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
+ \u0165: "ť" LATIN SMALL LETTER T WITH CARON -->
+ <string name="more_keys_for_t">\u0163,\u0165</string>
+ <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+ \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+ \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+ <string name="more_keys_for_z">\u017e,\u017c,\u017a</string>
+ <!-- \u0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
+ <string name="more_keys_for_k">\u0137</string>
+ <!-- \u013c: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+ \u0142: "ł" LATIN SMALL LETTER L WITH STROKE
+ \u013a: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+ \u013e: "ľ" LATIN SMALL LETTER L WITH CARON -->
+ <string name="more_keys_for_l">\u013c,\u0142,\u013a,\u013e</string>
+ <!-- \u0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
+ \u011f: "ğ" LATIN SMALL LETTER G WITH BREVE -->
+ <string name="more_keys_for_g">\u0123,\u011f</string>
</resources>
diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml
index af01d92f6..d380b5eeb 100644
--- a/java/res/values-lv/strings.xml
+++ b/java/res/values-lv/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android tastatūra"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android tastatūra (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android tastatūras iestatījumi"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Ievades opcijas"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android korekcija"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Pareizrakstības pārbaudes iestatījumi"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Tuvuma datu izmantošana"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Pareizrakstības pārbaudei izmantojiet tastatūrai līdzīgu tuvuma algoritmu."</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Meklēt kontaktp. vārdus"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Pareizrakst. pārbaudītājs lieto ierakstus no kontaktp. saraksta."</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrēt, nospiežot taustiņu"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Skaņa, nospiežot taustiņu"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Nospiežot taustiņu, parādīt uznirstošo izvēlni"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Teksta korekcija"</string>
<string name="misc_category" msgid="6894192814868233453">"Citas opcijas"</string>
<string name="advanced_settings" msgid="362895144495591463">"Papildu iestatījumi"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opcijas speciālistiem"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Taust. uzn. loga noraid. aizk."</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez aizkaves"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Noklusējums"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: saglabāts"</string>
<string name="label_go_key" msgid="1635148082137219148">"Sākt"</string>
<string name="label_next_key" msgid="362972844525672568">"Tālāk"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Iepr."</string>
<string name="label_done_key" msgid="2441578748772529288">"Gatavs"</string>
<string name="label_send_key" msgid="2815056534433717444">"Sūtīt"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Nav ievadīts teksts"</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="954941524766465022">"Pārslēgšanas taustiņš iespējots"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Burtslēgs iespējots"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Komats"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punkts"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Kreisā iekava"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Labā iekava"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Kols"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Semikols"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Izsaukuma zīme"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Jautājuma zīme"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Pēdiņas"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Vienpēdiņas"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Punkts"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Kvadrātsakne"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pī"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Preču zīme"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"c/o"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Zvaigznīte"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Cipara simbols"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Daudzpunkte"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Apakšējās pēdiņas"</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="voice_warning_title" msgid="4419354150908395008">"Balss ievade"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Balss ievade jūsu valodā pašlaik netiek atbalstīta, taču tā ir pieejama angļu valodā."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Balss ievadei tiek izmantota Google runas atpazīšanas funkcija. Uz šīs funkcijas lietošanu attiecas "<a href="http://m.google.com/privacy">"mobilo sakaru ierīču lietošanas konfidencialitātes politika"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Iespējot lietotāju atsauksmes"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Palīdziet uzlabot šo ievades metodes redaktoru, automātiski nosūtot lietojuma statistiku un pārskatus par avārijām uzņēmumam Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tastatūras motīvs"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Vācu valodas QWERTY"</string>
<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="prefs_usability_study_mode" msgid="1261130555134595254">"Lietojamības izpētes režīms"</string>
diff --git a/java/res/values-ms/strings.xml b/java/res/values-ms/strings.xml
index d6bf559e7..1bb15cd37 100644
--- a/java/res/values-ms/strings.xml
+++ b/java/res/values-ms/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Papan kekunci Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Papan kekunci Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Tetapan papan kekunci Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Pilihan input"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Pembetulan Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Tetapan penyemakan ejaan"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Gunakan data kehampiran"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Gunakan algoritma kehampiran ala papan kekunci untuk pemeriksaan ejaan"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Cari nama kenalan"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Penyemak ejaan menggunakan entri dari senarai kenalan anda"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Getar pada tekanan kekunci"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Bunyi pada tekanan kekunci"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Pop timbul pada tekanan kunci"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Pembetulan teks"</string>
<string name="misc_category" msgid="6894192814868233453">"Pilihan lain"</string>
<string name="advanced_settings" msgid="362895144495591463">"Tetapan terperinci"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Pilihan untuk pengguna pakar"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Pop tmbl knci ketpkn lengah"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Tiada lengah"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Lalai"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Disimpan"</string>
<string name="label_go_key" msgid="1635148082137219148">"Pergi"</string>
<string name="label_next_key" msgid="362972844525672568">"Seterusnya"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Sblm"</string>
<string name="label_done_key" msgid="2441578748772529288">"Selesai"</string>
<string name="label_send_key" msgid="2815056534433717444">"Hantar"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Tiada teks dimasukkan"</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="954941524766465022">"Shift didayakan"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Kunci huruf besar didayakan"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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">"Return"</string>
- <string name="spoken_description_comma" msgid="4970844442999724586">"Koma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Tempoh"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Tanda kurung kiri"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Tanda kurung kanan"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Titik bertindih"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Koma bertitik"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Tanda seru"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Tanda soal"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Tanda petikan berganda"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Tanda petikan tunggal"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Titik"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Punca kuasa dua"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Tanda dagangan"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Dengan alamat"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Bintang"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Paun"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Elipsis"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Tanda petikan berganda rendah"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"Input suara"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Input suara tidak disokong untuk bahasa anda pada masa ini tetapi ia berfungsi dalam bahasa Inggeris."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Input suara menggunakan pengecaman pertuturan Google. "<a href="http://m.google.com/privacy">"Dasar Privasi Mudah Alih"</a>" digunakan."</string>
@@ -144,7 +144,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Dayakan maklum balas pengguna"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Bantu memperbaik editor input ini dengan menghantar statistik penggunaan dan laporan runtuhan kepada Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema papan kekunci"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY Bahasa Jerman"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Bahasa Inggeris (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Bahasa Inggeris (AS)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Mod kajian kebolehgunaan"</string>
diff --git a/java/res/values-nb/donottranslate-more-keys.xml b/java/res/values-nb/donottranslate-more-keys.xml
index b98341c6a..c3d128872 100644
--- a/java/res/values-nb/donottranslate-more-keys.xml
+++ b/java/res/values-nb/donottranslate-more-keys.xml
@@ -18,12 +18,43 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">à,ä,á,â,ã,ā</string>
- <string name="more_keys_for_e">3,é,è,ê,ë,ę,ė,ē</string>
- <string name="more_keys_for_o">9,ô,ò,ó,ö,õ,œ,ō</string>
- <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string>
- <string name="keylabel_for_scandinavia_row2_10">ø</string>
- <string name="keylabel_for_scandinavia_row2_11">æ</string>
- <string name="more_keys_for_scandinavia_row2_10">ö</string>
- <string name="more_keys_for_scandinavia_row2_11">ä</string>
+ <!-- \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+ <string name="more_keys_for_a">\u00e0,\u00e4,\u00e1,\u00e2,\u00e3,\u0101</string>
+ <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+ <string name="more_keys_for_e">\u00e9,\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113</string>
+ <!-- \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+ <string name="more_keys_for_o">\u00f4,\u00f2,\u00f3,\u00f6,\u00f5,\u0153,\u014d</string>
+ <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fc,\u00fb,\u00f9,\u00fa,\u016b</string>
+ <!-- \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
+ <string name="keylabel_for_scandinavia_row1_11">\u00e5</string>
+ <!-- \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+ <string name="keylabel_for_scandinavia_row2_10">\u00f8</string>
+ <!-- \u00e6: "æ" LATIN SMALL LETTER AE -->
+ <string name="keylabel_for_scandinavia_row2_11">\u00e6</string>
+ <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+ <string name="more_keys_for_scandinavia_row2_10">\u00f6</string>
+ <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+ <string name="more_keys_for_scandinavia_row2_11">\u00e4</string>
</resources>
diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml
index acd636bdd..47690ce30 100644
--- a/java/res/values-nb/strings.xml
+++ b/java/res/values-nb/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Skjermtastatur"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android-tastatur (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Innstillinger for skjermtastatur"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Inndataalternativer"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android-stavekontroll"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Innstillinger for stavekontroll"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Bruk nærhetsdata"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Bruk en tastaturlignende algoritme til stavekontroll"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Slå opp kontaktnavn"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Stavekontrollen bruker oppføringer fra kontaktlisten din"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrer ved tastetrykk"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Lyd ved tastetrykk"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Hurtigvindu ved tastetrykk"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Tekstkorrigering"</string>
<string name="misc_category" msgid="6894192814868233453">"Andre alternativer"</string>
<string name="advanced_settings" msgid="362895144495591463">"Avanserte innstillinger"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Alternativer for ekspertbrukere"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tregt tastevindu"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"U/ forsinkelse"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Standard"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Lagret"</string>
<string name="label_go_key" msgid="1635148082137219148">"Gå"</string>
<string name="label_next_key" msgid="362972844525672568">"Neste"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Tidl."</string>
<string name="label_done_key" msgid="2441578748772529288">"Utfør"</string>
<string name="label_send_key" msgid="2815056534433717444">"Send"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Ingen tekst er skrevet inn"</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="954941524766465022">"Shift er aktivert"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps Lock er aktivert"</string>
+ <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Shift er slått på (trykk for å deaktivere)"</string>
+ <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Caps Lock er slått 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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Komma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punktum"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Venstre parentes"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Høyre parentes"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Kolon"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Semikolon"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Utropstegn"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Spørsmålstegn"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Dobbelt anførselstegn"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Enkelt anførselstegn"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Prikk"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Kvadratrot"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Varemerke"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"c/o"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Stjerne"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Firkant"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellipse"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Lavt dobbelt anførselstegn"</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="voice_warning_title" msgid="4419354150908395008">"Stemmedata"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Stemmedata håndteres foreløpig ikke på ditt språk, men fungerer på engelsk."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Google Voice bruker Googles talegjenkjenning. "<a href="http://m.google.com/privacy">"Personvernreglene for mobil"</a>" gjelder."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Aktiver brukertilbakemelding"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Ved å sende bruksstatistikk og programstopprapporter til Google automatisk, hjelper du oss med å gjøre redigeringsfunksjonen for denne inndatametoden enda bedre."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tastaturtema"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Tysk QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Engelsk (Storbritannia)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engelsk (USA)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Nyttighetsmodus"</string>
diff --git a/java/res/values-nl/donottranslate-more-keys.xml b/java/res/values-nl/donottranslate-more-keys.xml
index 49cc41964..6310cbce3 100644
--- a/java/res/values-nl/donottranslate-more-keys.xml
+++ b/java/res/values-nl/donottranslate-more-keys.xml
@@ -18,10 +18,46 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">á,ä,â,à,æ,ã,å,ā</string>
- <string name="more_keys_for_e">3,é,ë,ê,è,ę,ė,ē</string>
- <string name="more_keys_for_i">8,í,ï,ì,î,į,ī</string>
- <string name="more_keys_for_o">9,ó,ö,ô,ò,õ,œ,ø,ō</string>
- <string name="more_keys_for_u">7,ú,ü,û,ù,ū</string>
- <string name="more_keys_for_n">ñ,ń</string>
+ <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+ <string name="more_keys_for_a">\u00e1,\u00e4,\u00e2,\u00e0,\u00e6,\u00e3,\u00e5,\u0101</string>
+ <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+ <string name="more_keys_for_e">\u00e9,\u00eb,\u00ea,\u00e8,\u0119,\u0117,\u0113</string>
+ <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON -->
+ <string name="more_keys_for_i">\u00ed,\u00ef,\u00ec,\u00ee,\u012f,\u012b</string>
+ <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+ <string name="more_keys_for_o">\u00f3,\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d</string>
+ <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fa,\u00fc,\u00fb,\u00f9,\u016b</string>
+ <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u00f1,\u0144</string>
</resources>
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index 7f0ff7eaf..4b0a49650 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android-toetsenbord"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android-toetsenbord (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Instellingen voor Android-toetsenbord"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Invoeropties"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android-spellingcontrole"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Instellingen voor spellingcontrole"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Nabije toetsinfo gebr."</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Algoritme voor nabije toetsen gebruiken voor spellingcontrole"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Contactnamen opzoeken"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"De spellingcontrole gebruikt items uit uw contactenlijst"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Trillen bij toetsaanslag"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Geluid bij toetsaanslag"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Pop-up bij toetsaanslag"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Tekstcorrectie"</string>
<string name="misc_category" msgid="6894192814868233453">"Andere opties"</string>
<string name="advanced_settings" msgid="362895144495591463">"Geavanceerde instellingen"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opties voor ervaren gebruikers"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Afwijz.vertr. toetspop-up"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Geen vertraging"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Standaard"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: opgeslagen"</string>
<string name="label_go_key" msgid="1635148082137219148">"Start"</string>
<string name="label_next_key" msgid="362972844525672568">"Verder"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Vorig"</string>
<string name="label_done_key" msgid="2441578748772529288">"Gereed"</string>
<string name="label_send_key" msgid="2815056534433717444">"Zenden"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Geen tekst ingevoerd"</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="954941524766465022">"Shift ingeschakeld"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps Lock ingeschakeld"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Komma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punt"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Linkerhaakje"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Rechterhaakje"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dubbele punt"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Puntkomma"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Uitroepteken"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Vraagteken"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Dubbele aanhalingstekens"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Enkel aanhalingsteken"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Stip"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Vierkantswortel"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Handelsmerk"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Ten attentie van"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Ster"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Hekje"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Weglatingsteken"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Lage dubbele aanhalingstekens"</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">"Symbolenmodus"</string>
+ <string name="spoken_description_mode_alpha" msgid="3528307674390156956">"Brievenmodus"</string>
+ <string name="spoken_description_mode_phone" msgid="6520207943132026264">"Telefoonmodus"</string>
+ <string name="spoken_description_mode_phone_shift" msgid="5499629753962641227">"Telefoonsymbolenmodus"</string>
<string name="voice_warning_title" msgid="4419354150908395008">"Spraakinvoer"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Spraakinvoer wordt momenteel niet ondersteund in uw taal, maar is wel beschikbaar in het Engels."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Spraakinvoer maakt gebruik van de spraakherkenning van Google. Het "<a href="http://m.google.com/privacy">"Privacybeleid van Google Mobile"</a>" is van toepassing."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Gebruikersfeedback inschakelen."</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Help deze invoermethode te verbeteren door automatisch gebruiksstatistieken en crashmeldingen naar Google te verzenden."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Toetsenbordthema"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Duits QWERTY-toetsenbord"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Engels (GB)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engels (VS)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modus voor gebruiksvriendelijkheidsonderzoek"</string>
diff --git a/java/res/values-pl/donottranslate-more-keys.xml b/java/res/values-pl/donottranslate-more-keys.xml
index 18e149991..51477c38b 100644
--- a/java/res/values-pl/donottranslate-more-keys.xml
+++ b/java/res/values-pl/donottranslate-more-keys.xml
@@ -18,12 +18,48 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">ą,á,à,â,ä,æ,ã,å,ā</string>
- <string name="more_keys_for_e">3,ę,è,é,ê,ë,ė,ē</string>
- <string name="more_keys_for_o">9,ó,ö,ô,ò,õ,œ,ø,ō</string>
- <string name="more_keys_for_s">ś,ß,š</string>
- <string name="more_keys_for_n">ń,ñ</string>
- <string name="more_keys_for_c">ć,ç,č</string>
- <string name="more_keys_for_z">ż,ź,ž</string>
- <string name="more_keys_for_l">ł</string>
+ <!-- \u0105: "ą" LATIN SMALL LETTER A WITH OGONEK
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+ <string name="more_keys_for_a">\u0105,\u00e1,\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101</string>
+ <!-- \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+ <string name="more_keys_for_e">\u0119,\u00e8,\u00e9,\u00ea,\u00eb,\u0117,\u0113</string>
+ <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+ <string name="more_keys_for_o">\u00f3,\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d</string>
+ <!-- \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u0161: "š" LATIN SMALL LETTER S WITH CARON -->
+ <string name="more_keys_for_s">\u015b,\u00df,\u0161</string>
+ <!-- \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE
+ \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
+ <string name="more_keys_for_n">\u0144,\u00f1</string>
+ <!-- \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u010d: "č" LATIN SMALL LETTER C WITH CARON -->
+ <string name="more_keys_for_c">\u0107,\u00e7,\u010d</string>
+ <!-- \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+ \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE
+ \u017e: "ž" LATIN SMALL LETTER Z WITH CARON -->
+ <string name="more_keys_for_z">\u017c,\u017a,\u017e</string>
+ <!-- \u0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
+ <string name="more_keys_for_l">\u0142</string>
</resources>
diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml
index a9a6a76b6..c0e313243 100644
--- a/java/res/values-pl/strings.xml
+++ b/java/res/values-pl/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Klawiatura Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Klawiatura Androida (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Ustawienia klawiatury Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Opcje wprowadzania"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Korekta Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Ustawienia sprawdzania pisowni"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Użyj danych o klawiszach"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Przy sprawdzaniu pisowni używaj algorytmu uwzględniającego położenie klawiszy na klawiaturze"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Przeszukaj nazwy kontaktów"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Sprawdzanie pisowni bierze pod uwagę wpisy z listy kontaktów."</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Wibracja przy naciśnięciu"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Dźwięk przy naciśnięciu"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Powiększ po naciśnięciu"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Poprawianie tekstu"</string>
<string name="misc_category" msgid="6894192814868233453">"Inne opcje"</string>
<string name="advanced_settings" msgid="362895144495591463">"Ustawienia zaawansowane"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opcje dla zaawansowanych użytkowników"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Opóźnienie znikania klawiszy"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez opóźnienia"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Wartość domyślna"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Zapisano"</string>
<string name="label_go_key" msgid="1635148082137219148">"OK"</string>
<string name="label_next_key" msgid="362972844525672568">"Dalej"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Poprz"</string>
<string name="label_done_key" msgid="2441578748772529288">"OK"</string>
<string name="label_send_key" msgid="2815056534433717444">"Wyślij"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Nie wprowadzono tekstu"</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="954941524766465022">"Shift włączony"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock włączony"</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>
@@ -88,29 +91,17 @@
<string name="spoken_description_mic" msgid="615536748882611950">"Wprowadzanie głosowe"</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_comma" msgid="4970844442999724586">"Przecinek"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Kropka"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Lewy nawias"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Prawy nawias"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dwukropek"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Średnik"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Wykrzyknik"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Pytajnik"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Cudzysłów podwójny"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Cudzysłów pojedynczy"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Punkt"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Pierwiastek kwadratowy"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Znak towarowy"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Znak „przez grzeczność”"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Gwiazdka"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Krzyżyk"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Wielokropek"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Cudzysłów podwójny dolny"</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="voice_warning_title" msgid="4419354150908395008">"Wprowadzanie głosowe"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Wprowadzanie głosowe obecnie nie jest obsługiwane w Twoim języku, ale działa w języku angielskim."</string>
- <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Funkcja wprowadzania głosowego wykorzystuje mechanizm rozpoznawania mowy. Obowiązuje "<a href="http://m.google.com/privacy">"Polityka prywatności Google Mobile"</a>"."</string>
+ <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Funkcja wprowadzania głosowego wykorzystuje mechanizm rozpoznawania mowy. Obowiązuje "<a href="http://m.google.com/privacy">"Polityka prywatności w usługach mobilnych"</a>"."</string>
<string name="voice_warning_how_to_turn_off" msgid="3190378129944934856">"Aby wyłączyć rozpoznawanie mowy, przejdź do ustawień sposobu wprowadzania tekstu."</string>
<string name="voice_hint_dialog_message" msgid="1420686286820661548">"Aby użyć wprowadzania głosowego, naciśnij przycisk mikrofonu."</string>
<string name="voice_listening" msgid="467518160751321844">"Mów teraz"</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Włącz przesyłanie opinii użytkownika"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Pomóż ulepszyć edytor wprowadzania tekstu, automatycznie wysyłając do Google statystyki użycia i raporty o awariach."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Motyw klawiatury"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Niemiecka QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Angielska (Wielka Brytania)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Angielska (Stany Zjednoczone)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Tryb badania przydatności"</string>
diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml
index 0a30235f4..be6544b7d 100644
--- a/java/res/values-pt-rPT/strings.xml
+++ b/java/res/values-pt-rPT/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Teclado do Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Teclado Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Definições de teclado do Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Opções de introdução"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Correção do Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Definições da verificação ortográfica"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Utilizar dados de prox."</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Util. algoritmo de prox. semelhante a teclado para verif. ortog."</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Procurar nomes de contac."</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"O corretor ortográfico utiliza entradas da sua lista de contactos"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar ao primir as teclas"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Som ao premir as teclas"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Mostrar popup ao premir tecla"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Correção de texto"</string>
<string name="misc_category" msgid="6894192814868233453">"Outras opções"</string>
<string name="advanced_settings" msgid="362895144495591463">"Definições avançadas"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opções para utilizadores experientes"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Atraso p/ ignorar pop-up"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Sem atraso"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Predefinido"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string>
<string name="label_go_key" msgid="1635148082137219148">"OK"</string>
<string name="label_next_key" msgid="362972844525672568">"Avançar"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Ant."</string>
<string name="label_done_key" msgid="2441578748772529288">"Feito"</string>
<string name="label_send_key" msgid="2815056534433717444">"Enviar"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Nenhum texto digitado"</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="954941524766465022">"Shift ativado"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock ativado"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Vírgula"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Ponto final"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Parêntese esquerdo"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Parêntese direito"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dois pontos"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Ponto e vírgula"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Ponto de exclamação"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Ponto de interrogação"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Aspas"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Plica"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Ponto"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Raiz quadrada"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Marca comercial"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Ao cuidado de"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Marcar com estrela"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Cardinal"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Reticências"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Aspas duplas baixas"</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="voice_warning_title" msgid="4419354150908395008">"Entrada de voz"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Actualmente, a entrada de voz não é suportada para o seu idioma, mas funciona em inglês."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"A entrada de voz utiliza o reconhecimento de voz da Google. É aplicável a "<a href="http://m.google.com/privacy">"Política de privacidade do Google Mobile"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Activar comentários do utilizador"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Envie automaticamente estatísticas de utilização e relatórios de falhas para a Google e ajude-nos a melhorar este editor de método de introdução."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema do teclado"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY Alemão"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Inglês (RU)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Inglês (EUA)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modo de estudo da capacidade de utilização"</string>
diff --git a/java/res/values-pt/donottranslate-more-keys.xml b/java/res/values-pt/donottranslate-more-keys.xml
index 31d9417ab..cc476d6d4 100644
--- a/java/res/values-pt/donottranslate-more-keys.xml
+++ b/java/res/values-pt/donottranslate-more-keys.xml
@@ -18,10 +18,48 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">á,ã,à,â,ä,å,æ,ª</string>
- <string name="more_keys_for_e">3,é,ê,è,ę,ė,ē,ë</string>
- <string name="more_keys_for_i">8,í,î,ì,ï,į,ī</string>
- <string name="more_keys_for_o">9,ó,õ,ô,ò,ö,œ,ø,ō,º</string>
- <string name="more_keys_for_u">7,ú,ü,ù,û,ū</string>
- <string name="more_keys_for_c">ç,č,ć</string>
+ <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u00aa: "ª" FEMININE ORDINAL INDICATOR -->
+ <string name="more_keys_for_a">\u00e1,\u00e3,\u00e0,\u00e2,\u00e4,\u00e5,\u00e6,\u00aa</string>
+ <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS -->
+ <string name="more_keys_for_e">\u00e9,\u00ea,\u00e8,\u0119,\u0117,\u0113,\u00eb</string>
+ <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON -->
+ <string name="more_keys_for_i">\u00ed,\u00ee,\u00ec,\u00ef,\u012f,\u012b</string>
+ <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON
+ \u00ba: "º" MASCULINE ORDINAL INDICATOR -->
+ <string name="more_keys_for_o">\u00f3,\u00f5,\u00f4,\u00f2,\u00f6,\u0153,\u00f8,\u014d,\u00ba</string>
+ <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fa,\u00fc,\u00f9,\u00fb,\u016b</string>
+ <!-- \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u010d: "č" LATIN SMALL LETTER C WITH CARON
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+ <string name="more_keys_for_c">\u00e7,\u010d,\u0107</string>
</resources>
diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
index 36a70daa6..a960deda3 100644
--- a/java/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Teclado Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Teclado Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Configurações de teclado Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Opções de entrada"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Correção do Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Configurações de verificação ortográfica"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Usar dados de proximidade"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Usar algoritmo de prox. tipo teclado para verificação ortográfica"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Buscar nomes de contatos"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"O corretor ortográfico usa entradas de sua lista de contatos"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar ao tocar a tecla"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Som ao tocar a tecla"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Exibir pop-up ao digitar"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Correção de texto"</string>
<string name="misc_category" msgid="6894192814868233453">"Outras opções"</string>
<string name="advanced_settings" msgid="362895144495591463">"Configurações avançadas"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opções para usuários experientes"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Dispens. atraso chave princ."</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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Salvo"</string>
<string name="label_go_key" msgid="1635148082137219148">"Ir"</string>
<string name="label_next_key" msgid="362972844525672568">"Avançar"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Volt."</string>
<string name="label_done_key" msgid="2441578748772529288">"Feito"</string>
<string name="label_send_key" msgid="2815056534433717444">"Enviar"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Nenhum texto digitado"</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="954941524766465022">"Shift ativado"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock ativado"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Vírgula"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Ponto final"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Parêntese esquerdo"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Parêntese direito"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dois pontos"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Ponto e vírgula"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Ponto de exclamação"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Ponto de interrogação"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Aspa dupla"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Aspa simples"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Ponto"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Raiz quadrada"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Marca registrada"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Porcentagem"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Asterisco"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Sustenido"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Reticências"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Aspas duplas inferiores"</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="voice_warning_title" msgid="4419354150908395008">"Entrada de voz"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"A entrada de voz não é suportada no momento para o seu idioma, mas funciona em inglês."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"A entrada de texto por voz usa o reconhecimento de voz do Google. "<a href="http://m.google.com/privacy">"A política de privacidade para celulares"</a>" é aplicada."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Ativar comentário do usuário"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Ajude a melhorar este editor de método de entrada enviando automaticamente ao Google estatísticas de uso e relatórios de falhas."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema do teclado"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY alemão"</string>
<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="prefs_usability_study_mode" msgid="1261130555134595254">"Modo de estudo de utilização"</string>
diff --git a/java/res/values-rm/donottranslate-more-keys.xml b/java/res/values-rm/donottranslate-more-keys.xml
index ea9a55944..22af05fc2 100644
--- a/java/res/values-rm/donottranslate-more-keys.xml
+++ b/java/res/values-rm/donottranslate-more-keys.xml
@@ -18,5 +18,12 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_o">9,ò,ó,ö,ô,õ,œ,ø</string>
+ <!-- \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+ <string name="more_keys_for_o">\u00f2,\u00f3,\u00f6,\u00f4,\u00f5,\u0153,\u00f8</string>
</resources>
diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml
index 090f3fc47..106aca3e2 100644
--- a/java/res/values-rm/strings.xml
+++ b/java/res/values-rm/strings.xml
@@ -21,6 +21,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="7252517407088836577">"Tastatura Android"</string>
+ <!-- no translation found for aosp_android_keyboard_ime_name (7877134937939182296) -->
+ <skip />
<string name="english_ime_settings" msgid="6661589557206947774">"Parameters da la tastatura Android"</string>
<!-- no translation found for english_ime_input_options (3909945612939668554) -->
<skip />
@@ -28,9 +30,9 @@
<skip />
<!-- no translation found for android_spell_checker_settings (5822324635435443689) -->
<skip />
- <!-- no translation found for use_proximity_option_title (7469233942295924620) -->
+ <!-- no translation found for use_contacts_for_spellchecking_option_title (5374120998125353898) -->
<skip />
- <!-- no translation found for use_proximity_option_summary (2857708859847261945) -->
+ <!-- no translation found for use_contacts_for_spellchecking_option_summary (8754413382543307713) -->
<skip />
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar cun smatgar in buttun"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Tun cun smatgar in buttun"</string>
@@ -43,7 +45,7 @@
<skip />
<!-- no translation found for advanced_settings (362895144495591463) -->
<skip />
- <!-- no translation found for advanced_settings_summary (5193513161106637254) -->
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
<skip />
<!-- no translation found for key_preview_popup_dismiss_delay (6213164897443068248) -->
<skip />
@@ -76,8 +78,10 @@
<skip />
<!-- no translation found for prefs_settings_key (4623341240804046498) -->
<skip />
- <!-- outdated translation 7911639788808958255 --> <string name="auto_correction" msgid="4979925752001319458">"Propostas da pleds"</string>
- <!-- outdated translation 6881047311475758267 --> <string name="auto_correction_summary" msgid="5625751551134658006">"Curreger automaticamain il pled precedent"</string>
+ <!-- no translation found for auto_correction (4979925752001319458) -->
+ <skip />
+ <!-- no translation found for auto_correction_summary (5625751551134658006) -->
+ <skip />
<!-- no translation found for auto_correction_threshold_mode_off (8470882665417944026) -->
<skip />
<!-- no translation found for auto_correction_threshold_mode_modest (8788366690620799097) -->
@@ -86,7 +90,8 @@
<skip />
<!-- no translation found for auto_correction_threshold_mode_very_aggeressive (3386782235540547678) -->
<skip />
- <!-- outdated translation 1323347224043514969 --> <string name="bigram_suggestion" msgid="2636414079905220518">"Propostas da tip bigram"</string>
+ <!-- no translation found for bigram_suggestion (2636414079905220518) -->
+ <skip />
<string name="bigram_suggestion_summary" msgid="4383845146070101531">"Meglierar la proposta cun agid dal pled precedent"</string>
<!-- no translation found for bigram_prediction (8914273444762259739) -->
<skip />
@@ -95,6 +100,8 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Memorisà"</string>
<string name="label_go_key" msgid="1635148082137219148">"Dai"</string>
<string name="label_next_key" msgid="362972844525672568">"Vinavant"</string>
+ <!-- no translation found for label_previous_key (1211868118071386787) -->
+ <skip />
<string name="label_done_key" msgid="2441578748772529288">"Finì"</string>
<string name="label_send_key" msgid="2815056534433717444">"Trametter"</string>
<!-- no translation found for label_to_alpha_key (4793983863798817523) -->
@@ -117,9 +124,9 @@
<skip />
<!-- no translation found for spoken_description_shift (244197883292549308) -->
<skip />
- <!-- no translation found for spoken_description_shift_shifted (954941524766465022) -->
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
<skip />
- <!-- no translation found for spoken_description_caps_lock (5660626444912131764) -->
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
<skip />
<!-- no translation found for spoken_description_delete (8740376944276199801) -->
<skip />
@@ -141,51 +148,30 @@
<skip />
<!-- no translation found for spoken_description_return (8178083177238315647) -->
<skip />
- <!-- no translation found for spoken_description_comma (4970844442999724586) -->
- <skip />
- <!-- no translation found for spoken_description_period (5286614628077903945) -->
- <skip />
- <!-- no translation found for spoken_description_left_parenthesis (8524822120595052415) -->
- <skip />
- <!-- no translation found for spoken_description_right_parenthesis (1085757995851933164) -->
- <skip />
- <!-- no translation found for spoken_description_colon (4312420908484277077) -->
- <skip />
- <!-- no translation found for spoken_description_semicolon (37737920987155179) -->
- <skip />
- <!-- no translation found for spoken_description_exclamation_mark (2625684427460737157) -->
- <skip />
- <!-- no translation found for spoken_description_question_mark (7074097784255379666) -->
- <skip />
- <!-- no translation found for spoken_description_double_quote (5485320575389905967) -->
- <skip />
- <!-- no translation found for spoken_description_single_quote (4451320362665463938) -->
- <skip />
<!-- no translation found for spoken_description_dot (40711082435231673) -->
<skip />
- <!-- no translation found for spoken_description_square_root (190595160284757811) -->
- <skip />
- <!-- no translation found for spoken_description_pi (4554418247799952239) -->
- <skip />
- <!-- no translation found for spoken_description_delta (3607948313655721579) -->
+ <!-- no translation found for spoken_description_shiftmode_on (5700440798609574589) -->
<skip />
- <!-- no translation found for spoken_description_trademark (475877774077871369) -->
+ <!-- no translation found for spoken_description_shiftmode_locked (593175803181701830) -->
<skip />
- <!-- no translation found for spoken_description_care_of (7492800237237796530) -->
+ <!-- no translation found for spoken_description_shiftmode_off (657219998449174808) -->
<skip />
- <!-- no translation found for spoken_description_star (1009742725387231977) -->
+ <!-- no translation found for spoken_description_mode_symbol (7183343879909747642) -->
<skip />
- <!-- no translation found for spoken_description_pound (5530577649206922631) -->
+ <!-- no translation found for spoken_description_mode_alpha (3528307674390156956) -->
<skip />
- <!-- no translation found for spoken_description_ellipsis (1687670869947652062) -->
+ <!-- no translation found for spoken_description_mode_phone (6520207943132026264) -->
<skip />
- <!-- no translation found for spoken_description_low_double_quote (3551394572784840975) -->
+ <!-- no translation found for spoken_description_mode_phone_shift (5499629753962641227) -->
<skip />
<string name="voice_warning_title" msgid="4419354150908395008">"Cumonds vocals"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"\"Cumonds vocals en Vossa lingua na vegnan actualmain betg sustegnids, ma la funcziun è disponibla per englais.\""</string>
- <!-- outdated translation 4611518823070986445 --> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Ils cumonds vocals èn ina funcziunalitad experimentala che utilisescha la renconuschientscha vocala da rait da Google."</string>
- <!-- outdated translation 5652369578498701761 --> <string name="voice_warning_how_to_turn_off" msgid="3190378129944934856">"\"Per deactivar ils cumonds vocals, avri ils parameters da tastatura.\""</string>
- <!-- outdated translation 6892342981545727994 --> <string name="voice_hint_dialog_message" msgid="1420686286820661548">"\"Per utilisar ils cumonds vocals, smatgai il buttun dal microfon u stritgai cun il det sur la tastatura dal visur.\""</string>
+ <!-- no translation found for voice_warning_may_not_understand (5596289095878251072) -->
+ <skip />
+ <!-- no translation found for voice_warning_how_to_turn_off (3190378129944934856) -->
+ <skip />
+ <!-- no translation found for voice_hint_dialog_message (1420686286820661548) -->
+ <skip />
<string name="voice_listening" msgid="467518160751321844">"Ussa discurrer"</string>
<string name="voice_working" msgid="6666937792815731889">"Operaziun en progress"</string>
<string name="voice_initializing" msgid="661962047129906646"></string>
@@ -201,7 +187,8 @@
<string name="voice_punctuation_hint" msgid="1611389463237317754">"\""<b>"Commentari:"</b>" Empruvai la proxima giada d\'agiuntar segns d\'interpuncziun sco \"\"punct\"\", \"\"comma\"\" u \"\"segn da dumonda\"\" cun cumonds vocals.\""</string>
<string name="cancel" msgid="6830980399865683324">"Interrumper"</string>
<string name="ok" msgid="7898366843681727667">"OK"</string>
- <!-- outdated translation 2466640768843347841 --> <string name="voice_input" msgid="3583258583521397548">"Cumonds vocals"</string>
+ <!-- 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) -->
@@ -221,12 +208,12 @@
<string name="language_selection_title" msgid="1651299598555326750">"Linguas da cumonds vocals"</string>
<!-- no translation found for select_language (3693815588777926848) -->
<skip />
- <!-- outdated translation 8058519710062071085 --> <string name="hint_add_to_dictionary" msgid="9006292060636342317">"← Tippar danovamain per memorisar"</string>
+ <!-- no translation found for hint_add_to_dictionary (9006292060636342317) -->
+ <skip />
<string name="has_dictionary" msgid="6071847973466625007">"Dicziunari disponibel"</string>
<string name="prefs_enable_log" msgid="6620424505072963557">"Activar il feedback da l\'utilisader"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Gidai a meglierar quest editur da la metoda d\'endataziun cun trametter automaticamain datas statisticas davart l\'utilisaziun e rapports da collaps a Google."</string>
- <!-- outdated translation 437433231038683666 --> <string name="keyboard_layout" msgid="8451164783510487501">"Design da la tastatura"</string>
- <!-- no translation found for subtype_de_qwerty (3358900499589259491) -->
+ <!-- no translation found for keyboard_layout (8451164783510487501) -->
<skip />
<!-- no translation found for subtype_en_GB (88170601942311355) -->
<skip />
diff --git a/java/res/values-ro/donottranslate-more-keys.xml b/java/res/values-ro/donottranslate-more-keys.xml
index d7e6a171d..4497f664e 100644
--- a/java/res/values-ro/donottranslate-more-keys.xml
+++ b/java/res/values-ro/donottranslate-more-keys.xml
@@ -18,8 +18,28 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">ă,â,à,á,ä,æ,ã,å,ā</string>
- <string name="more_keys_for_i">8,î,ï,ì,í,į,ī</string>
- <string name="more_keys_for_s">ș,ß,ś,š</string>
- <string name="more_keys_for_t">5,ț</string>
+ <!-- \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u0103: "ă" LATIN SMALL LETTER A WITH BREVE
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+ <string name="more_keys_for_a">\u00e2,\u00e3,\u0103,\u00e0,\u00e1,\u00e4,\u00e6,\u00e5,\u0101</string>
+ <!-- \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON -->
+ <string name="more_keys_for_i">\u00ee,\u00ef,\u00ec,\u00ed,\u012f,\u012b</string>
+ <!-- \u0219: "ș" LATIN SMALL LETTER S WITH COMMA BELOW
+ \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u0161: "š" LATIN SMALL LETTER S WITH CARON -->
+ <string name="more_keys_for_s">\u0219,\u00df,\u015b,\u0161</string>
+ <!-- \u021b: "ț" LATIN SMALL LETTER T WITH COMMA BELOW -->
+ <string name="more_keys_for_t">\u021b</string>
</resources>
diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml
index c1dea5431..3711a7724 100644
--- a/java/res/values-ro/strings.xml
+++ b/java/res/values-ro/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Tastatură Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Tastatură Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Setările tastaturii Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Opţiuni de introducere text"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Corecţie Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Setări de verificare ortografică"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Utiliz. datele de proxim."</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Utilizaţi un algor. de prox. similar tastat. pt. verif. ortograf."</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Verificare nume în agendă"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Verificatorul ortografic utilizează intrări din lista de contacte"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrare la apăsarea tastei"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Sunet la apăsarea tastei"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Fereastră pop-up la apăsarea tastei"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Corectare text"</string>
<string name="misc_category" msgid="6894192814868233453">"Alte opţiuni"</string>
<string name="advanced_settings" msgid="362895144495591463">"Setări avansate"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Opţiuni pt. utiliz. experţi"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Înt. înch. pop-up esenţ."</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Fără întârziere"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Prestabilit"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: salvat"</string>
<string name="label_go_key" msgid="1635148082137219148">"OK"</string>
<string name="label_next_key" msgid="362972844525672568">"Înainte"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Înap."</string>
<string name="label_done_key" msgid="2441578748772529288">"Terminat"</string>
<string name="label_send_key" msgid="2815056534433717444">"Trimiteţi"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Nu a fost introdus text"</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="954941524766465022">"Shift activat"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps Lock activat"</string>
+ <string name="spoken_description_shift_shifted" msgid="1681877323344195035">"Tasta Shift este activată (apăsaţi pentru a dezactiva)"</string>
+ <string name="spoken_description_caps_lock" msgid="3276478269526304432">"Tasta Caps Lock este activată (apăsaţi pentru a 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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Virgulă"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punct"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Paranteză închisă"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Paranteză deschisă"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Două puncte"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Punct şi virgulă"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Semn de exclamaţie"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Semn de întrebare"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Ghilimele duble"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Ghilimele simple"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Punct"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Rădăcină pătrată"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Marcă comercială"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"În atenţia"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Stea"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Diez"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Puncte de suspensie"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Ghilimele duble de deschidere"</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="voice_warning_title" msgid="4419354150908395008">"Intrare voce"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Intrarea vocală nu este acceptată în prezent pentru limba dvs., însă funcţionează în limba engleză."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Intrarea vocală utilizează funcţia Google de recunoaştere vocală. Se aplică "<a href="http://m.google.com/privacy">"Politica de confidenţialitate Google Mobil"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Activaţi feedback de la utilizatori"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Ajutaţi la îmbunătăţirea acestui instrument de editare a metodelor de introducere a textului trimiţând în mod automat la Google statistici de utilizare şi rapoarte de blocare."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Temă pentru tastatură"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Tastatură germană QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Engleză (Marea Britanie)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engleză (S.U.A.)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modul Studiu privind utilizarea"</string>
diff --git a/java/res/values-ru/donottranslate-more-keys.xml b/java/res/values-ru/donottranslate-more-keys.xml
index f7e006e84..6b6c2b340 100644
--- a/java/res/values-ru/donottranslate-more-keys.xml
+++ b/java/res/values-ru/donottranslate-more-keys.xml
@@ -18,7 +18,6 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_cyrillic_e">5,ё</string>
- <string name="more_keys_for_cyrillic_soft_sign">ъ</string>
- <string name="more_keys_for_cyrillic_ha">ъ</string>
+ <!-- \u0451: "ё" CYRILLIC SMALL LETTER IO -->
+ <string name="more_keys_for_slavic_ye">\u0451</string>
</resources>
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index 863c8a28c..0571073a7 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Клавиатура Android"</string>
- <string name="english_ime_settings" msgid="6661589557206947774">"Настройки клавиатуры Android"</string>
- <string name="english_ime_input_options" msgid="3909945612939668554">"Параметры ввода"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Клавиатура Android (AOSP)"</string>
+ <string name="english_ime_settings" msgid="6661589557206947774">"Клавиатура Android"</string>
+ <string name="english_ime_input_options" msgid="3909945612939668554">"Настройки"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Исправления Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Настройка проверки правописания"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Алгоритм близости клавиш"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Использовать алгоритм близости клавиш для проверки правописания"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Исправление текста"</string>
<string name="misc_category" msgid="6894192814868233453">"Другие варианты"</string>
<string name="advanced_settings" msgid="362895144495591463">"Расширенные настройки"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Для опытных пользователей"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: сохранено"</string>
<string name="label_go_key" msgid="1635148082137219148">"Поиск"</string>
<string name="label_next_key" msgid="362972844525672568">"Далее"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Пред."</string>
<string name="label_done_key" msgid="2441578748772529288">"Готово"</string>
<string name="label_send_key" msgid="2815056534433717444">"Отправить"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"АБВ"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Текст не введен"</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="954941524766465022">"Верхний регистр включен"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Включена фиксация верхнего регистра"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Запятая"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Точка"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Открывающая скобка"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Закрывающая скобка"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Двоеточие"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Точка с запятой"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Восклицательный знак"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Вопросительный знак"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Двойная кавычка"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Одинарные кавычки"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Точка"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Квадратный корень"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Число \"пи\""</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Дельта"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Товарный знак"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Знак процента"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Пометить"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Английский фунт"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Многоточие"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Нижние двойные кавычки"</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="voice_warning_title" msgid="4419354150908395008">"Голосовой ввод"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"В настоящее время функция голосового ввода не поддерживает ваш язык, но вы можете пользоваться ей на английском."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Голосовой ввод использует алгоритмы распознавания речи Google. Действует "<a href="http://m.google.com/privacy">"политика конфиденциальности для мобильных устройств"</a>"."</string>
@@ -144,9 +135,8 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Включить отправку сведений"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Помогите усовершенствовать редактор способа ввода, разрешив отправку статистики и отчетов о сбоях в Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Тема клавиатуры"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Немецкая клавиатура QWERTY"</string>
- <string name="subtype_en_GB" msgid="88170601942311355">"Английский (Великобритания)"</string>
- <string name="subtype_en_US" msgid="6160452336634534239">"Английский (США)"</string>
+ <string name="subtype_en_GB" msgid="88170601942311355">"английский (Великобритания)"</string>
+ <string name="subtype_en_US" msgid="6160452336634534239">"английский (США)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Режим проверки удобства использования"</string>
<string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Настройки вибросигнала при нажатии клавиш"</string>
<string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Настройки громкости звука при нажатии клавиш"</string>
diff --git a/java/res/values-sk/donottranslate-more-keys.xml b/java/res/values-sk/donottranslate-more-keys.xml
index b73db0a46..31c598454 100644
--- a/java/res/values-sk/donottranslate-more-keys.xml
+++ b/java/res/values-sk/donottranslate-more-keys.xml
@@ -18,18 +18,90 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">ä,á,à,â,æ,ã,å,ā</string>
- <string name="more_keys_for_e">3,é,ě,è,ê,ë,ę,ė,ē</string>
- <string name="more_keys_for_i">8,í,î,ï,ì,į,ī</string>
- <string name="more_keys_for_o">9,ô,ó,ö,ò,õ,œ,ø,ō</string>
- <string name="more_keys_for_u">7,ú,ú,û,ü,ù,ū</string>
- <string name="more_keys_for_s">š,ß,ś</string>
- <string name="more_keys_for_n">ň,ñ,ń</string>
- <string name="more_keys_for_c">č,ç,ć</string>
- <string name="more_keys_for_y">6,ý,ÿ</string>
- <string name="more_keys_for_d">ď</string>
- <string name="more_keys_for_r">4,ŕ,ř</string>
- <string name="more_keys_for_t">5,ť</string>
- <string name="more_keys_for_z">ž,ź,ż</string>
- <string name="more_keys_for_l">ľ,ĺ,ł</string>
+ <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+ \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+ \u00e6: "æ" LATIN SMALL LETTER AE
+ \u0105: "ą" LATIN SMALL LETTER A WITH OGONEK -->
+ <string name="more_keys_for_a">\u00e1,\u00e4,\u0101,\u00e0,\u00e2,\u00e3,\u00e5,\u00e6,\u0105</string>
+ <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u011b: "ě" LATIN SMALL LETTER E WITH CARON
+ \u0113: "ē" LATIN SMALL LETTER E WITH MACRON
+ \u0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK -->
+ <string name="more_keys_for_e">\u00e9,\u011b,\u0113,\u0117,\u00e8,\u00ea,\u00eb,\u0119</string>
+ <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+ <string name="more_keys_for_i">\u00ed,\u012b,\u012f,\u00ec,\u00ee,\u00ef,\u0131</string>
+ <!-- \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+ <string name="more_keys_for_o">\u00f4,\u00f3,\u00f6,\u00f2,\u00f5,\u0153,\u0151,\u00f8</string>
+ <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u016f: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+ \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON
+ \u0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+ <string name="more_keys_for_u">\u00fa,\u016f,\u00fc,\u016b,\u0173,\u00f9,\u00fb,\u0171</string>
+ <!-- \u0161: "š" LATIN SMALL LETTER S WITH CARON
+ \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u015f: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
+ <string name="more_keys_for_s">\u0161,\u00df,\u015b,\u015f</string>
+ <!-- \u0148: "ň" LATIN SMALL LETTER N WITH CARON
+ \u0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+ \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE
+ \u0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+ <string name="more_keys_for_n">\u0148,\u0146,\u00f1,\u0144,\u0144</string>
+ <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+ \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+ <string name="more_keys_for_c">\u010d,\u00e7,\u0107</string>
+ <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+ \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+ <string name="more_keys_for_y">\u00fd,\u00ff</string>
+ <!-- \u010f: "ď" LATIN SMALL LETTER D WITH CARON -->
+ <string name="more_keys_for_d">\u010f</string>
+ <!-- \u0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
+ \u0159: "ř" LATIN SMALL LETTER R WITH CARON
+ \u0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA -->
+ <string name="more_keys_for_r">\u0155,\u0159,\u0157</string>
+ <!-- \u0165: "ť" LATIN SMALL LETTER T WITH CARON
+ \u0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA -->
+ <string name="more_keys_for_t">\u0165,\u0163</string>
+ <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+ \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+ \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+ <string name="more_keys_for_z">\u017e,\u017c,\u017a</string>
+ <!-- \u0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
+ <string name="more_keys_for_k">\u0137</string>
+ <!-- \u013e: "ľ" LATIN SMALL LETTER L WITH CARON
+ \u013a: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+ \u013c: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+ \u0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
+ <string name="more_keys_for_l">\u013e,\u013a,\u013c,\u0142</string>
+ <!-- \u0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
+ \u011f: "ğ" LATIN SMALL LETTER G WITH BREVE -->
+ <string name="more_keys_for_g">\u0123,\u011f</string>
</resources>
diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml
index b7ab8f204..021987c1a 100644
--- a/java/res/values-sk/strings.xml
+++ b/java/res/values-sk/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Klávesnica Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Klávesnica Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Nastavenia klávesnice Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Možnosti zadávania textu a údajov"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Opravy pravopisu Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Nastavenia kontroly pravopisu"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Použiť údaje o blízkosti"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Na kontr. pravopis. použiť algor. vzdialenosti ako pri kláves."</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Vyhľadať kontakty"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Kontrola pravopisu používa záznamy z vášho zoznamu kontaktov"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Pri stlačení klávesu vibrovať"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Zvuk pri stlačení klávesu"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Zobraziť znaky pri stlačení klávesu"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Oprava textu"</string>
<string name="misc_category" msgid="6894192814868233453">"Ďalšie možnosti"</string>
<string name="advanced_settings" msgid="362895144495591463">"Rozšírené nastavenia"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Možnosti pre skúsených používateľov"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Onesk. zrušenia kľúč. kon. okna"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez oneskorenia"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Predvolená"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Uložené"</string>
<string name="label_go_key" msgid="1635148082137219148">"Hľadať"</string>
<string name="label_next_key" msgid="362972844525672568">"Ďalej"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Pred."</string>
<string name="label_done_key" msgid="2441578748772529288">"Hotovo"</string>
<string name="label_send_key" msgid="2815056534433717444">"Odoslať"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Nie je zadaný žiadny text"</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="954941524766465022">"Povolený kláves Shift"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Povolený kláves Caps Lock"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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_comma" msgid="4970844442999724586">"Čiarka"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Bodka"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Ľavá zátvorka"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Pravá zátvorka"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dvojbodka"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Bodkočiarka"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Výkričník"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Otáznik"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Úvodzovky"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Jednoduché úvodzovky"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Bodka"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Odmocnina"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pí"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Trademark"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Percento"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Hviezdička"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Libra"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Tri bodky"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Dolné úvodzovky"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"Hlasový vstup"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Pre váš jazyk aktuálne nie je hlasový vstup podporovaný, ale funguje v angličtine."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Hlasový vstup používa rozpoznávanie hlasu Google. Na používanie hlasového vstupu sa vzťahujú "<a href="http://m.google.com/privacy">"Pravidlá ochrany osobných údajov pre mobilné služby"</a>"."</string>
@@ -144,7 +144,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Povoliť spätnú väzbu od používateľov"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Automatickým zasielaním štatistík o využívaní editora metódy vstupu a správ o jeho zlyhaní do služby Google môžete prispieť k vylepšeniu tohto nástroja."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Motív klávesnice"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Nemecká klávesnica QWERTY"</string>
<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="prefs_usability_study_mode" msgid="1261130555134595254">"Režim štúdie použiteľnosti"</string>
diff --git a/java/res/values-sl/donottranslate-more-keys.xml b/java/res/values-sl/donottranslate-more-keys.xml
new file mode 100644
index 000000000..6890ac73f
--- /dev/null
+++ b/java/res/values-sl/donottranslate-more-keys.xml
@@ -0,0 +1,30 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- \u0161: "š" LATIN SMALL LETTER S WITH CARON -->
+ <string name="more_keys_for_s">\u0161</string>
+ <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+ <string name="more_keys_for_c">\u010d,\u0107</string>
+ <!-- \u0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
+ <string name="more_keys_for_d">\u0111</string>
+ <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON -->
+ <string name="more_keys_for_z">\u017e</string>
+</resources>
diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml
index d7f357aa0..e29107b2c 100644
--- a/java/res/values-sl/strings.xml
+++ b/java/res/values-sl/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Tipkovnica Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Tipkovnica Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Nastavitve tipkovnice Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Možnosti vnosa"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Preverjanje črkovanja za Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Nastavitve preverjanja črkovanja"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Uporabi podatke bližine"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Uporaba algoritma za preverjanje črkovanja na podlagi bližine znakov na tipkovnici"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Iskanje imen stikov"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Črkovalnik uporablja vnose s seznama stikov"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibriranje ob pritisku tipke"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Zvok ob pritisku tipke"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Povečaj črko ob pritisku"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Popravljanje besedila"</string>
<string name="misc_category" msgid="6894192814868233453">"Druge možnosti"</string>
<string name="advanced_settings" msgid="362895144495591463">"Dodatne nastavitve"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Možnosti za izkušene uporabnike"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Trajanje povečanja tipke"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Brez zakasnitve"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Privzeto"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: shranjeno"</string>
<string name="label_go_key" msgid="1635148082137219148">"Pojdi"</string>
<string name="label_next_key" msgid="362972844525672568">"Naprej"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Nazaj"</string>
<string name="label_done_key" msgid="2441578748772529288">"Dokončano"</string>
<string name="label_send_key" msgid="2815056534433717444">"Pošlji"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Ni vnesenega besedila"</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="954941524766465022">"Tipka »Shift« je omogočena"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Funkcija »Caps Lock« je omogočena"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Vejica"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Pika"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Levi oklepaj"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Desni oklepaj"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dvopičje"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Podpičje"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Klicaj"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Vprašaj"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Dvojni narekovaji"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Enojni narekovaj"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Pika"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Koren"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Blagovna znamka"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Odstotek"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Zvezdica"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Lojtra"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Tri pike"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Spodnji dvojni narekovaji"</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="voice_warning_title" msgid="4419354150908395008">"Glasovni vnos"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Glasovni vnos trenutno ni podprt v vašem jeziku, deluje pa v angleščini."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Glasovni vnos uporablja Googlovo prepoznavanje govora. Zanj velja "<a href="http://m.google.com/privacy">"pravilnik o zasebnosti za mobilne naprave"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Omogoči povratne informacije uporabnikov"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"S samodejnim pošiljanjem statističnih podatkov o uporabi in poročil o zrušitvah Googlu nam lahko pomagate izboljšati urejevalnik načina vnosa."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema tipkovnice"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Nemška QWERTY"</string>
<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="prefs_usability_study_mode" msgid="1261130555134595254">"Način za preučevanje uporabnosti"</string>
diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml
index 0906fce6e..6e04ebfc8 100644
--- a/java/res/values-sr/strings.xml
+++ b/java/res/values-sr/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android тастатура"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android тастатура (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Подешавања Android тастатуре"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Опције уноса"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android исправљање"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Подешавања провере правописа"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Употреба података близине"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Употреба алгоритма близине попут тастатуре за проверу правописа"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Исправљање текста"</string>
<string name="misc_category" msgid="6894192814868233453">"Друге опције"</string>
<string name="advanced_settings" msgid="362895144495591463">"Напредна подешавања"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Опције за искусне кориснике"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Сачувано"</string>
<string name="label_go_key" msgid="1635148082137219148">"Иди"</string>
<string name="label_next_key" msgid="362972844525672568">"Следеће"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Прет."</string>
<string name="label_done_key" msgid="2441578748772529288">"Готово"</string>
<string name="label_send_key" msgid="2815056534433717444">"Пошаљи"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Текст није унет"</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="954941524766465022">"Тастер Shift је омогућен"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock је омогућен"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Зарез"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Тачка"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Лева заграда"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Десна заграда"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Две тачке"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Тачка-зарез"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Знак узвика"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Знак питања"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Дупли наводник"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Полунаводник"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Тачка"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Квадратни корен"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Пи"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Делта"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Жиг"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"За"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Звездица"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Фунта"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Три тачке"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Отворени доњи наводници"</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="voice_warning_title" msgid="4419354150908395008">"Гласовни унос"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Гласовни унос тренутно није подржан за ваш језик, али функционише на енглеском."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Гласовни унос користи Google-ову функцију за препознавање гласа. Примењује се "<a href="http://m.google.com/privacy">"политика приватности за мобилне уређаје"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Омогући повратну информацију корисника"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Помозите да се побољша овај уређивач режима уноса тако што ће се аутоматски послати статистика о коришћењу и извештаји о грешкама компанији Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Тема тастатуре"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY тастатура за немачки"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"енглески (УК)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"енглески (САД)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Режим за студију могућности коришћења"</string>
diff --git a/java/res/values-sv/donottranslate-more-keys.xml b/java/res/values-sv/donottranslate-more-keys.xml
index 1fa29a83e..94bcfa021 100644
--- a/java/res/values-sv/donottranslate-more-keys.xml
+++ b/java/res/values-sv/donottranslate-more-keys.xml
@@ -18,12 +18,37 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_e">3,é,è,ê,ë,ę</string>
- <string name="more_keys_for_o">9,œ,ô,ò,ó,õ,ō</string>
- <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string>
- <string name="more_keys_for_s">ß,ś,š</string>
- <string name="keylabel_for_scandinavia_row2_10">ö</string>
- <string name="keylabel_for_scandinavia_row2_11">ä</string>
- <string name="more_keys_for_scandinavia_row2_10">ø</string>
- <string name="more_keys_for_scandinavia_row2_11">æ</string>
+ <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ \u0119: "ę" LATIN SMALL LETTER E WITH OGONEK -->
+ <string name="more_keys_for_e">\u00e9,\u00e8,\u00ea,\u00eb,\u0119</string>
+ <!-- \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+ <string name="more_keys_for_o">\u0153,\u00f4,\u00f2,\u00f3,\u00f5,\u014d</string>
+ <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fc,\u00fb,\u00f9,\u00fa,\u016b</string>
+ <!-- \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u0161: "š" LATIN SMALL LETTER S WITH CARON -->
+ <string name="more_keys_for_s">\u00df,\u015b,\u0161</string>
+ <!-- \u00e5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
+ <string name="keylabel_for_scandinavia_row1_11">\u00e5</string>
+ <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+ <string name="keylabel_for_scandinavia_row2_10">\u00f6</string>
+ <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+ <string name="keylabel_for_scandinavia_row2_11">\u00e4</string>
+ <!-- \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+ <string name="more_keys_for_scandinavia_row2_10">\u00f8</string>
+ <!-- \u00e6: "æ" LATIN SMALL LETTER AE -->
+ <string name="more_keys_for_scandinavia_row2_11">\u00e6</string>
</resources>
diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
index 46760bbe2..17cb5abd9 100644
--- a/java/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Androids tangentbord"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Androids tangentbord (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Inställningar för Androids tangentbord"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Inmatningsalternativ"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android-korrigering"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Inställningar för stavningskontroll"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Använd närhetsinformation"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Använd tangentbordsliknande närhetsalgoritm för stavningskontroll"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Sök namn på kontakter"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"I stavningskontrollen används poster från kontaktlistan"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrera vid tangenttryck"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Knappljud"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Popup vid knapptryck"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Textkorrigering"</string>
<string name="misc_category" msgid="6894192814868233453">"Andra alternativ"</string>
<string name="advanced_settings" msgid="362895144495591463">"Avancerade inställningar"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Alternativ för expertanvändare"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Ta bort popup-fördröjning"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Fördröj inte"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Standard"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: sparat"</string>
<string name="label_go_key" msgid="1635148082137219148">"Kör"</string>
<string name="label_next_key" msgid="362972844525672568">"Nästa"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Föreg"</string>
<string name="label_done_key" msgid="2441578748772529288">"Färdig"</string>
<string name="label_send_key" msgid="2815056534433717444">"Skicka"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Ingen text har angetts"</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="954941524766465022">"Skift aktiverat"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps Lock är aktiverat"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Komma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Punkt"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Vänster parentes"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Högerparentes"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Kolon"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Semikolon"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Utropstecken"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Frågetecken"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Dubbla citattecken"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Enkla citattecken"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Punkt"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Kvadratrot"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Trademark"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Care of"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Stjärna"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Fyrkant"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellips"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Nedre dubbla citattecken"</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="voice_warning_title" msgid="4419354150908395008">"Röstindata"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Röstindata stöds inte på ditt språk än, men tjänsten fungerar på engelska."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Röstinmatning använder sig av Googles tjänst för taligenkänning. "<a href="http://m.google.com/privacy">"Sekretesspolicyn för mobila enheter"</a>" gäller."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Aktivera synpunkter från användare"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Du kan hjälpa till att förbättra inmatningsmetoden genom att automatiskt skicka användningsstatistik och felrapporter till Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tangentbordstema"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Tyskt QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Engelskt (brittiskt)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Engelskt (amerikanskt)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Läge för studie av användbarhet"</string>
diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml
index 822907b05..b27580c25 100644
--- a/java/res/values-sw/strings.xml
+++ b/java/res/values-sw/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Kibodi ya Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Kicharazio cha Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Mipangilio ya kibodi ya Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Chaguo za uingizaji"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Masahihisho ya Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Mipangilio ya kukagua sarufi"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Tumia data ya ukaribu"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Tumia kibodi kama ukaribu wa algorithmu kwa ukaguzi wa sarufi"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Angalia majina ya wasiliani"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Kikagua tahajia hutumia ingizo kutoka kwa orodha yako ya anwani"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Tetema unabofya kitufe"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Toa sauti unapobofya kitufe"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Ibuka kitufe kinapobonyezwa"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Marekebisho ya maandishi"</string>
<string name="misc_category" msgid="6894192814868233453">"Chaguo zingine"</string>
<string name="advanced_settings" msgid="362895144495591463">"Mipangilio mahiri"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Machaguo ya watumiaji wataalamu"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Kuchelewesha kutupa kitufe ibukizi"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Hakuna kuchelewa"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Chaguo-msingi"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Imehifadhiwa"</string>
<string name="label_go_key" msgid="1635148082137219148">"Nenda"</string>
<string name="label_next_key" msgid="362972844525672568">"Ifuatayo"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Iliyotangulia"</string>
<string name="label_done_key" msgid="2441578748772529288">"Kwisha"</string>
<string name="label_send_key" msgid="2815056534433717444">"Tuma"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Hakuna maandishi yaliyoingizwa"</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="954941524766465022">"Kuhamisha kumewezeshwa"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Herufi kubwa imewezeshwa"</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>
@@ -88,26 +91,14 @@
<string name="spoken_description_mic" msgid="615536748882611950">"Uingizaji sauti"</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_comma" msgid="4970844442999724586">"Koma"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Muda"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Mabano ya kushoto"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"mabano ya kulia"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Nukta mbili juu na chini"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Semikoloni"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Alama ya mshangao"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Alama ya kiulizio"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Nukuu mara mbili"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Nukuu moja"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Nukta"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Square root"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Chapa ya Biashara"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Kwa ulinzi wa"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Nyota"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Pauni"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellipsis"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Nukuu ya chini maradufu"</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="voice_warning_title" msgid="4419354150908395008">"Uingizaji wa sauti"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Uingizaji wa sauti hauhimiliwi kwa lugha yako kwa sasa, lakini inafanya kazi kwa Kiingereza."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Uingizaji wa sauti hutumia utambuaji wa usemi wa Google. "<a href="http://m.google.com/privacy">"Sera ya Faragha ya Simu za mkononi "</a>" hutumika."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Wezesha maoni ya watumiaji"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Saidia kuimarisha mbinu ya uingizaji wa kihariri, kwa kutuma takwimu za matumizi na ripoti za kuvurugika kwa Google kiotomatiki."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Maandhari ya kibodi"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY ya Kijerumani"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Kiingereza cha (Uingereza)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Kiingereza cha (Marekani)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modi ya uchunguzi wa utumizi"</string>
diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml
index 1b8c8a64a..1c725a484 100644
--- a/java/res/values-sw600dp-land/dimens.xml
+++ b/java/res/values-sw600dp-land/dimens.xml
@@ -48,6 +48,7 @@
<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">33.33%</fraction>
<dimen name="suggestions_strip_padding">40.0mm</dimen>
<integer name="max_more_suggestions_row">5</integer>
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml
index 1854a8696..ecc5b7136 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -24,20 +24,22 @@
<bool name="config_enable_show_voice_key_option">false</bool>
<bool name="config_enable_show_popup_on_keypress_option">false</bool>
<bool name="config_enable_bigram_suggestions_option">false</bool>
- <bool name="config_sliding_key_input_enabled">false</bool>
- <bool name="config_digit_more_keys_enabled">false</bool>
<!-- Whether or not Popup on key press is enabled by default -->
<bool name="config_default_popup_preview">false</bool>
<bool name="config_default_sound_enabled">true</bool>
<bool name="config_auto_correction_spacebar_led_enabled">false</bool>
- <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->
- <bool name="config_show_mini_keyboard_at_touched_point">true</bool>
<!-- The language is never displayed if == 0, always displayed if < 0 -->
<integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer>
<!-- Long pressing space will invoke IME switcher if > 0, never invoke IME switcher if == 0 -->
<integer name="config_long_press_space_key_timeout">0</integer>
<!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
<string name="config_default_keyboard_theme_id" translatable="false">5</string>
- <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string>
<integer name="config_max_more_keys_column">5</integer>
+ <!--
+ Configuration for LatinKeyboardView
+ -->
+ <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>
</resources>
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml
index 31830239d..e04609f2a 100644
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-sw600dp/dimens.xml
@@ -40,12 +40,12 @@
<fraction name="keyboard_bottom_padding_ics">0.0%p</fraction>
- <dimen name="mini_keyboard_key_horizontal_padding">6dip</dimen>
+ <dimen name="more_keys_keyboard_key_horizontal_padding">6dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.2 -->
- <dimen name="mini_keyboard_slide_allowance">15.6mm</dimen>
+ <dimen name="more_keys_keyboard_slide_allowance">15.6mm</dimen>
<!-- popup_key_height x -1.0 -->
- <dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen>
+ <dimen name="more_keys_keyboard_vertical_correction">-13.0mm</dimen>
<!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_padding">6dip</dimen>
@@ -59,6 +59,7 @@
<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">32.14%</fraction>
<dimen name="key_preview_height">15.0mm</dimen>
<dimen name="key_preview_offset">0.1in</dimen>
diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml
index 664e8c159..ef39f4393 100644
--- a/java/res/values-sw768dp-land/dimens.xml
+++ b/java/res/values-sw768dp-land/dimens.xml
@@ -52,6 +52,7 @@
<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">17.0mm</dimen>
<dimen name="key_preview_height_ics">26.5mm</dimen>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index c25139a42..c1f9179ee 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -24,20 +24,22 @@
<bool name="config_enable_show_voice_key_option">false</bool>
<bool name="config_enable_show_popup_on_keypress_option">false</bool>
<bool name="config_enable_bigram_suggestions_option">false</bool>
- <bool name="config_sliding_key_input_enabled">false</bool>
- <bool name="config_digit_more_keys_enabled">false</bool>
<!-- Whether or not Popup on key press is enabled by default -->
<bool name="config_default_popup_preview">false</bool>
<bool name="config_default_sound_enabled">true</bool>
<bool name="config_auto_correction_spacebar_led_enabled">false</bool>
- <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->
- <bool name="config_show_mini_keyboard_at_touched_point">true</bool>
<!-- Long pressing space will invoke IME switcher if > 0, never invoke IME switcher if == 0 -->
<integer name="config_long_press_space_key_timeout">0</integer>
<!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
<string name="config_default_keyboard_theme_id" translatable="false">5</string>
- <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string>
<integer name="config_max_more_keys_column">5</integer>
+ <!--
+ Configuration for LatinKeyboardView
+ -->
+ <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"
diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml
index bb4937dd5..f33a657af 100644
--- a/java/res/values-sw768dp/dimens.xml
+++ b/java/res/values-sw768dp/dimens.xml
@@ -43,12 +43,12 @@
<dimen name="popup_key_height">10.0mm</dimen>
- <dimen name="mini_keyboard_key_horizontal_padding">12dip</dimen>
+ <dimen name="more_keys_keyboard_key_horizontal_padding">12dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.2 -->
- <dimen name="mini_keyboard_slide_allowance">15.6mm</dimen>
+ <dimen name="more_keys_keyboard_slide_allowance">15.6mm</dimen>
<!-- popup_key_height x -1.0 -->
- <dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen>
+ <dimen name="more_keys_keyboard_vertical_correction">-13.0mm</dimen>
<!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_padding">6dip</dimen>
@@ -62,6 +62,7 @@
<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">15.0mm</dimen>
<dimen name="key_preview_offset">0.1in</dimen>
diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml
index 53f56606c..815273b78 100644
--- a/java/res/values-th/strings.xml
+++ b/java/res/values-th/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"แป้นพิมพ์ Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android keyboard (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"การตั้งค่าแป้นพิมพ์ Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"ตัวเลือกการป้อนข้อมูล"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"การแก้ไขของ Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"การตั้งค่าการตรวจสอบการสะกด"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"ใช้ข้อมูลที่ใกล้เคียง"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"ใช้อัลกอริทึมใกล้เคียงที่คล้ายกับแป้นพิมพ์สำหรับตรวจสอบการสะกด"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"การแก้ไขข้อความ"</string>
<string name="misc_category" msgid="6894192814868233453">"ตัวเลือกอื่นๆ"</string>
<string name="advanced_settings" msgid="362895144495591463">"การตั้งค่าขั้นสูง"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"ตัวเลือกสำหรับผู้ใช้ที่มีความเชี่ยวชาญ"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : บันทึกแล้ว"</string>
<string name="label_go_key" msgid="1635148082137219148">"ไป"</string>
<string name="label_next_key" msgid="362972844525672568">"ถัดไป"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"ก่อนหน้า"</string>
<string name="label_done_key" msgid="2441578748772529288">"เสร็จสิ้น"</string>
<string name="label_send_key" msgid="2815056534433717444">"ส่ง"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"ไม่มีข้อความ"</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="954941524766465022">"เปิดใช้งาน Shift แล้ว"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"เปิดใช้งาน Caps Lock แล้ว"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"เครื่องหมายจุลภาค"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"มหัพภาค"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"วงเล็บซ้าย"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"วงเล็บขวา"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"เครื่องหมายจุดคู่"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"อัฒภาค"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"อัศเจรีย์"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"เครื่องหมายคำถาม"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"อัญประกาศ"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"เครื่องหมายคำพูดเดี่ยว"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"เครื่องหมายจุด"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"รากที่สอง"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"เดลตา"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"เครื่องหมายการค้า"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Care of"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"ติดดาว"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"ปอนด์"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"จุดไข่ปลา"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"อัญประกาศล่าง"</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="voice_warning_title" msgid="4419354150908395008">"การป้อนข้อมูลด้วยเสียง"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"ขณะนี้การป้อนข้อมูลด้วยเสียงยังไม่ได้รับการสนับสนุนในภาษาของคุณ แต่ใช้ได้ในภาษาอังกฤษ"</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"ป้อนข้อมูลด้วยเสียงใช้การจดจำคำพูดของ Google "<a href="http://m.google.com/privacy">" นโยบายส่วนบุคคลของมือถือ"</a>"มีผลบังคับใช้"</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"เปิดใช้งานการแสดงความคิดเห็นจากผู้ใช้"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"ช่วยปรับปรุงตัวแก้ไขวิธีการป้อนข้อมูลนี้โดยการส่งสถิติการใช้งานและรายงานการขัดข้องถึง Google โดยอัตโนมัติ"</string>
<string name="keyboard_layout" msgid="8451164783510487501">"ชุดรูปแบบแป้นพิมพ์"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"QWERTY ภาษาเยอรมัน"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"อังกฤษ (สหราชอาณาจักร)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"อังกฤษ (อเมริกัน)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"โหมดศึกษาประโยชน์ในการใช้งาน"</string>
diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml
index 701963f2a..f83d8b3e4 100644
--- a/java/res/values-tl/strings.xml
+++ b/java/res/values-tl/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android keyboard"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android keyboard (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Mga setting ng Android keyboard"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Mga pagpipilian sa input"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Pagwawasto sa Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Mga setting ng pang-check ng pagbabaybay"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Gamitin ang proximity data"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Gumamit ng proximity algorithm na tulad ng keyboard para sa pag-check ng pagbabaybay"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Maghanap pangalan contact"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Gumagamit pang-check pagbabaybay entry sa iyong listahan contact"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Mag-vibrate sa keypress"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Tunog sa keypress"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Popup sa keypress"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Pagwawasto ng teksto"</string>
<string name="misc_category" msgid="6894192814868233453">"Iba pang mga pagpipilian"</string>
<string name="advanced_settings" msgid="362895144495591463">"Mga advanced na setting"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Mga pagpipilian para sa mga ekspertong user"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Balewala antala key popup"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Walang antala"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Default"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Na-save"</string>
<string name="label_go_key" msgid="1635148082137219148">"Punta"</string>
<string name="label_next_key" msgid="362972844525672568">"Susunod"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Nkrn"</string>
<string name="label_done_key" msgid="2441578748772529288">"Tapos na"</string>
<string name="label_send_key" msgid="2815056534433717444">"Ipadala"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Walang tekstong inilagay"</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="954941524766465022">"Pinagana ang shift"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Pinagana ang caps lock"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Kuwit"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Tuldok"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Kaliwang panaklong"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Kanang panaklong"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Tutuldok"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Tuldukuwit"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Tandang padamdam"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Tandang pananong"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Panipi"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Kudlit"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Tuldok"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Square root"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Trademark"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Care of"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Star"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Pound"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellipsis"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Mababang panipi"</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="voice_warning_title" msgid="4419354150908395008">"Pag-input ng boses"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Hindi kasalukuyang suportado ang pag-input ng boses para sa iyong wika, ngunit gumagana sa Ingles."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Gumagamit ang pag-input ng boses ng speech recognition ng Google. Nalalapat "<a href="http://m.google.com/privacy">"Ang Patakaran sa Privacy ng Mobile"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Paganahin ang feedback ng user"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Tumulong na pahusayin ang editor ng paraan ng pag-input na ito sa pamamagitan ng awtomatikong pagpapadala ng mga istatistika ng paggamit at mga ulat ng crash sa Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Tema ng keyboard"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"German na QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Ingles (UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Ingles (Estados Unidos)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Study mode ng pagiging kapaki-pakinabang"</string>
diff --git a/java/res/values-tr/donottranslate-more-keys.xml b/java/res/values-tr/donottranslate-more-keys.xml
index 6906b3580..12315e42f 100644
--- a/java/res/values-tr/donottranslate-more-keys.xml
+++ b/java/res/values-tr/donottranslate-more-keys.xml
@@ -18,11 +18,40 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">â</string>
- <string name="more_keys_for_i">8,ı,î,ï,ì,í,į,ī</string>
- <string name="more_keys_for_o">9,ö,ô,œ,ò,ó,õ,ø,ō</string>
- <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string>
- <string name="more_keys_for_s">ş,ß,ś,š</string>
- <string name="more_keys_for_g">ğ</string>
- <string name="more_keys_for_c">ç,ć,č</string>
+ <!-- \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX -->
+ <string name="more_keys_for_a">\u00e2</string>
+ <!-- \u0131: "ı" LATIN SMALL LETTER DOTLESS I
+ \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+ \u012b: "ī" LATIN SMALL LETTER I WITH MACRON -->
+ <string name="more_keys_for_i">\u0131,\u00ee,\u00ef,\u00ec,\u00ed,\u012f,\u012b</string>
+ <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u0153: "œ" LATIN SMALL LIGATURE OE
+ \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+ \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+ <string name="more_keys_for_o">\u00f6,\u00f4,\u0153,\u00f2,\u00f3,\u00f5,\u00f8,\u014d</string>
+ <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u016b: "ū" LATIN SMALL LETTER U WITH MACRON -->
+ <string name="more_keys_for_u">\u00fc,\u00fb,\u00f9,\u00fa,\u016b</string>
+ <!-- \u015f: "ş" LATIN SMALL LETTER S WITH CEDILLA
+ \u00df: "ß" LATIN SMALL LETTER SHARP S
+ \u015b: "ś" LATIN SMALL LETTER S WITH ACUTE
+ \u0161: "š" LATIN SMALL LETTER S WITH CARON -->
+ <string name="more_keys_for_s">\u015f,\u00df,\u015b,\u0161</string>
+ <!-- \u011f: "ğ" LATIN SMALL LETTER G WITH BREVE -->
+ <string name="more_keys_for_g">\u011f</string>
+ <!-- \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ \u010d: "č" LATIN SMALL LETTER C WITH CARON -->
+ <string name="more_keys_for_c">\u00e7,\u0107,\u010d</string>
</resources>
diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
index 4ae7d78c9..56424b05a 100644
--- a/java/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android klavyesi"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android klavye (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android klavye ayarları"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Giriş seçenekleri"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android düzeltme"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Yazım denetimi ayarları"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Yakınlık verilri kullan"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Yazım denetimi içn klavye benzeri yakınlık algoritması kullan"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Kişi adlarını denetle"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Yazım denetleyici, kişi listenizdeki girişleri kullanır"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Tuşa basıldığında titret"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Tuşa basıldığında ses çıkar"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Tuşa basıldığında pop-up aç"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Metin düzeltme"</string>
<string name="misc_category" msgid="6894192814868233453">"Diğer seçenekler"</string>
<string name="advanced_settings" msgid="362895144495591463">"Gelişmiş ayarlar"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Uzman kullanıcılar için seçenekler"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tuş popup içn kaptm ertlm"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Gecikme yok"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Varsayılan"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Kaydedildi"</string>
<string name="label_go_key" msgid="1635148082137219148">"Git"</string>
<string name="label_next_key" msgid="362972844525672568">"İleri"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Önceki"</string>
<string name="label_done_key" msgid="2441578748772529288">"Bitti"</string>
<string name="label_send_key" msgid="2815056534433717444">"Gönder"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Hiç metin girilmedi"</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="954941524766465022">"Üst Karakter Etkin"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Büyük harf etkin"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Virgül"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Nokta"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Sol parantez"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Sağ parantez"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"İki Nokta"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Noktalı virgül"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Ünlem işareti"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Soru işareti"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Çift tırnak"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Tek tırnak işareti"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Nokta"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Karekök"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Ticari marka"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Yüzde işareti"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Yıldız"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Kare"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Üç nokta"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Alt çift tırnak"</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="voice_warning_title" msgid="4419354150908395008">"Ses girişi"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Ses girişi, şu anda sizin diliniz için desteklenmiyor ama İngilizce dilinde kullanılabilir."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Ses girişi Google\'ın konuşma tanıma işlevini kullanır. "<a href="http://m.google.com/privacy">" Mobil Gizlilik Politikası"</a>" geçerlidir."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Kullanıcı geri bildirimini etkinleştir"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Kullanım istatistiklerini ve kilitlenme raporlarını Google\'a otomatik olarak göndererek bu giriş yöntemi düzenleyicisinin iyileştirilmesine yardımcı olun."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Klavye teması"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Almanca QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"İngilizce (BK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"İngilizce (ABD)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Kullanılabilirlik çalışması modu"</string>
diff --git a/java/res/values-fr-rCA/donottranslate-more-keys.xml b/java/res/values-uk/donottranslate-more-keys.xml
index 80e9d9346..7b05f4372 100644
--- a/java/res/values-fr-rCA/donottranslate-more-keys.xml
+++ b/java/res/values-uk/donottranslate-more-keys.xml
@@ -18,8 +18,8 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a">à,â,æ,á,ä,ã,å,ā,ª</string>
- <string name="more_keys_for_q">1</string>
- <string name="more_keys_for_w">2</string>
- <string name="more_keys_for_z"></string>
+ <!-- \u0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
+ <string name="keylabel_for_slavic_yery">\u0456</string>
+ <!-- \u0457: "ї" CYRILLIC SMALL LETTER YI -->
+ <string name="more_keys_for_slavic_yery">\u0457</string>
</resources>
diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml
index 234a9c56a..8d4fbe031 100644
--- a/java/res/values-uk/strings.xml
+++ b/java/res/values-uk/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Клавіатура Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Клавіатура Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Налашт-ня клавіат. Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Парам. введення"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Виправлення Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Налаштування перевірки орфографії"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Використ. дані близькості"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Для перевірки орфогр. викор. алгоритм близьк., аналог. клавіат."</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Виправлення тексту"</string>
<string name="misc_category" msgid="6894192814868233453">"Інші опції"</string>
<string name="advanced_settings" msgid="362895144495591463">"Розширені налаштування"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Налаштування для досвідчених користувачів"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : збережено"</string>
<string name="label_go_key" msgid="1635148082137219148">"Іти"</string>
<string name="label_next_key" msgid="362972844525672568">"Далі"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Назад"</string>
<string name="label_done_key" msgid="2441578748772529288">"Готово"</string>
<string name="label_send_key" msgid="2815056534433717444">"Надісл."</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"Алфавіт"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Текст не введено"</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="954941524766465022">"Shift увімкнено"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps Lock увімкнено"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Кома"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Крапка"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Ліва дужка"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Права дужка"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Двокрапка"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Крапка з комою"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Знак оклику"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Знак питання"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Подвійні лапки"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Одинарні лапки"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Крапка"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Квадратний корінь"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Пі"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Дельта"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Торговельна марка"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Через"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Зірочка"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Решітка"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Три крапки"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Нижні подвійні лапки"</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="voice_warning_title" msgid="4419354150908395008">"Голос. ввід"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Голос. ввід наразі не підтрим. для вашої мови, але можна користуватися англійською."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Голосовий ввід використовує розпізнавання мовлення Google. Застосовується "<a href="http://m.google.com/privacy">"Політика конфіденційності для мобільних пристроїв"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Увімк. відгуки корист."</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Допоможіть покращ. редактор методу введ., автомат. надсилаючи в Google статистику використ. та звіти про збої."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Тема клавіатури"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Німецька клавіатура QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"Англійська (Великобританія)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"Англійська (США)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Режим вивчення зручності у використанні"</string>
diff --git a/java/res/values-vi/donottranslate-more-keys.xml b/java/res/values-vi/donottranslate-more-keys.xml
new file mode 100644
index 000000000..4cfb21373
--- /dev/null
+++ b/java/res/values-vi/donottranslate-more-keys.xml
@@ -0,0 +1,95 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+ \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+ \u1ea3: "ả" LATIN SMALL LETTER A WITH HOOK ABOVE
+ \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+ \u1ea1: "ạ" LATIN SMALL LETTER A WITH DOT BELOW
+ \u0103: "ă" LATIN SMALL LETTER A WITH BREVE
+ \u1eb1: "ằ" LATIN SMALL LETTER A WITH BREVE AND GRAVE
+ \u1eaf: "ắ" LATIN SMALL LETTER A WITH BREVE AND ACUTE
+ \u1eb3: "ẳ" LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
+ \u1eb5: "ẵ" LATIN SMALL LETTER A WITH BREVE AND TILDE
+ \u1eb7: "ặ" LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
+ \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ \u1ea7: "ầ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
+ \u1ea5: "ấ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
+ \u1ea9: "ẩ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+ \u1eab: "ẫ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
+ \u1ead: "ậ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW -->
+ <string name="more_keys_for_a">\u00e0,\u00e1,\u1ea3,\u00e3,\u1ea1,\u0103,\u1eb1,\u1eaf,\u1eb3,\u1eb5,\u1eb7,\u00e2,\u1ea7,\u1ea5,\u1ea9,\u1eab,\u1ead</string>
+ <!-- \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+ \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+ \u1ebb: "ẻ" LATIN SMALL LETTER E WITH HOOK ABOVE
+ \u1ebd: "ẽ" LATIN SMALL LETTER E WITH TILDE
+ \u1eb9: "ẹ" LATIN SMALL LETTER E WITH DOT BELOW
+ \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ \u1ec1: "ề" LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
+ \u1ebf: "ế" LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
+ \u1ec3: "ể" LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+ \u1ec5: "ễ" LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
+ \u1ec7: "ệ" LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW -->
+ <string name="more_keys_for_e">\u00e8,\u00e9,\u1ebb,\u1ebd,\u1eb9,\u00ea,\u1ec1,\u1ebf,\u1ec3,\u1ec5,\u1ec7</string>
+ <!-- \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+ \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+ \u1ec9: "ỉ" LATIN SMALL LETTER I WITH HOOK ABOVE
+ \u0129: "ĩ" LATIN SMALL LETTER I WITH TILDE
+ \u1ecb: "ị" LATIN SMALL LETTER I WITH DOT BELOW -->
+ <string name="more_keys_for_i">\u00ec,\u00ed,\u1ec9,\u0129,\u1ecb</string>
+ <!-- \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ \u1ecf: "ỏ" LATIN SMALL LETTER O WITH HOOK ABOVE
+ \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+ \u1ecd: "ọ" LATIN SMALL LETTER O WITH DOT BELOW
+ \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ \u1ed3: "ồ" LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
+ \u1ed1: "ố" LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
+ \u1ed5: "ổ" LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+ \u1ed7: "ỗ" LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
+ \u1ed9: "ộ" LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+ \u01a1: "ơ" LATIN SMALL LETTER O WITH HORN
+ \u1edd: "ờ" LATIN SMALL LETTER O WITH HORN AND GRAVE
+ \u1edb: "ớ" LATIN SMALL LETTER O WITH HORN AND ACUTE
+ \u1edf: "ở" LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
+ \u1ee1: "ỡ" LATIN SMALL LETTER O WITH HORN AND TILDE
+ \u1ee3: "ợ" LATIN SMALL LETTER O WITH HORN AND DOT BELOW -->
+ <string name="more_keys_for_o">\u00f2,\u00f3,\u1ecf,\u00f5,\u1ecd,\u00f4,\u1ed3,\u1ed1,\u1ed5,\u1ed7,\u1ed9,\u01a1,\u1edd,\u1edb,\u1edf,\u1ee1,\u1ee3</string>
+ <!-- \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+ \u1ee7: "ủ" LATIN SMALL LETTER U WITH HOOK ABOVE
+ \u0169: "ũ" LATIN SMALL LETTER U WITH TILDE
+ \u1ee5: "ụ" LATIN SMALL LETTER U WITH DOT BELOW
+ \u01b0: "ư" LATIN SMALL LETTER U WITH HORN
+ \u1eeb: "ừ" LATIN SMALL LETTER U WITH HORN AND GRAVE
+ \u1ee9: "ứ" LATIN SMALL LETTER U WITH HORN AND ACUTE
+ \u1eed: "ử" LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
+ \u1eef: "ữ" LATIN SMALL LETTER U WITH HORN AND TILDE
+ \u1ef1: "ự" LATIN SMALL LETTER U WITH HORN AND DOT BELOW -->
+ <string name="more_keys_for_u">\u00f9,\u00fa,\u1ee7,\u0169,\u1ee5,\u01b0,\u1eeb,\u1ee9,\u1eed,\u1eef,\u1ef1</string>
+ <!-- \u1ef3: "ỳ" LATIN SMALL LETTER Y WITH GRAVE
+ \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+ \u1ef7: "ỷ" LATIN SMALL LETTER Y WITH HOOK ABOVE
+ \u1ef9: "ỹ" LATIN SMALL LETTER Y WITH TILDE
+ \u1ef5: "ỵ" LATIN SMALL LETTER Y WITH DOT BELOW -->
+ <string name="more_keys_for_y">\u1ef3,\u00fd,\u1ef7,\u1ef9,\u1ef5</string>
+ <!-- \u0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
+ <string name="more_keys_for_d">\u0111</string>
+</resources>
diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml
index e602b495a..ab3d1b1b0 100644
--- a/java/res/values-vi/strings.xml
+++ b/java/res/values-vi/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Bàn phím Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Bàn phím Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Cài đặt bàn phím Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Tùy chọn nhập"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Dịch vụ sửa chính tả của Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Cài đặt kiểm tra chính tả"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Sử dụng dữ liệu gần"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Dùng thuật toán gần, như của bàn phím để k.tra chính tả"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Tra cứu tên liên hệ"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Trình kiểm tra chính tả sử dụng các mục nhập từ danh sách liên hệ của bạn"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Rung khi nhấn phím"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Âm thanh khi nhấn phím"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Cửa sổ bật lên khi nhấn phím"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Sửa văn bản"</string>
<string name="misc_category" msgid="6894192814868233453">"Tùy chọn khác"</string>
<string name="advanced_settings" msgid="362895144495591463">"Cài đặt nâng cao"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Tùy chọn cho người dùng chuyên gia"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Loại bỏ hiển thị phím trễ"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Không có tgian trễ"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Mặc định"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Đã lưu"</string>
<string name="label_go_key" msgid="1635148082137219148">"Tìm"</string>
<string name="label_next_key" msgid="362972844525672568">"Tiếp theo"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Trước"</string>
<string name="label_done_key" msgid="2441578748772529288">"Xong"</string>
<string name="label_send_key" msgid="2815056534433717444">"Gửi"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,8 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Không có ký tự nào được nhập"</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="954941524766465022">"Đã bật Shift"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Đã bật viết hoa"</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>
@@ -88,26 +91,14 @@
<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_comma" msgid="4970844442999724586">"Dấu phẩy"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Dấu chấm"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"Dấu ngoặc trái"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"Dấu ngoặc phải"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Dấu hai chấm"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Dấu chấm phẩy"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Dấu hỏi chấm"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Dấu chấm hỏi"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Dấu ngoặc kép"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Dấu nháy đơn"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Dấu chấm"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Dấu khai căn"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Số Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Thương hiệu"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Dấu phần trăm"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Dấu sao"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Dấu thăng"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Dấu ba chấm"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Dấu nháy kép dưới"</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="voice_warning_title" msgid="4419354150908395008">"Nhập liệu bằng giọng nói"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Nhập liệu bằng giọng nói hiện không được hỗ trợ cho ngôn ngữ của bạn nhưng hoạt động với ngôn ngữ tiếng Anh."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Nhập liệu bằng giọng nói sử dụng nhận dạng giọng nói của Google. Áp dụng "<a href="http://m.google.com/privacy">"Chính sách bảo mật dành cho điện thoại di động"</a>"."</string>
@@ -144,7 +135,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Bật phản hồi của người dùng"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Giúp nâng cao trình chỉnh sửa phương thức nhập này bằng cách tự động gửi thống kê sử dụng và báo cáo sự cố cho Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Chủ đề bàn phím"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"Bàn phím QWERTY tiếng Đức"</string>
<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="prefs_usability_study_mode" msgid="1261130555134595254">"Chế độ nghiên cứu tính khả dụng"</string>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index c3adf23c0..6b2e0a0db 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android 键盘"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android 键盘 (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android 键盘设置"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"输入选项"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android 更正"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"拼写检查设置"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"使用邻近度数据"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"使用类似键盘的邻近度算法进行拼写检查"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"文本更正"</string>
<string name="misc_category" msgid="6894192814868233453">"其他选项"</string>
<string name="advanced_settings" msgid="362895144495591463">"高级设置"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"适合于资深用户的选项"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>:已保存"</string>
<string name="label_go_key" msgid="1635148082137219148">"开始"</string>
<string name="label_next_key" msgid="362972844525672568">"下一步"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"后退"</string>
<string name="label_done_key" msgid="2441578748772529288">"完成"</string>
<string name="label_send_key" msgid="2815056534433717444">"发送"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"未输入文字"</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="954941524766465022">"Shift 已启用"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Caps lock 已启用"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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_comma" msgid="4970844442999724586">"逗号"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"句号"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"左括号"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"右括号"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"冒号"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"分号"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"感叹号"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"问号"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"双引号"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"单引号"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"点"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"平方根"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"圆周率"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"商标符号"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"百分号"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"星号"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"井号"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"省略号"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"低双引号"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"语音输入"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"语音输入功能当前还不支持您的语言,您只能输入英语语音。"</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"语音输入采用了 Google 的语音识别技术,因此请遵守"<a href="http://m.google.com/privacy">"“Google 移动”隐私权政策"</a>"。"</string>
@@ -144,7 +144,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"启用用户反馈"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"自动向 Google 发送使用情况统计信息和崩溃报告,帮助改进该输入法编辑器。"</string>
<string name="keyboard_layout" msgid="8451164783510487501">"键盘主题"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"德语 QWERTY 键盘"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"英语(英国)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"英语(美国)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"可用性研究模式"</string>
diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index 8d60fb7cd..f02b64d33 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Android 鍵盤"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android 鍵盤 (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android 鍵盤設定"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"輸入選項"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Android 拼字修正服務"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"拼字檢查設定"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"使用鄰近資料"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"運用類似鍵盤的鄰近演算法進行拼字檢查"</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>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"文字修正"</string>
<string name="misc_category" msgid="6894192814868233453">"其他選項"</string>
<string name="advanced_settings" msgid="362895144495591463">"進階設定"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"提供給專業使用者的選項"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<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>
@@ -50,7 +52,7 @@
<string name="prefs_suggestion_visibility_show_name" msgid="3219916594067551303">"一律顯示"</string>
<string name="prefs_suggestion_visibility_show_only_portrait_name" msgid="3551821800439659812">"以垂直模式顯示"</string>
<string name="prefs_suggestion_visibility_hide_name" msgid="6309143926422234673">"永遠隱藏"</string>
- <string name="prefs_settings_key" msgid="4623341240804046498">"顯示設定金鑰"</string>
+ <string name="prefs_settings_key" msgid="4623341240804046498">"顯示設定鍵"</string>
<string name="auto_correction" msgid="4979925752001319458">"自動修正"</string>
<string name="auto_correction_summary" msgid="5625751551134658006">"按空白鍵或標點符號時,自動修正前面的錯字"</string>
<string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"關閉"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>:已儲存"</string>
<string name="label_go_key" msgid="1635148082137219148">"開始"</string>
<string name="label_next_key" msgid="362972844525672568">"繼續"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"上一步"</string>
<string name="label_done_key" msgid="2441578748772529288">"完成"</string>
<string name="label_send_key" msgid="2815056534433717444">"傳送"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"未輸入文字"</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="954941524766465022">"Shift 鍵已啟用"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"大寫鎖定已啟用"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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_comma" msgid="4970844442999724586">"逗號"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"句號"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"左括弧"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"右括弧"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"冒號"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"分號"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"驚嘆號"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"問號"</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"雙引號"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"單引號"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"點"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"平方根"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"圓周率"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"商標"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"百分比"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"星號"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"井字鍵"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"省略符號"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"下雙引號"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"語音輸入"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"語音輸入目前不支援您的語言,但是可以辨識英文。"</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"語音輸入使用 Google 的語音辨識功能,並遵循《"<a href="http://m.google.com/privacy">"行動服務隱私權政策"</a>"》。"</string>
@@ -144,7 +144,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"啟用使用者意見回饋"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"自動將使用統計資料和當機報告傳送給 Google,協助改善這個輸入法編輯器。"</string>
<string name="keyboard_layout" msgid="8451164783510487501">"鍵盤主題"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"德文 QWERTY"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"英文 (英式)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"英文 (美式)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"使用性研究模式"</string>
diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml
index 072d17cba..0b95e83cb 100644
--- a/java/res/values-zu/strings.xml
+++ b/java/res/values-zu/strings.xml
@@ -21,12 +21,13 @@
<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="7252517407088836577">"Ikhibhodi ye-Android"</string>
+ <string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Ikhibhodi ye-Android (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Izilungiselelo zekhibhodi ye-Android"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Okukhethwa kukho kokungenayo"</string>
<string name="spell_checker_service_name" msgid="2003013122022285508">"Ukulungisa kwe-Android"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Izilungiselelo zokuhlola ukupela"</string>
- <string name="use_proximity_option_title" msgid="7469233942295924620">"Sebenzisa imininingo ye-proximity"</string>
- <string name="use_proximity_option_summary" msgid="2857708859847261945">"Sebenzisa i-proximity algorithm efana ne-keyboard ukuhlola ukupela"</string>
+ <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Bheka amagama woxhumana nabo"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Isihloli sokupela sisebenzisa okungenayo kusuka kuhlu lalabo oxhumana nabo"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Dlidlizelisa ngokucindezela inkinobho"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Umsindo wokucindezela ukhiye"</string>
<string name="popup_on_keypress" msgid="123894815723512944">"Ugaxekile ngokucindezela ukhiye"</string>
@@ -34,7 +35,8 @@
<string name="correction_category" msgid="2236750915056607613">"Ukulungiswa kombhalo"</string>
<string name="misc_category" msgid="6894192814868233453">"Okunye okukhethwa kukho"</string>
<string name="advanced_settings" msgid="362895144495591463">"Izilungiselelo ezithuthukisiwe"</string>
- <string name="advanced_settings_summary" msgid="5193513161106637254">"Okukhethwa kukho kompetha babasebenzi"</string>
+ <!-- no translation found for advanced_settings_summary (4487980456152830271) -->
+ <skip />
<string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Ukuvela kokhiye cashisa ukulibazisa"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Cha ukulibazisa"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Okuzenzakalelayo"</string>
@@ -64,6 +66,7 @@
<string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Kulondoloziwe"</string>
<string name="label_go_key" msgid="1635148082137219148">"Iya"</string>
<string name="label_next_key" msgid="362972844525672568">"Okulandelayo"</string>
+ <string name="label_previous_key" msgid="1211868118071386787">"Eledlule"</string>
<string name="label_done_key" msgid="2441578748772529288">"Kwenziwe"</string>
<string name="label_send_key" msgid="2815056534433717444">"Thumela"</string>
<string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
@@ -76,8 +79,10 @@
<string name="spoken_no_text_entered" msgid="7479685225597344496">"Awukho umbhalo ofakiwe"</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="954941524766465022">"I-Shift inikwe amandla"</string>
- <string name="spoken_description_caps_lock" msgid="5660626444912131764">"Ukunika amandla ukhiye wombhalo ngamagama amakhulu"</string>
+ <!-- no translation found for spoken_description_shift_shifted (1681877323344195035) -->
+ <skip />
+ <!-- no translation found for spoken_description_caps_lock (3276478269526304432) -->
+ <skip />
<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>
@@ -88,26 +93,21 @@
<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_comma" msgid="4970844442999724586">"Ikhefu"</string>
- <string name="spoken_description_period" msgid="5286614628077903945">"Isikhathi"</string>
- <string name="spoken_description_left_parenthesis" msgid="8524822120595052415">"ama-parenthesis esobunxele"</string>
- <string name="spoken_description_right_parenthesis" msgid="1085757995851933164">"I-parenthesis yesokudla"</string>
- <string name="spoken_description_colon" msgid="4312420908484277077">"Ikholoni"</string>
- <string name="spoken_description_semicolon" msgid="37737920987155179">"Ikhefanangqi"</string>
- <string name="spoken_description_exclamation_mark" msgid="2625684427460737157">"Uphawu lokumemeza"</string>
- <string name="spoken_description_question_mark" msgid="7074097784255379666">"Imaki yombuzo."</string>
- <string name="spoken_description_double_quote" msgid="5485320575389905967">"Ukusho kabili"</string>
- <string name="spoken_description_single_quote" msgid="4451320362665463938">"Isibizo esisodwa"</string>
<string name="spoken_description_dot" msgid="40711082435231673">"Icashazi"</string>
- <string name="spoken_description_square_root" msgid="190595160284757811">"Impande yesikwele"</string>
- <string name="spoken_description_pi" msgid="4554418247799952239">"Pi"</string>
- <string name="spoken_description_delta" msgid="3607948313655721579">"i-Delta"</string>
- <string name="spoken_description_trademark" msgid="475877774077871369">"Uphawu lomkhiqizo"</string>
- <string name="spoken_description_care_of" msgid="7492800237237796530">"Ukunakekela ko"</string>
- <string name="spoken_description_star" msgid="1009742725387231977">"Inkanyezi"</string>
- <string name="spoken_description_pound" msgid="5530577649206922631">"Iphawundi"</string>
- <string name="spoken_description_ellipsis" msgid="1687670869947652062">"Ellipsis"</string>
- <string name="spoken_description_low_double_quote" msgid="3551394572784840975">"Isilinganiso esikabili esiphansi"</string>
+ <!-- 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 />
<string name="voice_warning_title" msgid="4419354150908395008">"Okufakwa ngezwi"</string>
<string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Okufakwa ngezwi akusekelwa olimini lwakho, kodwa kuyasebenza nge-English."</string>
<string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Okufakwayo ngezwi kusebenzisa ukufanisa izwi kwe-Google. "<a href="http://m.google.com/privacy">"Inqubomgomo Yobumfihlo Yefoni"</a>" iyasebenza."</string>
@@ -144,7 +144,6 @@
<string name="prefs_enable_log" msgid="6620424505072963557">"Vumela impendulo yomsebenzisi"</string>
<string name="prefs_description_log" msgid="5827825607258246003">"Siza ukuthuthukisa lo mhleli wendlela yokufakwa ngokusithumela ngokuzenzakalela izibalo zokusetshenziswa nokukhubeka ku-Google."</string>
<string name="keyboard_layout" msgid="8451164783510487501">"Indikimba yekhibhodi"</string>
- <string name="subtype_de_qwerty" msgid="3358900499589259491">"i-QWERTY yesi-German"</string>
<string name="subtype_en_GB" msgid="88170601942311355">"i-English(UK)"</string>
<string name="subtype_en_US" msgid="6160452336634534239">"i-English (US)"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Imodi yesitadi yokusebenziseka"</string>
diff --git a/java/res/values-de-rZZ/donottranslate-more-keys.xml b/java/res/values/additional-proximitychars.xml
index e7ec5e152..03d10d5d8 100644
--- a/java/res/values-de-rZZ/donottranslate-more-keys.xml
+++ b/java/res/values/additional-proximitychars.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2011, The Android Open Source Project
+** 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.
@@ -18,6 +18,6 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_y">6</string>
- <string name="more_keys_for_z"></string>
+ <string-array name="additional_proximitychars">
+ </string-array>
</resources>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 0c9ca4f4a..2dea8fbb4 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -18,15 +18,18 @@
<declare-styleable name="KeyboardTheme">
<!-- Keyboard style -->
<attr name="keyboardStyle" format="reference" />
+ <!-- TODO: Get rid of latinKeyboardStyle -->
<!-- LatinKeyboard style -->
<attr name="latinKeyboardStyle" format="reference" />
<!-- KeyboardView style -->
<attr name="keyboardViewStyle" format="reference" />
- <!-- MiniKeyboard style -->
- <attr name="miniKeyboardStyle" format="reference" />
- <!-- MiniKeyboardView style -->
- <attr name="miniKeyboardViewStyle" format="reference" />
- <attr name="miniKeyboardPanelStyle" format="reference" />
+ <!-- LatinKeyboardView style -->
+ <attr name="latinKeyboardViewStyle" format="reference" />
+ <!-- MoreKeysKeyboard style -->
+ <attr name="moreKeysKeyboardStyle" format="reference" />
+ <!-- MoreKeysKeyboardView style -->
+ <attr name="moreKeysKeyboardViewStyle" format="reference" />
+ <attr name="moreKeysKeyboardPanelStyle" format="reference" />
<!-- Suggestions strip style -->
<attr name="suggestionsStripBackgroundStyle" format="reference" />
<attr name="suggestionsViewStyle" format="reference" />
@@ -57,16 +60,16 @@
<attr name="keyHintLetterRatio" format="float" />
<!-- Size of the text for hint label, in the proportion of key height. -->
<attr name="keyHintLabelRatio" format="float" />
- <!-- Size of the text for upper case letter, in the proportion of key height. -->
- <attr name="keyUppercaseLetterRatio" format="float" />
+ <!-- Size of the text for shifted letter hint, in the proportion of key height. -->
+ <attr name="keyShiftedLetterHintRatio" format="float" />
<!-- Horizontal padding of left/right aligned key label to the edge of the key. -->
<attr name="keyLabelHorizontalPadding" format="dimension" />
<!-- Top and right padding of hint letter to the edge of the key.-->
<attr name="keyHintLetterPadding" format="dimension" />
<!-- Bottom padding of popup hint letter "..." to the edge of the key.-->
<attr name="keyPopupHintLetterPadding" format="dimension" />
- <!-- Top and right padding of upper case letter to the edge of the key.-->
- <attr name="keyUppercaseLetterPadding" format="dimension" />
+ <!-- Top and right padding of shifted letter hint to the edge of the key.-->
+ <attr name="keyShiftedLetterHintPadding" format="dimension" />
<!-- Color to use for the label in a key. -->
<attr name="keyTextColor" format="color" />
@@ -76,9 +79,9 @@
<attr name="keyHintLetterColor" format="color" />
<!-- Key hint label color -->
<attr name="keyHintLabelColor" format="color" />
- <!-- Upper case letter colors -->
- <attr name="keyUppercaseLetterInactivatedColor" format="color" />
- <attr name="keyUppercaseLetterActivatedColor" format="color" />
+ <!-- Shifted letter hint colors -->
+ <attr name="keyShiftedLetterHintInactivatedColor" format="color" />
+ <attr name="keyShiftedLetterHintActivatedColor" format="color" />
<!-- Layout resource for key press feedback.-->
<attr name="keyPreviewLayout" format="reference" />
@@ -100,6 +103,8 @@
<attr name="keyPreviewHeight" format="dimension" />
<!-- Size of the text for key press feedback popup, int the proportion of key height -->
<attr name="keyPreviewTextRatio" format="float" />
+ <!-- Delay after key releasing and key press feedback dismissing in millisecond -->
+ <attr name="keyPreviewLingerTimeout" format="integer" />
<!-- Amount to offset the touch Y coordinate by, for bias correction. -->
<attr name="verticalCorrection" format="dimension" />
@@ -120,6 +125,37 @@
</attr>
</declare-styleable>
+ <declare-styleable name="LatinKeyboardView">
+ <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" />
+ <!-- Key detection hysteresis distance. -->
+ <attr name="keyHysteresisDistance" format="dimension" />
+ <!-- Touch noise threshold time in millisecond -->
+ <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" />
+ <!-- Key repeat start timeout -->
+ <attr name="keyRepeatStartTimeout" format="integer" />
+ <!-- Key repeat interval in millisecond. -->
+ <attr name="keyRepeatInterval" format="integer" />
+ <!-- Long press timeout of letter key in millisecond. -->
+ <attr name="longPressKeyTimeout" format="integer" />
+ <!-- Long press timeout of shift key in millisecond. -->
+ <attr name="longPressShiftKeyTimeout" format="integer" />
+ <!-- Long press timeout of space key in millisecond. -->
+ <attr name="longPressSpaceKeyTimeout" format="integer" />
+ <!-- Ignore special key timeout while typing in millisecond. -->
+ <attr name="ignoreSpecialKeyTimeout" format="integer" />
+ <!-- More keys keyboard will shown at touched point. -->
+ <attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" />
+ </declare-styleable>
+
<declare-styleable name="SuggestionsView">
<attr name="suggestionStripOption" format="integer">
<!-- This should be aligned with SuggestionsViewParams.AUTO_CORRECT_* and etc. -->
@@ -127,9 +163,11 @@
<flag name="autoCorrectUnderline" value="0x02" />
<flag name="validTypedWordBold" value="0x04" />
</attr>
+ <attr name="colorValidTypedWord" format="color" />
<attr name="colorTypedWord" format="color" />
<attr name="colorAutoCorrect" format="color" />
<attr name="colorSuggested" format="color" />
+ <attr name="alphaValidTypedWord" format="integer" />
<attr name="alphaTypedWord" format="integer" />
<attr name="alphaAutoCorrect" format="integer" />
<attr name="alphaSuggested" format="integer" />
@@ -164,10 +202,6 @@
<attr name="verticalGap" format="dimension|fraction" />
<!-- More keys keyboard layout template -->
<attr name="moreKeysTemplate" format="reference" />
- <!-- Locale of the keyboard layout -->
- <attr name="keyboardLocale" format="string" />
- <!-- True if the keyboard is Right-To-Left -->
- <attr name="isRtlKeyboard" format="boolean" />
<!-- Icon set for key top and key preview. -->
<attr name="iconShiftKey" format="reference" />
<attr name="iconDeleteKey" format="reference" />
@@ -178,15 +212,25 @@
<attr name="iconTabKey" format="reference" />
<attr name="iconShortcutKey" format="reference" />
<attr name="iconShortcutForLabel" format="reference" />
- <attr name="iconShiftedShiftKey" format="reference" />
+ <attr name="iconSpaceKeyForNumberLayout" format="reference" />
+ <attr name="iconShiftKeyShifted" format="reference" />
+ <attr name="iconDisabledShortcutKey" format="reference" />
<attr name="iconPreviewTabKey" format="reference" />
</declare-styleable>
<declare-styleable name="Keyboard_Key">
<!-- The unicode value that this key outputs. -->
<attr name="code" format="integer" />
+ <!-- The alternate unicode value that this key outputs while typing. -->
+ <attr name="altCode" format="integer" />
<!-- The keys to display in the more keys keyboard. -->
<attr name="moreKeys" format="string" />
+ <!-- The keys to display in the more keys keyboard in addition to moreKeys.
+ The additional more keys are inserted at the '%' markers in the moreKeys if any.
+ They are inserted at the head of moreKeys if none.
+ If there are remaining entries of additionalMoreKeys even after all '%' markers have
+ been replaced, those remaining entries are appended at the end of moreKeys. -->
+ <attr name="additionalMoreKeys" format="string" />
<!-- Maximum column of more keys keyboard -->
<attr name="maxMoreKeysColumn" format="integer" />
<attr name="backgroundType" format="enum">
@@ -194,19 +238,26 @@
<enum name="normal" value="0" />
<enum name="functional" value="1" />
<enum name="action" value="2" />
- <enum name="sticky" value="3" />
+ <enum name="stickyOff" value="3" />
+ <enum name="stickyOn" value="4" />
+ </attr>
+ <!-- The key action flags. -->
+ <attr name="keyActionFlags" format="integer">
+ <!-- This should be aligned with Key.ACTION_FLAGS_* -->
+ <flag name="isRepeatable" value="0x01" />
+ <flag name="noKeyPreview" value="0x02" />
+ <flag name="altCodeWhileTyping" value="0x04" />
+ <flag name="enableLongPress" value="0x08" />
</attr>
- <!-- Whether long-pressing on this key will make it repeat. -->
- <attr name="isRepeatable" format="boolean" />
<!-- 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 hint label to display on the key in conjunction with the label. -->
<attr name="keyHintLabel" format="string" />
- <!-- The key label option. -->
- <attr name="keyLabelOption" format="integer">
- <!-- This should be aligned with Key.LABEL_OPTION_* -->
+ <!-- The key label flags. -->
+ <attr name="keyLabelFlags" format="integer">
+ <!-- This should be aligned with Key.LABEL_FLAGS__* -->
<flag name="alignLeft" value="0x01" />
<flag name="alignRight" value="0x02" />
<flag name="alignLeftOfCenter" value="0x08" />
@@ -216,15 +267,24 @@
<flag name="followKeyLetterRatio" value="0x80" />
<flag name="followKeyHintLabelRatio" value="0x100" />
<flag name="hasPopupHint" value="0x200" />
- <flag name="hasUppercaseLetter" value="0x400" />
+ <flag name="hasShiftedLetterHint" value="0x400" />
<flag name="hasHintLabel" value="0x800" />
<flag name="withIconLeft" value="0x1000" />
<flag name="withIconRight" value="0x2000" />
<flag name="autoXScale" value="0x4000" />
+ <!-- If true, character case of code, altCode, moreKeys, keyOutputText, keyLabel,
+ or keyHintLabel will never be subject to change. -->
+ <flag name="preserveCase" value="0x8000" />
+ <!-- If true, use keyShiftedLetterHintActivatedColor for the shifted letter hint and
+ keyTextInactivatedColor for the primary key top label. -->
+ <flag name="shiftedLetterActivated" value="0x10000" />
+ <!-- If true, use EditorInfo.actionLabel for the key label. -->
+ <flag name="fromCustomActionLabel" value="0x20000" />
</attr>
<!-- The icon to display on the key instead of the label. -->
<attr name="keyIcon" format="enum">
- <!-- This should be aligned with KeyboardIcons.ICON_* -->
+ <!-- This should be aligned with the KeyboardIconsSet.ICON_* -->
+ <enum name="iconUndefined" value="0" />
<enum name="iconShiftKey" value="1" />
<enum name="iconDeleteKey" value="2" />
<enum name="iconSettingsKey" value="3" />
@@ -234,21 +294,21 @@
<enum name="iconTabKey" value="7" />
<enum name="iconShortcutKey" value="8" />
<enum name="iconShortcutForLabel" value="9" />
+ <enum name="iconSpaceKeyForNumberLayout" value="10" />
+ <enum name="iconShiftKeyShifted" value="11" />
</attr>
- <!-- Shift key icon for shifted state -->
- <attr name="keyIconShifted" format="enum">
- <!-- This should be aligned with KeyboardIcons.ICON_SHIFTED_* -->
- <enum name="iconShiftedShiftKey" value="10" />
+ <!-- The icon for disabled key -->
+ <attr name="keyIconDisabled" format="enum">
+ <!-- This should be aligned with the KeyboardIconsSet.ICON_* -->
+ <enum name="iconDisabledShortcutKey" value="12" />
</attr>
<!-- The icon to show in the popup preview. -->
<attr name="keyIconPreview" format="enum">
- <!-- This should be aligned with KeyboardIcons.ICON_PREVIEW_* -->
- <enum name="iconPreviewTabKey" value="11" />
+ <!-- This should be aligned with the KeyboardIconsSet.ICON_* -->
+ <enum name="iconPreviewTabKey" value="13" />
</attr>
<!-- The key style to specify a set of key attributes defined by <key_style/> -->
<attr name="keyStyle" format="string" />
- <!-- The key is enabled and responds on press. -->
- <attr name="enabled" format="boolean" />
<!-- Visual insets -->
<attr name="visualInsetsLeft" format="dimension|fraction" />
<attr name="visualInsetsRight" format="dimension|fraction" />
@@ -273,6 +333,19 @@
</declare-styleable>
<declare-styleable name="Keyboard_Case">
+ <!-- This should be aligned with KeyboardSet_Element's elementName. -->
+ <attr name="keyboardSetElement" format="enum|string">
+ <enum name="alphabet" value="0" />
+ <enum name="alphabetManualShifted" value="1" />
+ <enum name="alphabetAutomaticShifted" value="2" />
+ <enum name="alphabetShiftLocked" value="3" />
+ <enum name="alphabetShiftLockShifted" value="4" />
+ <enum name="symbols" value="5" />
+ <enum name="symbolsShifted" value="6" />
+ <enum name="phone" value="7" />
+ <enum name="phoneSymbols" value="8" />
+ <enum name="number" value="9" />
+ </attr>
<!-- This should be aligned with KeyboardId.MODE_* -->
<attr name="mode" format="enum|string">
<enum name="text" value="0" />
@@ -295,6 +368,7 @@
<attr name="clobberSettingsKey" format="boolean" />
<attr name="shortcutKeyEnabled" format="boolean" />
<attr name="hasShortcutKey" format="boolean" />
+ <attr name="isMultiLine" format="boolean" />
<attr name="imeAction" format="enum">
<!-- This should be aligned with EditorInfo.IME_ACTION_* -->
<enum name="actionUnspecified" value="0" />
@@ -305,6 +379,8 @@
<enum name="actionNext" value="5" />
<enum name="actionDone" value="6" />
<enum name="actionPrevious" value="7" />
+ <!-- This should be aligned with KeyboardId.IME_ACTION_* -->
+ <enum name="actionCustomLabel" value="0x100" />
</attr>
<attr name="localeCode" format="string" />
<attr name="languageCode" format="string" />
@@ -316,11 +392,25 @@
<attr name="parentStyle" format="string" />
</declare-styleable>
- <declare-styleable name="LatinKeyboard">
- <attr name="autoCorrectionSpacebarLedEnabled" format="boolean" />
- <attr name="autoCorrectionSpacebarLedIcon" format="reference" />
- <attr name="disabledShortcutIcon" format="reference" />
- <attr name="spacebarTextColor" format="color" />
- <attr name="spacebarTextShadowColor" format="color" />
+ <declare-styleable name="KeyboardSet">
+ <!-- Locale of the keyboard layouts -->
+ <attr name="keyboardLocale" format="string" />
+ </declare-styleable>
+
+ <declare-styleable name="KeyboardSet_Element">
+ <!-- This should be aligned with KeyboardId.ELEMENT_* -->
+ <attr name="elementName" format="enum">
+ <enum name="alphabet" value="0" />
+ <enum name="alphabetManualShifted" value="1" />
+ <enum name="alphabetAutomaticShifted" value="2" />
+ <enum name="alphabetShiftLocked" value="3" />
+ <enum name="alphabetShiftLockShifted" value="4" />
+ <enum name="symbols" value="5" />
+ <enum name="symbolsShifted" value="6" />
+ <enum name="phone" value="7" />
+ <enum name="phoneSymbols" value="8" />
+ <enum name="number" value="9" />
+ </attr>
+ <attr name="elementKeyboard" format="reference"/>
</declare-styleable>
</resources>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 3f676ab25..cb13ba30b 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -25,9 +25,8 @@
<bool name="config_enable_show_voice_key_option">true</bool>
<bool name="config_enable_show_popup_on_keypress_option">true</bool>
<bool name="config_enable_bigram_suggestions_option">true</bool>
- <bool name="config_enable_usability_study_mode_option">false</bool>
- <bool name="config_sliding_key_input_enabled">true</bool>
- <bool name="config_digit_more_keys_enabled">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_popup_preview">true</bool>
<!-- Default value for bigram suggestion: while showing suggestions for a word should we weigh
@@ -38,9 +37,6 @@
<bool name="config_default_bigram_prediction">false</bool>
<bool name="config_default_sound_enabled">false</bool>
<bool name="config_default_vibration_enabled">true</bool>
- <bool name="config_auto_correction_spacebar_led_enabled">false</bool>
- <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->
- <bool name="config_show_mini_keyboard_at_touched_point">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_delay_update_suggestions">100</integer>
@@ -48,27 +44,40 @@
<integer name="config_delay_update_shift_state">100</integer>
<integer name="config_duration_of_fadeout_language_on_spacebar">50</integer>
<integer name="config_final_fadeout_percentage_of_language_on_spacebar">50</integer>
- <integer name="config_delay_before_preview">0</integer>
- <integer name="config_delay_after_preview">70</integer>
- <integer name="config_mini_keyboard_fadein_anim_time">0</integer>
- <integer name="config_mini_keyboard_fadeout_anim_time">100</integer>
- <integer name="config_delay_before_key_repeat_start">400</integer>
- <integer name="config_key_repeat_interval">50</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_spaces_turn_into_period_timeout">1100</integer>
+ <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
+ <string name="config_default_keyboard_theme_id" translatable="false">5</string>
+ <integer name="config_max_more_keys_column">5</integer>
+ <!--
+ Configuration for KeyboardView
+ -->
+ <integer name="config_key_preview_linger_timeout">70</integer>
+ <!--
+ Configuration for LatinKeyboardView
+ -->
+ <dimen name="config_key_hysteresis_distance">0.05in</dimen>
+ <integer name="config_touch_noise_threshold_time">40</integer>
+ <dimen name="config_touch_noise_threshold_distance">2.0mm</dimen>
+ <bool name="config_sliding_key_input_enabled">true</bool>
+ <integer name="config_key_repeat_start_timeout">400</integer>
+ <integer name="config_key_repeat_interval">50</integer>
<integer name="config_long_press_key_timeout">400</integer>
<!-- Long pressing shift will invoke caps-lock if > 0, never invoke caps-lock if == 0 -->
<integer name="config_long_press_shift_key_timeout">1200</integer>
<!-- Long pressing space will invoke IME switcher if > 0, never invoke IME switcher if == 0 -->
- <integer name="config_long_press_space_key_timeout">@integer/config_long_press_key_timeout</integer>
- <integer name="config_touch_noise_threshold_millis">40</integer>
- <integer name="config_double_spaces_turn_into_period_timeout">1100</integer>
+ <integer name="config_long_press_space_key_timeout">
+ @integer/config_long_press_key_timeout</integer>
<integer name="config_ignore_special_key_timeout">700</integer>
- <dimen name="config_touch_noise_threshold_distance">2.0mm</dimen>
- <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
- <string name="config_default_keyboard_theme_id" translatable="false">5</string>
- <string name="config_text_size_of_language_on_spacebar" translatable="false">small</string>
- <integer name="config_max_more_keys_column">5</integer>
+ <!-- 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>
+ <!--
+ 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></item>
@@ -81,9 +90,11 @@
will be subject to auto-correction. -->
<item>0</item>
</string-array>
- <!-- Threshold of the normalized score of the best suggestion for the spell checker to declare a word to be "likely" -->
- <string name="spellchecker_likely_threshold_value" translatable="false">0.11</string>
- <!-- Threshold of the normalized score of any dictionary lookup to be offered as a suggestion by the spell checker -->
+ <!-- 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>
+ <!-- Threshold of the normalized score of any dictionary lookup to be offered as a suggestion
+ by the spell checker -->
<string name="spellchecker_suggestion_threshold_value" translatable="false">0.03</string>
<!-- Screen metrics for logging.
0 = "mdpi phone screen"
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 352141ca6..41a297902 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -26,8 +26,8 @@
<dimen name="popup_key_height">0.330in</dimen>
- <dimen name="mini_keyboard_horizontal_edges_padding">16dip</dimen>
- <dimen name="mini_keyboard_key_horizontal_padding">8dip</dimen>
+ <dimen name="more_keys_keyboard_horizontal_edges_padding">16dip</dimen>
+ <dimen name="more_keys_keyboard_key_horizontal_padding">8dip</dimen>
<fraction name="keyboard_top_padding">1.556%p</fraction>
<fraction name="keyboard_bottom_padding">4.669%p</fraction>
@@ -48,13 +48,13 @@
<fraction name="keyboard_bottom_padding_ics">4.669%p</fraction>
<fraction name="key_bottom_gap_ics">6.127%p</fraction>
<fraction name="key_horizontal_gap_ics">1.739%p</fraction>
- <dimen name="mini_keyboard_horizontal_edges_padding_ics">4dip</dimen>
+ <dimen name="more_keys_keyboard_horizontal_edges_padding_ics">4dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.2 -->
- <dimen name="mini_keyboard_slide_allowance">0.396in</dimen>
+ <dimen name="more_keys_keyboard_slide_allowance">0.396in</dimen>
<!-- popup_key_height x -1.0 -->
- <dimen name="mini_keyboard_vertical_correction">-0.330in</dimen>
+ <dimen name="more_keys_keyboard_vertical_correction">-0.330in</dimen>
<!-- We use "inch", not "dip" because this value tries dealing with physical distance related
to user's finger. -->
<dimen name="keyboard_vertical_correction">0.0in</dimen>
@@ -66,6 +66,7 @@
<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">80sp</dimen>
<dimen name="key_preview_offset">0.1in</dimen>
@@ -95,6 +96,4 @@
<dimen name="more_suggestions_hint_text_size">27dip</dimen>
<integer name="suggestions_count_in_strip">3</integer>
<integer name="center_suggestion_percentile">36</integer>
-
- <dimen name="key_hysteresis_distance">0.05in</dimen>
</resources>
diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml
index 6c7753999..17fd9a86d 100644
--- a/java/res/values/donottranslate-more-keys.xml
+++ b/java/res/values/donottranslate-more-keys.xml
@@ -19,39 +19,54 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="more_keys_for_a"></string>
- <string name="more_keys_for_e">3</string>
- <string name="more_keys_for_i">8</string>
- <string name="more_keys_for_o">9</string>
- <string name="more_keys_for_u">7</string>
+ <string name="more_keys_for_e"></string>
+ <string name="more_keys_for_i"></string>
+ <string name="more_keys_for_o"></string>
+ <string name="more_keys_for_u"></string>
<string name="more_keys_for_s"></string>
<string name="more_keys_for_n"></string>
<string name="more_keys_for_c"></string>
- <string name="more_keys_for_y">6</string>
- <string name="more_keys_for_q">1</string>
- <string name="more_keys_for_w">2</string>
+ <string name="more_keys_for_y"></string>
<string name="more_keys_for_d"></string>
- <string name="more_keys_for_r">4</string>
- <string name="more_keys_for_t">5</string>
+ <string name="more_keys_for_r"></string>
+ <string name="more_keys_for_t"></string>
<string name="more_keys_for_z"></string>
<string name="more_keys_for_k"></string>
<string name="more_keys_for_l"></string>
<string name="more_keys_for_g"></string>
- <string name="more_keys_for_p">0</string>
<string name="more_keys_for_v"></string>
+ <string name="keylabel_for_scandinavia_row1_11"></string>
<string name="keylabel_for_scandinavia_row2_10"></string>
<string name="keylabel_for_scandinavia_row2_11"></string>
<string name="more_keys_for_scandinavia_row2_10"></string>
<string name="more_keys_for_scandinavia_row2_11"></string>
- <string name="more_keys_for_cyrillic_e"></string>
- <string name="more_keys_for_cyrillic_soft_sign"></string>
- <string name="more_keys_for_cyrillic_ha"></string>
- <string name="more_keys_for_currency_dollar">¢,£,€,¥,₱</string>
- <string name="more_keys_for_currency_euro">¢,£,$,¥,₱</string>
- <string name="more_keys_for_currency_pound">¢,$,€,¥,₱</string>
- <string name="more_keys_for_currency_general">¢,$,€,£,¥,₱</string>
- <string name="more_keys_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string>
+ <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+ <string name="keylabel_for_slavic_shcha">\u0449</string>
+ <!-- \u044b: "ы" CYRILLIC SMALL LETTER YERU -->
+ <string name="keylabel_for_slavic_yery">\u044b</string>
+ <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+ <string name="keylabel_for_slavic_i">\u0438</string>
+ <string name="more_keys_for_slavic_u"></string>
+ <string name="more_keys_for_slavic_ye"></string>
+ <string name="more_keys_for_slavic_en"></string>
+ <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_slavic_ha">\u044a</string>
+ <string name="more_keys_for_slavic_yery"></string>
+ <string name="more_keys_for_slavic_o"></string>
+ <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_slavic_soft_sign">\u044a</string>
+ <!-- \u00a2: "¢" CENT SIGN
+ \u00a3: "£" POUND SIGN
+ \u20ac: "€" EURO SIGN
+ \u00a5: "¥" YEN SIGN
+ \u20b1: "₱" PESO SIGN -->
+ <string name="more_keys_for_currency_dollar">\u00a2,\u00a3,\u20ac,\u00a5,\u20b1</string>
+ <string name="more_keys_for_currency_euro">\u00a2,\u00a3,$,\u00a5,\u20b1</string>
+ <string name="more_keys_for_currency_pound">\u00a2,$,\u20ac,\u00a5,\u20b1</string>
+ <string name="more_keys_for_currency_general">\u00a2,$,\u20ac,\u00a3,\u00a5,\u20b1</string>
+ <string name="more_keys_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\|:-\\\\ ,:\'(|:\'( ,:-D|:-D "</string>
<string name="more_keys_for_punctuation">"\\,,\?,!,:,-,\',\",(,),/,;,+,&amp;,\@"</string>
- <integer name="mini_keyboard_column_for_punctuation">7</integer>
+ <integer name="more_keys_keyboard_column_for_punctuation">7</integer>
<string name="keyhintlabel_for_punctuation"></string>
<string name="keylabel_for_popular_domain">".com"</string>
<!-- popular web domains for the locale - most popular, displayed on the keyboard -->
@@ -66,16 +81,41 @@
<string name="keylabel_for_symbols_8">8</string>
<string name="keylabel_for_symbols_9">9</string>
<string name="keylabel_for_symbols_0">0</string>
- <string name="more_keys_for_symbols_1">¹,½,⅓,¼,⅛</string>
- <string name="more_keys_for_symbols_2">²,⅔</string>
- <string name="more_keys_for_symbols_3">³,¾,⅜</string>
- <string name="more_keys_for_symbols_4">⁴</string>
- <string name="more_keys_for_symbols_5">⅝</string>
+ <string name="additional_more_keys_for_symbols_1"></string>
+ <string name="additional_more_keys_for_symbols_2"></string>
+ <string name="additional_more_keys_for_symbols_3"></string>
+ <string name="additional_more_keys_for_symbols_4"></string>
+ <string name="additional_more_keys_for_symbols_5"></string>
+ <string name="additional_more_keys_for_symbols_6"></string>
+ <string name="additional_more_keys_for_symbols_7"></string>
+ <string name="additional_more_keys_for_symbols_8"></string>
+ <string name="additional_more_keys_for_symbols_9"></string>
+ <string name="additional_more_keys_for_symbols_0"></string>
+ <!-- \u00b9: "¹" SUPERSCRIPT ONE
+ \u00bd: "½" VULGAR FRACTION ONE HALF
+ \u2153: "⅓" VULGAR FRACTION ONE THIRD
+ \u00bc: "¼" VULGAR FRACTION ONE QUARTER
+ \u215b: "⅛" VULGAR FRACTION ONE EIGHTH -->
+ <string name="more_keys_for_symbols_1">\u00b9,\u00bd,\u2153,\u00bc,\u215b</string>
+ <!-- \u00b2: "²" SUPERSCRIPT TWO
+ \u2154: "⅔" VULGAR FRACTION TWO THIRDS -->
+ <string name="more_keys_for_symbols_2">\u00b2,\u2154</string>
+ <!-- \u00b3: "³" SUPERSCRIPT THREE
+ \u00be: "¾" VULGAR FRACTION THREE QUARTERS
+ \u215c: "⅜" VULGAR FRACTION THREE EIGHTHS -->
+ <string name="more_keys_for_symbols_3">\u00b3,\u00be,\u215c</string>
+ <!-- \u2074: "⁴" SUPERSCRIPT FOUR -->
+ <string name="more_keys_for_symbols_4">\u2074</string>
+ <!-- \u215d: "⅝" VULGAR FRACTION FIVE EIGHTHS -->
+ <string name="more_keys_for_symbols_5">\u215d</string>
<string name="more_keys_for_symbols_6"></string>
- <string name="more_keys_for_symbols_7">⅞</string>
+ <!-- \u215e: "⅞" VULGAR FRACTION SEVEN EIGHTHS -->
+ <string name="more_keys_for_symbols_7">\u215e</string>
<string name="more_keys_for_symbols_8"></string>
<string name="more_keys_for_symbols_9"></string>
- <string name="more_keys_for_symbols_0">ⁿ,∅</string>
+ <!-- \u207f: "ⁿ" SUPERSCRIPT LATIN SMALL LETTER N
+ \u2205: "∅" EMPTY SET -->
+ <string name="more_keys_for_symbols_0">\u207f,\u2205</string>
<string name="keylabel_for_comma">,</string>
<string name="keylabel_for_f1">,</string>
<string name="keylabel_for_symbols_question">\?</string>
@@ -83,22 +123,68 @@
<string name="keylabel_for_symbols_percent">%</string>
<string name="more_keys_for_comma"></string>
<string name="more_keys_for_f1"></string>
- <!-- @icon/3 is iconSettingsKey -->
- <string name="more_keys_for_f1_settings">\@icon/3|\@integer/key_settings</string>
- <!-- @icon/7 is iconTabKey -->
- <string name="more_keys_for_f1_navigate">\@icon/7|\@integer/key_tab</string>
- <string name="more_keys_for_symbols_question">¿</string>
+ <string name="more_keys_for_f1_settings">\@icon/settingsKey|\@integer/key_settings</string>
+ <string name="more_keys_for_f1_navigate">\@icon/tabKey|\@integer/key_tab</string>
+ <!-- \u00bf: "¿" INVERTED QUESTION MARK -->
+ <string name="more_keys_for_symbols_question">\u00bf</string>
<string name="more_keys_for_symbols_semicolon"></string>
- <string name="more_keys_for_symbols_percent">‰</string>
+ <!-- \u2030: "‰" PER MILLE SIGN -->
+ <string name="more_keys_for_symbols_percent">\u2030</string>
<string name="keylabel_for_apostrophe">\'</string>
<string name="keylabel_for_dash">-</string>
<string name="keyhintlabel_for_apostrophe">\"</string>
<string name="keyhintlabel_for_dash">_</string>
<string name="more_keys_for_apostrophe">\"</string>
<string name="more_keys_for_dash">_</string>
- <string name="more_keys_for_bullet">♪,♥,♠,♦,♣</string>
- <string name="more_keys_for_star">†,‡,★</string>
- <string name="more_keys_for_plus">±</string>
+ <!-- \u266a: "♪" EIGHTH NOTE
+ \u2665: "♥" BLACK HEART SUIT
+ \u2660: "♠" BLACK SPADE SUIT
+ \u2666: "♦" BLACK DIAMOND SUIT
+ \u2663: "♣" BLACK CLUB SUIT -->
+ <string name="more_keys_for_bullet">\u266a,\u2665,\u2660,\u2666,\u2663</string>
+ <!-- \u2020: "†" DAGGER
+ \u2021: "‡" DOUBLE DAGGER
+ \u2605: "★" BLACK STAR -->
+ <string name="more_keys_for_star">\u2020,\u2021,\u2605</string>
+ <!-- \u00b1: "±" PLUS-MINUS SIGN -->
+ <string name="more_keys_for_plus">\u00b1</string>
+ <!-- The all letters need to be mirrored are found at
+ http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
+ <integer name="keycode_for_left_parenthesis">0x0028</integer>
+ <integer name="keycode_for_right_parenthesis">0x0029</integer>
<string name="more_keys_for_left_parenthesis">[,{,&lt;</string>
<string name="more_keys_for_right_parenthesis">],},&gt;</string>
+ <integer name="keycode_for_less_than">0x003c</integer>
+ <integer name="keycode_for_greater_than">0x003e</integer>
+ <!-- \u2264: "≤" LESS-THAN OR EQUAL TO
+ \u2265: "≥" GREATER-THAN EQUAL TO
+ \u00ab: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ \u00bb: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+ \u2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+ \u203a: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+ The following characters don't need BIDI mirroring.
+ \u2018: "‘" LEFT SINGLE QUOTATION MARK
+ \u2019: "’" RIGHT SINGLE QUOTATION MARK
+ \u201a: "‚" SINGLE LOW-9 QUOTATION MARK
+ \u201b: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+ \u201c: "“" LEFT DOUBLE QUOTATION MARK
+ \u201d: "”" RIGHT DOUBLE QUOTATION MARK
+ \u201e: "„" DOUBLE LOW-9 QUOTATION MARK
+ \u201f: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+ <string name="more_keys_for_less_than">\u2264,\u00ab,\u2039</string>
+ <string name="more_keys_for_greater_than">\u2265,\u00bb,\u203a</string>
+ <integer name="keycode_for_left_square_bracket">0x005b</integer>
+ <integer name="keycode_for_right_square_bracket">0x005d</integer>
+ <integer name="keycode_for_left_curly_bracket">0x007b</integer>
+ <integer name="keycode_for_right_curly_bracket">0x007d</integer>
+ <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
+ <string name="more_keys_for_single_quote">\u2019,\u201a,\u2018,\u201b</string>
+ <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+ <!-- <string name="more_keys_for_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb</string> -->
+ <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
+ <string name="more_keys_for_double_quote">\u201d,\u00ab,\u201c,\u00bb</string>
+ <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+ <!-- <string name="more_keys_for_tablet_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb,\u2018,\u2019,\u201a,\u201b</string> -->
+ <!-- The 8-more keys with maxMoreKeysColumn=4 will be displayed in order of "3,1,2,4|7,5,6,8". -->
+ <string name="more_keys_for_tablet_double_quote">\u201d,\u00ab,\u201c,\u00bb,\u2019,\u201a,\u2018,\u201b</string>
</resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index aefaec9ef..a00dddfa3 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -19,7 +19,7 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Symbols that are suggested between words -->
- <string name="suggested_punctuations">!?,:;\u0022()\u0027-/@_</string>
+ <string name="suggested_punctuations">!,?,\\,,:,;,\u0022,(,),\u0027,-,/,@,_</string>
<!-- Symbols that should be swapped with a magic space -->
<string name="magic_space_swapping_symbols">.,;:!?)]}\u0022</string>
<!-- Symbols that should strip a magic space -->
@@ -32,18 +32,18 @@
magic_space_swapping_symbols | magic_space_stripping_symbols |
magic_space_neutral_symbols \ symbols_excluded_from_word_separators -->
<!-- Symbol characters list that should switch back to the main layout -->
- <!-- \u0022: Quotation mark (double quotation mark)
- \u0027: Apostrophe (single quotation mark)
- \u2018: Left single quotation mark
- \u2019: Right single quotation mark
- \u201a: Single low-9 quotation mark
- \u201b: Single high-reversed-9 quotation mark
- \u201c: Left double quotation mark
- \u201d: Right double quotation mark
- \u201e: Double low-9 quotation mark
- \u201f: Double high-reversed-9 quotation mark
- \u00ab: Left-pointing double angle quotation mark
- \u00bb: Right-pointing double angle quotation mark -->
+ <!-- \u0022: """ QUOTATION MARK (double quotation mark)
+ \u0027: "'" APOSTROPHE (single quotation mark)
+ \u2018: "‘" LEFT SINGLE QUOTATION MARK
+ \u2019: "’" RIGHT SINGLE QUOTATION MARK
+ \u201a: "‚" SINGLE LOW-9 QUOTATION MARK
+ \u201b: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+ \u201c: "“" LEFT DOUBLE QUOTATION MARK
+ \u201d: "”" RIGHT DOUBLE QUOTATION MARK
+ \u201e: "„" DOUBLE LOW-9 QUOTATION MARK
+ \u201f: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+ \u00ab: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ \u00bb: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<!-- string name="layout_switch_back_symbols">\u0022\u0027\u2018\u2019\u201a\u201b\u201c\u201d\u201e\u201f\u00ab\u00bb</string> -->
<string name="layout_switch_back_symbols"></string>
@@ -120,6 +120,7 @@
<!-- 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_basic">Basic</string>
@@ -161,9 +162,12 @@
<!-- Generic subtype label -->
<string name="subtype_generic">%s</string>
+ <!-- Description for generic QWERTY keyboard subtype -->
+ <string name="subtype_generic_qwerty">%s (QWERTY)</string>
<!-- dictionary pack package name /settings activity (for shared prefs and settings) -->
<string name="dictionary_pack_package_name">com.google.android.inputmethod.latin.dictionarypack</string>
<string name="dictionary_pack_settings_activity">com.google.android.inputmethod.latin.dictionarypack.DictionarySettingsActivity</string>
<string name="settings_ms">ms</string>
+ <string name="settings_warning_researcher_mode">Attention! You are using the special keyboard for research purposes.</string>
</resources>
diff --git a/java/res/values/keyboard-icons-black.xml b/java/res/values/keyboard-icons-black.xml
index f767cb349..1c5a5f720 100644
--- a/java/res/values/keyboard-icons-black.xml
+++ b/java/res/values/keyboard-icons-black.xml
@@ -30,10 +30,9 @@
<item name="iconTabKey">@drawable/sym_bkeyboard_tab</item>
<item name="iconShortcutKey">@drawable/sym_bkeyboard_mic</item>
<item name="iconShortcutForLabel">@drawable/sym_bkeyboard_label_mic</item>
- <item name="iconShiftedShiftKey">@drawable/sym_bkeyboard_shift_locked</item>
+ <item name="iconSpaceKeyForNumberLayout">@drawable/sym_bkeyboard_space</item>
+ <item name="iconShiftKeyShifted">@drawable/sym_bkeyboard_shift_locked</item>
+ <item name="iconDisabledShortcutKey">@drawable/sym_bkeyboard_voice_off</item>
<item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
- <!-- LatinKeyboard icons -->
- <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
- <item name="disabledShortcutIcon">@drawable/sym_bkeyboard_voice_off</item>
</style>
</resources>
diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml
index f1021433d..f68be5f1e 100644
--- a/java/res/values/keyboard-icons-ics.xml
+++ b/java/res/values/keyboard-icons-ics.xml
@@ -23,16 +23,15 @@
<item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item>
<item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item>
<item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item>
- <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</item>
+ <item name="iconSpaceKey">@null</item>
<item name="iconReturnKey">@drawable/sym_keyboard_return_holo</item>
<item name="iconSearchKey">@drawable/sym_keyboard_search_holo</item>
<item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item>
<item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item>
<item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo</item>
- <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item>
+ <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo</item>
+ <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo</item>
+ <item name="iconDisabledShortcutKey">@drawable/sym_keyboard_voice_off_holo</item>
<item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
- <!-- LatinKeyboard icons -->
- <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
- <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
</style>
</resources>
diff --git a/java/res/values/keyboard-icons-white.xml b/java/res/values/keyboard-icons-white.xml
index 07ece66b1..35197a1c0 100644
--- a/java/res/values/keyboard-icons-white.xml
+++ b/java/res/values/keyboard-icons-white.xml
@@ -26,10 +26,10 @@
<item name="iconTabKey">@drawable/sym_keyboard_tab</item>
<item name="iconShortcutKey">@drawable/sym_keyboard_mic</item>
<item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic</item>
- <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked</item>
+ <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space</item>
+ <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked</item>
+ <!-- TODO: Needs non-holo disabled shortcut icon drawable -->
+ <item name="iconDisabledShortcutKey">@drawable/sym_keyboard_voice_off_holo</item>
<item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
- <!-- LatinKeyboard icons -->
- <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
- <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
</style>
</resources>
diff --git a/java/res/values/keycodes.xml b/java/res/values/keycodes.xml
index 59cc07531..c85c02263 100644
--- a/java/res/values/keycodes.xml
+++ b/java/res/values/keycodes.xml
@@ -21,11 +21,14 @@
<resources>
<!-- These code should be aligned with Keyboard.CODE_*. -->
<integer name="key_tab">9</integer>
- <integer name="key_return">10</integer>
+ <integer name="key_enter">10</integer>
<integer name="key_space">32</integer>
<integer name="key_shift">-1</integer>
<integer name="key_switch_alpha_symbol">-2</integer>
- <integer name="key_delete">-5</integer>
- <integer name="key_settings">-6</integer>
- <integer name="key_shortcut">-7</integer>
+ <integer name="key_output_text">-3</integer>
+ <integer name="key_delete">-4</integer>
+ <integer name="key_settings">-5</integer>
+ <integer name="key_shortcut">-6</integer>
+ <integer name="key_action_enter">-7</integer>
+ <integer name="key_unspecified">-9</integer>
</resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index e00547a62..525b775ea 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -20,6 +20,8 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Title for Latin keyboard -->
<string name="english_ime_name">Android keyboard</string>
+ <!-- Application name for opensource Android keyboard. AOSP(Android Open Source Project) should not be translated. -->
+ <string name="aosp_android_keyboard_ime_name">Android keyboard (AOSP)</string>
<!-- Title for Latin keyboard settings activity / dialog -->
<string name="english_ime_settings">Android keyboard settings</string>
<!-- Title for Latin keyboard input options dialog [CHAR LIMIT=25] -->
@@ -31,11 +33,11 @@
<!-- Title for the spell checking service settings screen -->
<string name="android_spell_checker_settings">Spell checking settings</string>
- <!-- Title for the "use proximity" option for spell checking [CHAR LIMIT=25] -->
- <string name="use_proximity_option_title">Use proximity data</string>
+ <!-- Title for the spell checker option to turn on/off contact names lookup [CHAR LIMIT=25] -->
+ <string name="use_contacts_for_spellchecking_option_title">Look up contact names</string>
- <!-- Description for the "use proximity" option for spell checking [CHAR LIMIT=65] -->
- <string name="use_proximity_option_summary">Use a keyboard-like proximity algorithm for spell checking</string>
+ <!-- Description for the spell checker option to turn on/off contact names lookup. [CHAR LIMIT=65] -->
+ <string name="use_contacts_for_spellchecking_option_summary">Spell checker uses entries from your contact list</string>
<!-- Option to provide vibrate/haptic feedback on keypress -->
<string name="vibrate_on_keypress">Vibrate on keypress</string>
@@ -58,7 +60,7 @@
<!-- Option name for advanced settings screen [CHAR LIMIT=25] -->
<string name="advanced_settings">Advanced settings</string>
<!-- Option summary for advanced settings screen [CHAR LIMIT=65 (two lines) or 30 (fits on one line, preferable)] -->
- <string name="advanced_settings_summary">Options for expert users</string>
+ <string name="advanced_settings_summary">Options for experts</string>
<!-- Option for the dismiss delay of the key popup [CHAR LIMIT=25] -->
<string name="key_preview_popup_dismiss_delay">Key popup dismiss delay</string>
@@ -126,6 +128,8 @@
<string name="label_go_key">Go</string>
<!-- Label for soft enter key when it performs NEXT action. Must be short to fit on key! [CHAR LIMIT=5] -->
<string name="label_next_key">Next</string>
+ <!-- Label for soft enter key when it performs PREVIOUS action. Must be short to fit on key! [CHAR LIMIT=5] -->
+ <string name="label_previous_key">Prev</string>
<!-- Label for soft enter key when it performs DONE action. Must be short to fit on key! [CHAR LIMIT=5] -->
<string name="label_done_key">Done</string>
<!-- Label for soft enter key when it performs SEND action. Must be short to fit on key! [CHAR LIMIT=5] -->
@@ -152,12 +156,12 @@
<!-- Spoken description for unknown keyboard keys. -->
<string name="spoken_description_unknown">Key code %d</string>
- <!-- Spoken description for the "Shift" keyboard key. -->
+ <!-- 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's pressed state. -->
- <string name="spoken_description_shift_shifted">Shift enabled</string>
- <!-- Spoken description for the "Shift" keyboard key's pressed state. -->
- <string name="spoken_description_caps_lock">Caps lock enabled</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. -->
@@ -178,47 +182,24 @@
<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 "," keyboard key. -->
- <string name="spoken_description_comma">Comma</string>
- <!-- Spoken description for the "." keyboard key. -->
- <string name="spoken_description_period">Period</string>
- <!-- Spoken description for the "(" keyboard key. -->
- <string name="spoken_description_left_parenthesis">Left parenthesis</string>
- <!-- Spoken description for the ")" keyboard key. -->
- <string name="spoken_description_right_parenthesis">Right parenthesis</string>
- <!-- Spoken description for the ":" keyboard key. -->
- <string name="spoken_description_colon">Colon</string>
- <!-- Spoken description for the ";" keyboard key. -->
- <string name="spoken_description_semicolon">Semicolon</string>
- <!-- Spoken description for the "!" keyboard key. -->
- <string name="spoken_description_exclamation_mark">Exclamation mark</string>
- <!-- Spoken description for the "?" keyboard key. -->
- <string name="spoken_description_question_mark">Question mark</string>
- <!-- Spoken description for the """ keyboard key. -->
- <string name="spoken_description_double_quote">Double quote</string>
- <!-- Spoken description for the "'" keyboard key. -->
- <string name="spoken_description_single_quote">Single quote</string>
<!-- Spoken description for the "\u2022" (BULLET) keyboard key. -->
<string name="spoken_description_dot">Dot</string>
- <!-- Spoken description for the "\u221a" (SQUARE ROOT) keyboard key. -->
- <string name="spoken_description_square_root">Square root</string>
- <!-- Spoken description for the "\u03C0" (GREEK SMALL LETTER PI) keyboard key. -->
- <string name="spoken_description_pi">Pi</string>
- <!-- Spoken description for the "\u0394" (GREEK CAPITAL LETTER DELTA) keyboard key. -->
- <string name="spoken_description_delta">Delta</string>
- <!-- Spoken description for the "\u2122" (TRADE MARK SIGN) keyboard key. -->
- <string name="spoken_description_trademark">Trademark</string>
- <!-- Spoken description for the "\u2105" (CARE OF) keyboard key. -->
- <string name="spoken_description_care_of">Care of</string>
- <!-- Spoken description for the "*" keyboard key. -->
- <string name="spoken_description_star">Star</string>
- <!-- Spoken description for the "#" keyboard key. -->
- <string name="spoken_description_pound">Pound</string>
- <!-- Spoken description for the "\u2026" (HORIZONTAL ELLIPSIS) keyboard key. -->
- <string name="spoken_description_ellipsis">Ellipsis</string>
- <!-- Spoken description for the "\u201E" (DOUBLE LOW-9 QUOTATION MARK) keyboard key. -->
- <string name="spoken_description_low_double_quote">Low double quote</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>
<!-- Voice related labels -->
@@ -333,8 +314,6 @@
<!-- Title of the item to change the keyboard theme [CHAR LIMIT=20]-->
<string name="keyboard_layout">Keyboard theme</string>
- <!-- Description for German QWERTY keyboard subtype [CHAR LIMIT=22] -->
- <string name="subtype_de_qwerty">German QWERTY</string>
<!-- Description for English (United Kingdom) keyboard subtype [CHAR LIMIT=22] -->
<string name="subtype_en_GB">English (UK)</string>
<!-- Description for English (United States) keyboard subtype [CHAR LIMIT=22] -->
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 43aa58388..b9e8b26a3 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -23,7 +23,7 @@
<item name="keyboardHeight">@dimen/keyboardHeight</item>
<item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item>
<item name="minKeyboardHeight">@fraction/minKeyboardHeight</item>
- <item name="moreKeysTemplate">@xml/kbd_mini_keyboard_template</item>
+ <item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item>
<item name="keyboardTopPadding">@fraction/keyboard_top_padding</item>
<item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding</item>
<item name="keyboardHorizontalEdgesPadding">@fraction/keyboard_horizontal_edges_padding</item>
@@ -31,12 +31,6 @@
<item name="verticalGap">@fraction/key_bottom_gap</item>
<item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item>
</style>
- <style name="LatinKeyboard">
- <item name="autoCorrectionSpacebarLedEnabled">@bool/config_auto_correction_spacebar_led_enabled
- </item>
- <item name="spacebarTextColor">#FFC0C0C0</item>
- <item name="spacebarTextShadowColor">#80000000</item>
- </style>
<style name="KeyboardView">
<item name="android:background">@drawable/keyboard_background</item>
<item name="keyBackground">@drawable/btn_keyboard_key</item>
@@ -45,18 +39,18 @@
<item name="keyLabelRatio">@fraction/key_label_ratio</item>
<item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item>
<item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item>
- <item name="keyUppercaseLetterRatio">@fraction/key_uppercase_letter_ratio</item>
+ <item name="keyShiftedLetterHintRatio">@fraction/key_uppercase_letter_ratio</item>
<item name="keyTextStyle">normal</item>
<item name="keyTextColor">#FFFFFFFF</item>
<item name="keyTextInactivatedColor">#FFFFFFFF</item>
<item name="keyHintLetterColor">#80000000</item>
<item name="keyHintLabelColor">#E0E0E4E5</item>
- <item name="keyUppercaseLetterInactivatedColor">#66E0E4E5</item>
- <item name="keyUppercaseLetterActivatedColor">#CCE0E4E5</item>
+ <item name="keyShiftedLetterHintInactivatedColor">#66E0E4E5</item>
+ <item name="keyShiftedLetterHintActivatedColor">#CCE0E4E5</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="keyUppercaseLetterPadding">@dimen/key_uppercase_letter_padding</item>
+ <item name="keyShiftedLetterHintPadding">@dimen/key_uppercase_letter_padding</item>
<item name="keyPreviewLayout">@layout/key_preview</item>
<item name="keyPreviewBackground">@drawable/keyboard_key_feedback</item>
<item name="keyPreviewLeftBackground">@null</item>
@@ -65,14 +59,36 @@
<item name="keyPreviewOffset">@dimen/key_preview_offset</item>
<item name="keyPreviewHeight">@dimen/key_preview_height</item>
<item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item>
- <item name="moreKeysLayout">@layout/mini_keyboard</item>
+ <item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item>
+ <item name="moreKeysLayout">@layout/more_keys_keyboard</item>
<item name="verticalCorrection">@dimen/keyboard_vertical_correction</item>
<item name="shadowColor">#BB000000</item>
<item name="shadowRadius">2.75</item>
<item name="backgroundDimAmount">0.5</item>
+ <!-- Common attributes of LatinKeyboardView -->
+ <item name="keyHysteresisDistance">@dimen/config_key_hysteresis_distance</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="keyRepeatStartTimeout">@integer/config_key_repeat_start_timeout</item>
+ <item name="keyRepeatInterval">@integer/config_key_repeat_interval</item>
+ <item name="longPressKeyTimeout">@integer/config_long_press_key_timeout</item>
+ <item name="longPressShiftKeyTimeout">@integer/config_long_press_shift_key_timeout</item>
+ <item name="longPressSpaceKeyTimeout">@integer/config_long_press_space_key_timeout</item>
+ <item name="ignoreSpecialKeyTimeout">@integer/config_ignore_special_key_timeout</item>
+ <item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item>
</style>
<style
- name="MiniKeyboard"
+ name="LatinKeyboardView"
+ parent="KeyboardView">
+ <item name="autoCorrectionSpacebarLedEnabled">true</item>
+ <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
+ <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
+ <item name="spacebarTextColor">#FFC0C0C0</item>
+ <item name="spacebarTextShadowColor">#80000000</item>
+ </style>
+ <style
+ name="MoreKeysKeyboard"
parent="Keyboard"
>
<item name="keyboardTopPadding">0dip</item>
@@ -80,16 +96,16 @@
<item name="horizontalGap">0dip</item>
</style>
<style
- name="MiniKeyboardView"
+ name="MoreKeysKeyboardView"
parent="KeyboardView"
>
<item name="keyBackground">@drawable/btn_keyboard_key_popup</item>
- <item name="verticalCorrection">@dimen/mini_keyboard_vertical_correction</item>
+ <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction</item>
</style>
- <style name="MiniKeyboardPanelStyle">
+ <style name="MoreKeysKeyboardPanelStyle">
<item name="android:background">@drawable/keyboard_popup_panel_background</item>
- <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding</item>
- <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding</item>
+ <item name="android:paddingLeft">@dimen/more_keys_keyboard_horizontal_edges_padding</item>
+ <item name="android:paddingRight">@dimen/more_keys_keyboard_horizontal_edges_padding</item>
</style>
<style name="SuggestionsStripBackgroundStyle">
<item name="android:background">@drawable/keyboard_suggest_strip</item>
@@ -98,7 +114,8 @@
name="SuggestionsViewStyle"
parent="SuggestionsStripBackgroundStyle"
>
- <item name="suggestionStripOption">autoCorrectBold</item>
+ <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
+ <item name="colorValidTypedWord">#FFFCAE00</item>
<item name="colorTypedWord">@android:color/white</item>
<item name="colorAutoCorrect">#FFFCAE00</item>
<item name="colorSuggested">#FFFCAE00</item>
@@ -110,7 +127,7 @@
</style>
<style
name="MoreSuggestionsViewStyle"
- parent="MiniKeyboardView"
+ parent="MoreKeysKeyboardView"
>
</style>
<style name="SuggestionBackgroundStyle">
@@ -133,6 +150,16 @@
<item name="android:background">@android:color/black</item>
<item name="keyBackground">@drawable/btn_keyboard_key3</item>
</style>
+ <style
+ name="LatinKeyboardView.HighContrast"
+ parent="KeyboardView.HighContrast"
+ >
+ <item name="autoCorrectionSpacebarLedEnabled">true</item>
+ <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
+ <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
+ <item name="spacebarTextColor">#FFC0C0C0</item>
+ <item name="spacebarTextShadowColor">#80000000</item>
+ </style>
<!-- Theme "Stone" -->
<style
name="Keyboard.Stone"
@@ -146,13 +173,6 @@
<item name="verticalGap">@fraction/key_bottom_gap_stone</item>
</style>
<style
- name="LatinKeyboard.Stone"
- parent="LatinKeyboard"
- >
- <item name="spacebarTextColor">#FF000000</item>
- <item name="spacebarTextShadowColor">#D0FFFFFF</item>
- </style>
- <style
name="KeyboardView.Stone"
parent="KeyboardView"
>
@@ -161,12 +181,22 @@
<item name="keyTextInactivatedColor">#FF808080</item>
<item name="keyHintLetterColor">#80000000</item>
<item name="keyHintLabelColor">#E0000000</item>
- <item name="keyUppercaseLetterInactivatedColor">#66000000</item>
- <item name="keyUppercaseLetterActivatedColor">#CC000000</item>
+ <item name="keyShiftedLetterHintInactivatedColor">#66000000</item>
+ <item name="keyShiftedLetterHintActivatedColor">#CC000000</item>
<item name="shadowColor">#FFFFFFFF</item>
</style>
<style
- name="MiniKeyboard.Stone"
+ name="LatinKeyboardView.Stone"
+ parent="KeyboardView.Stone"
+ >
+ <item name="autoCorrectionSpacebarLedEnabled">true</item>
+ <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
+ <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
+ <item name="spacebarTextColor">#FF000000</item>
+ <item name="spacebarTextShadowColor">#D0FFFFFF</item>
+ </style>
+ <style
+ name="MoreKeysKeyboard.Stone"
parent="Keyboard.Stone"
>
<item name="keyboardTopPadding">0dip</item>
@@ -174,8 +204,8 @@
<item name="horizontalGap">0dip</item>
</style>
<style
- name="MiniKeyboardView.Stone"
- parent="MiniKeyboardView"
+ name="MoreKeysKeyboardView.Stone"
+ parent="MoreKeysKeyboardView"
>
<item name="keyBackground">@drawable/btn_keyboard_key_stone</item>
<item name="keyTextColor">#FF000000</item>
@@ -194,6 +224,16 @@
>
<item name="keyTextStyle">bold</item>
</style>
+ <style
+ name="LatinKeyboardView.Stone.Bold"
+ parent="KeyboardView.Stone.Bold"
+ >
+ <item name="autoCorrectionSpacebarLedEnabled">true</item>
+ <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
+ <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
+ <item name="spacebarTextColor">#FF000000</item>
+ <item name="spacebarTextShadowColor">#D0FFFFFF</item>
+ </style>
<!-- Theme "Gingerbread" -->
<style
name="Keyboard.Gingerbread"
@@ -213,7 +253,17 @@
<item name="keyTextStyle">bold</item>
</style>
<style
- name="MiniKeyboard.Gingerbread"
+ name="LatinKeyboardView.Gingerbread"
+ parent="KeyboardView.Gingerbread"
+ >
+ <item name="autoCorrectionSpacebarLedEnabled">true</item>
+ <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
+ <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
+ <item name="spacebarTextColor">#FFC0C0C0</item>
+ <item name="spacebarTextShadowColor">#80000000</item>
+ </style>
+ <style
+ name="MoreKeysKeyboard.Gingerbread"
parent="Keyboard.Gingerbread"
>
<item name="keyboardTopPadding">0dip</item>
@@ -221,8 +271,8 @@
<item name="horizontalGap">0dip</item>
</style>
<style
- name="MiniKeyboardView.Gingerbread"
- parent="MiniKeyboardView"
+ name="MoreKeysKeyboardView.Gingerbread"
+ parent="MoreKeysKeyboardView"
>
<item name="android:background">@null</item>
</style>
@@ -239,12 +289,6 @@
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_ice_cream_sandwich</item>
</style>
<style
- name="LatinKeyboard.IceCreamSandwich"
- parent="LatinKeyboard"
- >
- <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
- </style>
- <style
name="KeyboardView.IceCreamSandwich"
parent="KeyboardView"
>
@@ -254,8 +298,8 @@
<item name="keyTextInactivatedColor">#66E0E4E5</item>
<item name="keyHintLetterColor">#80000000</item>
<item name="keyHintLabelColor">#A0FFFFFF</item>
- <item name="keyUppercaseLetterInactivatedColor">#66E0E4E5</item>
- <item name="keyUppercaseLetterActivatedColor">#FFFFFFFF</item>
+ <item name="keyShiftedLetterHintInactivatedColor">#66E0E4E5</item>
+ <item name="keyShiftedLetterHintActivatedColor">#FFFFFFFF</item>
<item name="keyPreviewBackground">@drawable/keyboard_key_feedback_ics</item>
<item name="keyPreviewLeftBackground">@drawable/keyboard_key_feedback_left_ics</item>
<item name="keyPreviewRightBackground">@drawable/keyboard_key_feedback_right_ics</item>
@@ -268,7 +312,17 @@
<item name="shadowRadius">0.0</item>
</style>
<style
- name="MiniKeyboard.IceCreamSandwich"
+ name="LatinKeyboardView.IceCreamSandwich"
+ parent="KeyboardView.IceCreamSandwich"
+ >
+ <item name="autoCorrectionSpacebarLedEnabled">false</item>
+ <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
+ <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
+ <item name="spacebarTextColor">#FFC0C0C0</item>
+ <item name="spacebarTextShadowColor">#80000000</item>
+ </style>
+ <style
+ name="MoreKeysKeyboard.IceCreamSandwich"
parent="Keyboard.IceCreamSandwich"
>
<item name="keyboardTopPadding">0dip</item>
@@ -276,16 +330,16 @@
<item name="horizontalGap">0dip</item>
</style>
<style
- name="MiniKeyboardView.IceCreamSandwich"
- parent="MiniKeyboardView"
+ name="MoreKeysKeyboardView.IceCreamSandwich"
+ parent="MoreKeysKeyboardView"
>
<item name="android:background">@null</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
</style>
- <style name="MiniKeyboardPanelStyle.IceCreamSandwich">
+ <style name="MoreKeysKeyboardPanelStyle.IceCreamSandwich">
<item name="android:background">@drawable/keyboard_popup_panel_background_holo</item>
- <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding_ics</item>
- <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding_ics</item>
+ <item name="android:paddingLeft">@dimen/more_keys_keyboard_horizontal_edges_padding_ics</item>
+ <item name="android:paddingRight">@dimen/more_keys_keyboard_horizontal_edges_padding_ics</item>
</style>
<style name="SuggestionsStripBackgroundStyle.IceCreamSandwich">
<item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
@@ -296,11 +350,12 @@
>
<item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
<!-- android:color/holo_blue_light=#FF33B5E5 -->
+ <item name="colorValidTypedWord">@android:color/holo_blue_light</item>
<item name="colorTypedWord">@android:color/holo_blue_light</item>
<item name="colorAutoCorrect">@android:color/holo_blue_light</item>
<item name="colorSuggested">@android:color/holo_blue_light</item>
+ <item name="alphaValidTypedWord">85</item>
<item name="alphaTypedWord">85</item>
- <item name="alphaAutoCorrect">100</item>
<item name="alphaSuggested">70</item>
<item name="alphaObsoleted">70</item>
<item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item>
@@ -310,7 +365,7 @@
</style>
<style
name="MoreSuggestionsViewStyle.IceCreamSandwich"
- parent="MiniKeyboardView.IceCreamSandwich"
+ parent="MoreKeysKeyboardView.IceCreamSandwich"
>
</style>
<style name="SuggestionBackgroundStyle.IceCreamSandwich">
@@ -318,11 +373,11 @@
</style>
<style
name="SuggestionPreviewBackgroundStyle.IceCreamSandwich"
- parent="MiniKeyboardPanelStyle.IceCreamSandwich"
+ parent="MoreKeysKeyboardPanelStyle.IceCreamSandwich"
>
</style>
- <style name="MiniKeyboardAnimation">
- <item name="android:windowEnterAnimation">@anim/mini_keyboard_fadein</item>
- <item name="android:windowExitAnimation">@anim/mini_keyboard_fadeout</item>
+ <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>
diff --git a/java/res/values/themes-basic-highcontrast.xml b/java/res/values/themes-basic-highcontrast.xml
index abb7c8057..19df42ce1 100644
--- a/java/res/values/themes-basic-highcontrast.xml
+++ b/java/res/values/themes-basic-highcontrast.xml
@@ -17,11 +17,11 @@
<resources>
<style name="KeyboardTheme.HighContrast" parent="KeyboardIcons">
<item name="keyboardStyle">@style/Keyboard.HighContrast</item>
- <item name="latinKeyboardStyle">@style/LatinKeyboard</item>
<item name="keyboardViewStyle">@style/KeyboardView.HighContrast</item>
- <item name="miniKeyboardStyle">@style/MiniKeyboard</item>
- <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item>
- <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
+ <item name="latinKeyboardViewStyle">@style/LatinKeyboardView.HighContrast</item>
+ <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard</item>
+ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView</item>
+ <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>
diff --git a/java/res/values/themes-basic.xml b/java/res/values/themes-basic.xml
index ff9fed55f..5d477206d 100644
--- a/java/res/values/themes-basic.xml
+++ b/java/res/values/themes-basic.xml
@@ -17,11 +17,11 @@
<resources>
<style name="KeyboardTheme" parent="KeyboardIcons">
<item name="keyboardStyle">@style/Keyboard</item>
- <item name="latinKeyboardStyle">@style/LatinKeyboard</item>
<item name="keyboardViewStyle">@style/KeyboardView</item>
- <item name="miniKeyboardStyle">@style/MiniKeyboard</item>
- <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item>
- <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
+ <item name="latinKeyboardViewStyle">@style/LatinKeyboardView</item>
+ <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard</item>
+ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView</item>
+ <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>
diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml
index be853eb0f..a13979818 100644
--- a/java/res/values/themes-gingerbread.xml
+++ b/java/res/values/themes-gingerbread.xml
@@ -17,11 +17,11 @@
<resources>
<style name="KeyboardTheme.Gingerbread" parent="KeyboardIcons">
<item name="keyboardStyle">@style/Keyboard.Gingerbread</item>
- <item name="latinKeyboardStyle">@style/LatinKeyboard</item>
<item name="keyboardViewStyle">@style/KeyboardView.Gingerbread</item>
- <item name="miniKeyboardStyle">@style/MiniKeyboard.Gingerbread</item>
- <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Gingerbread</item>
- <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
+ <item name="latinKeyboardViewStyle">@style/LatinKeyboardView.Gingerbread</item>
+ <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.Gingerbread</item>
+ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.Gingerbread</item>
+ <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index 618aaed79..e6fd4f451 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -17,11 +17,11 @@
<resources>
<style name="KeyboardTheme.IceCreamSandwich" parent="KeyboardIcons.IceCreamSandwich">
<item name="keyboardStyle">@style/Keyboard.IceCreamSandwich</item>
- <item name="latinKeyboardStyle">@style/LatinKeyboard.IceCreamSandwich</item>
<item name="keyboardViewStyle">@style/KeyboardView.IceCreamSandwich</item>
- <item name="miniKeyboardStyle">@style/MiniKeyboard.IceCreamSandwich</item>
- <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.IceCreamSandwich</item>
- <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle.IceCreamSandwich</item>
+ <item name="latinKeyboardViewStyle">@style/LatinKeyboardView.IceCreamSandwich</item>
+ <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.IceCreamSandwich</item>
+ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.IceCreamSandwich</item>
+ <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle.IceCreamSandwich</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.IceCreamSandwich</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle.IceCreamSandwich</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle.IceCreamSandwich</item>
diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml
index 532a2985e..47de99e47 100644
--- a/java/res/values/themes-stone-bold.xml
+++ b/java/res/values/themes-stone-bold.xml
@@ -17,11 +17,11 @@
<resources>
<style name="KeyboardTheme.Stone.Bold" parent="KeyboardIcons.Black">
<item name="keyboardStyle">@style/Keyboard.Stone.Bold</item>
- <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item>
<item name="keyboardViewStyle">@style/KeyboardView.Stone.Bold</item>
- <item name="miniKeyboardStyle">@style/MiniKeyboard.Stone</item>
- <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Stone</item>
- <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
+ <item name="latinKeyboardViewStyle">@style/LatinKeyboardView.Stone.Bold</item>
+ <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.Stone</item>
+ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.Stone</item>
+ <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>
diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml
index cb3edc58f..a0b39e3e6 100644
--- a/java/res/values/themes-stone.xml
+++ b/java/res/values/themes-stone.xml
@@ -17,11 +17,11 @@
<resources>
<style name="KeyboardTheme.Stone" parent="KeyboardIcons.Black">
<item name="keyboardStyle">@style/Keyboard.Stone</item>
- <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item>
<item name="keyboardViewStyle">@style/KeyboardView.Stone</item>
- <item name="miniKeyboardStyle">@style/MiniKeyboard.Stone</item>
- <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Stone</item>
- <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
+ <item name="latinKeyboardViewStyle">@style/LatinKeyboardView.Stone</item>
+ <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.Stone</item>
+ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.Stone</item>
+ <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>
diff --git a/java/res/xml-ar/keyboard_set.xml b/java/res/xml-ar/keyboard_set.xml
new file mode 100644
index 000000000..7b70f633c
--- /dev/null
+++ b/java/res/xml-ar/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="ar" >
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_arabic" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-be/keyboard_set.xml b/java/res/xml-be/keyboard_set.xml
new file mode 100644
index 000000000..042264aae
--- /dev/null
+++ b/java/res/xml-be/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="be">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_slavic" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-bg/keyboard_set.xml b/java/res/xml-bg/keyboard_set.xml
new file mode 100644
index 000000000..49914d54b
--- /dev/null
+++ b/java/res/xml-bg/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="bg">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_bulgarian" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-cs/keyboard_set.xml b/java/res/xml-cs/keyboard_set.xml
new file mode 100644
index 000000000..b4535164b
--- /dev/null
+++ b/java/res/xml-cs/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="cs">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwertz" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-da/keyboard_set.xml b/java/res/xml-da/keyboard_set.xml
new file mode 100644
index 000000000..cf01ae6f5
--- /dev/null
+++ b/java/res/xml-da/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="da">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_scandinavian" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-de-rZZ/keyboard_set.xml b/java/res/xml-de-rZZ/keyboard_set.xml
new file mode 100644
index 000000000..635884d1d
--- /dev/null
+++ b/java/res/xml-de-rZZ/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="de">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml
deleted file mode 100644
index 89e10b26d..000000000
--- a/java/res/xml-de/kbd_qwerty.xml
+++ /dev/null
@@ -1,27 +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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="de"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_qwertz" />
-</Keyboard>
diff --git a/java/res/xml-de/keyboard_set.xml b/java/res/xml-de/keyboard_set.xml
new file mode 100644
index 000000000..485e63f06
--- /dev/null
+++ b/java/res/xml-de/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="de">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwertz" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-es/kbd_qwerty.xml b/java/res/xml-es/kbd_qwerty.xml
deleted file mode 100644
index 568f4d652..000000000
--- a/java/res/xml-es/kbd_qwerty.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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="es,es_US"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_spanish" />
-</Keyboard>
diff --git a/java/res/xml-es/keyboard_set.xml b/java/res/xml-es/keyboard_set.xml
new file mode 100644
index 000000000..2944a83ad
--- /dev/null
+++ b/java/res/xml-es/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="es,es_US">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_spanish" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-et/keyboard_set.xml b/java/res/xml-et/keyboard_set.xml
new file mode 100644
index 000000000..1c23db3d8
--- /dev/null
+++ b/java/res/xml-et/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="et">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_scandinavian" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-fi/kbd_qwerty.xml b/java/res/xml-fi/kbd_qwerty.xml
deleted file mode 100644
index 75721e057..000000000
--- a/java/res/xml-fi/kbd_qwerty.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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="fi"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_scandinavian" />
-</Keyboard>
diff --git a/java/res/xml-fi/keyboard_set.xml b/java/res/xml-fi/keyboard_set.xml
new file mode 100644
index 000000000..e8e4e7d9a
--- /dev/null
+++ b/java/res/xml-fi/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="fi">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_scandinavian" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-fr-rCA/kbd_qwerty.xml b/java/res/xml-fr-rCA/kbd_qwerty.xml
deleted file mode 100644
index 7bdfbadf1..000000000
--- a/java/res/xml-fr-rCA/kbd_qwerty.xml
+++ /dev/null
@@ -1,27 +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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="fr_CA"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_qwerty" />
-</Keyboard>
diff --git a/java/res/xml-fr-rCA/keyboard_set.xml b/java/res/xml-fr-rCA/keyboard_set.xml
new file mode 100644
index 000000000..ea6ac8f26
--- /dev/null
+++ b/java/res/xml-fr-rCA/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="fr_CA">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-fr-rCH/kbd_qwerty.xml b/java/res/xml-fr-rCH/kbd_qwerty.xml
deleted file mode 100644
index 41b701d83..000000000
--- a/java/res/xml-fr-rCH/kbd_qwerty.xml
+++ /dev/null
@@ -1,27 +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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="fr_CH"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_qwertz" />
-</Keyboard>
diff --git a/java/res/xml-fr-rCH/keyboard_set.xml b/java/res/xml-fr-rCH/keyboard_set.xml
new file mode 100644
index 000000000..751900b88
--- /dev/null
+++ b/java/res/xml-fr-rCH/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="fr_CH">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwertz" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-fr/keyboard_set.xml b/java/res/xml-fr/keyboard_set.xml
new file mode 100644
index 000000000..42a20e5ea
--- /dev/null
+++ b/java/res/xml-fr/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="fr">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_azerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-hr/kbd_qwerty.xml b/java/res/xml-hr/kbd_qwerty.xml
deleted file mode 100644
index ca92e86a7..000000000
--- a/java/res/xml-hr/kbd_qwerty.xml
+++ /dev/null
@@ -1,28 +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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="hr"
->
- <!-- TODO: Dedicated Croatian layout especially for tablet. -->
- <include
- latin:keyboardLayout="@xml/kbd_rows_qwertz" />
-</Keyboard>
diff --git a/java/res/xml-hr/keyboard_set.xml b/java/res/xml-hr/keyboard_set.xml
new file mode 100644
index 000000000..e17aefdf6
--- /dev/null
+++ b/java/res/xml-hr/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="hr">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwertz" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-hu/keyboard_set.xml b/java/res/xml-hu/keyboard_set.xml
new file mode 100644
index 000000000..0f6e5759e
--- /dev/null
+++ b/java/res/xml-hu/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="hu">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwertz" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml
deleted file mode 100644
index 54cd4b5e9..000000000
--- a/java/res/xml-iw/kbd_qwerty.xml
+++ /dev/null
@@ -1,28 +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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="iw"
- latin:isRtlKeyboard="true"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_hebrew" />
-</Keyboard>
diff --git a/java/res/xml-iw/kbd_symbols.xml b/java/res/xml-iw/kbd_symbols.xml
deleted file mode 100644
index 9e5c255d0..000000000
--- a/java/res/xml-iw/kbd_symbols.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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:isRtlKeyboard="true"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_symbols" />
-</Keyboard>
diff --git a/java/res/xml-iw/kbd_symbols_shift.xml b/java/res/xml-iw/kbd_symbols_shift.xml
deleted file mode 100644
index 934e6f849..000000000
--- a/java/res/xml-iw/kbd_symbols_shift.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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:isRtlKeyboard="true"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_symbols_shift" />
-</Keyboard>
diff --git a/java/res/xml-iw/keyboard_set.xml b/java/res/xml-iw/keyboard_set.xml
new file mode 100644
index 000000000..501ba96ee
--- /dev/null
+++ b/java/res/xml-iw/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="iw">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_hebrew" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-ky/keyboard_set.xml b/java/res/xml-ky/keyboard_set.xml
new file mode 100644
index 000000000..abd5f1631
--- /dev/null
+++ b/java/res/xml-ky/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="ky">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_slavic" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-land/kbd_number.xml b/java/res/xml-land/kbd_number.xml
index f5930ef41..7cc0fb274 100644
--- a/java/res/xml-land/kbd_number.xml
+++ b/java/res/xml-land/kbd_number.xml
@@ -24,5 +24,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_number" />
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml-land/kbd_phone.xml b/java/res/xml-land/kbd_phone.xml
index 3b1fb36ff..aa54b8390 100644
--- a/java/res/xml-land/kbd_phone.xml
+++ b/java/res/xml-land/kbd_phone.xml
@@ -24,5 +24,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-land/kbd_phone_shift.xml b/java/res/xml-land/kbd_phone_symbols.xml
index e59664776..41ba6cf3b 100644
--- a/java/res/xml-land/kbd_phone_shift.xml
+++ b/java/res/xml-land/kbd_phone_symbols.xml
@@ -24,5 +24,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+ latin:keyboardLayout="@xml/rows_phone_symbols" />
</Keyboard>
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
deleted file mode 100644
index 1f4e86e89..000000000
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ /dev/null
@@ -1,27 +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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="nb"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_scandinavian" />
-</Keyboard>
diff --git a/java/res/xml-nb/keyboard_set.xml b/java/res/xml-nb/keyboard_set.xml
new file mode 100644
index 000000000..d146beb71
--- /dev/null
+++ b/java/res/xml-nb/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="nb">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_scandinavian" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-pl/keyboard_set.xml b/java/res/xml-pl/keyboard_set.xml
new file mode 100644
index 000000000..6d2737929
--- /dev/null
+++ b/java/res/xml-pl/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="pl">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-pt/kbd_qwerty.xml b/java/res/xml-pt/kbd_qwerty.xml
deleted file mode 100644
index f5dcbc61b..000000000
--- a/java/res/xml-pt/kbd_qwerty.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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="pt"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_qwerty" />
-</Keyboard>
diff --git a/java/res/xml-pt/keyboard_set.xml b/java/res/xml-pt/keyboard_set.xml
new file mode 100644
index 000000000..65f9634ce
--- /dev/null
+++ b/java/res/xml-pt/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="pt">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-ro/keyboard_set.xml b/java/res/xml-ro/keyboard_set.xml
new file mode 100644
index 000000000..6c34966d0
--- /dev/null
+++ b/java/res/xml-ro/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="ro">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml
deleted file mode 100644
index aee1b1bfc..000000000
--- a/java/res/xml-ru/kbd_qwerty.xml
+++ /dev/null
@@ -1,27 +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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="ru"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_russian" />
-</Keyboard>
diff --git a/java/res/xml-ru/keyboard_set.xml b/java/res/xml-ru/keyboard_set.xml
new file mode 100644
index 000000000..b6a356891
--- /dev/null
+++ b/java/res/xml-ru/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="ru">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_slavic" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-sk/keyboard_set.xml b/java/res/xml-sk/keyboard_set.xml
new file mode 100644
index 000000000..b283d968a
--- /dev/null
+++ b/java/res/xml-sk/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="sk">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-sl/keyboard_set.xml b/java/res/xml-sl/keyboard_set.xml
new file mode 100644
index 000000000..dbb2782f0
--- /dev/null
+++ b/java/res/xml-sl/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="sl">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml
deleted file mode 100644
index 58fc187c2..000000000
--- a/java/res/xml-sr/kbd_qwerty.xml
+++ /dev/null
@@ -1,27 +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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="sr"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_serbian" />
-</Keyboard>
diff --git a/java/res/xml-sr/keyboard_set.xml b/java/res/xml-sr/keyboard_set.xml
new file mode 100644
index 000000000..15471dbcd
--- /dev/null
+++ b/java/res/xml-sr/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="sr">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_serbian" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml
deleted file mode 100644
index e29d9abce..000000000
--- a/java/res/xml-sv/kbd_qwerty.xml
+++ /dev/null
@@ -1,27 +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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="sv"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_scandinavian" />
-</Keyboard>
diff --git a/java/res/xml-sv/keyboard_set.xml b/java/res/xml-sv/keyboard_set.xml
new file mode 100644
index 000000000..e5184d33f
--- /dev/null
+++ b/java/res/xml-sv/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="sv">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_scandinavian" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-sw600dp-land/kbd_mini_keyboard_template.xml b/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
index 8272e02f0..4d8b446a2 100644
--- a/java/res/xml-sw600dp-land/kbd_mini_keyboard_template.xml
+++ b/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
@@ -21,6 +21,6 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="5%p"
latin:rowHeight="@dimen/popup_key_height"
- style="?attr/miniKeyboardStyle"
+ style="?attr/moreKeysKeyboardStyle"
>
</Keyboard>
diff --git a/java/res/xml-ar/kbd_symbols.xml b/java/res/xml-sw600dp-land/kbd_number.xml
index 9e5c255d0..9d358b678 100644
--- a/java/res/xml-ar/kbd_symbols.xml
+++ b/java/res/xml-sw600dp-land/kbd_number.xml
@@ -20,8 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:isRtlKeyboard="true"
+ latin:keyboardHorizontalEdgesPadding="10%p"
+ latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_symbols" />
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml-ar/kbd_qwerty.xml b/java/res/xml-sw600dp-land/kbd_phone.xml
index b26a938cc..abac6bd4f 100644
--- a/java/res/xml-ar/kbd_qwerty.xml
+++ b/java/res/xml-sw600dp-land/kbd_phone.xml
@@ -20,9 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="ar"
- latin:isRtlKeyboard="true"
+ latin:keyboardHorizontalEdgesPadding="10%p"
+ latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_arabic" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-sw600dp-land/kbd_phone_symbols.xml b/java/res/xml-sw600dp-land/kbd_phone_symbols.xml
new file mode 100644
index 000000000..e3f56bce7
--- /dev/null
+++ b/java/res/xml-sw600dp-land/kbd_phone_symbols.xml
@@ -0,0 +1,29 @@
+<?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.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardHorizontalEdgesPadding="10%p"
+ latin:keyWidth="15.00%p"
+>
+ <!-- Tablet doesn't have phone symbols keyboard -->
+ <include
+ latin:keyboardLayout="@xml/rows_phone" />
+</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_mini_keyboard_template.xml b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
index 0d5795f6a..d90a5884e 100644
--- a/java/res/xml-sw600dp/kbd_mini_keyboard_template.xml
+++ b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
@@ -21,6 +21,6 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="8%p"
latin:rowHeight="@dimen/popup_key_height"
- style="?attr/miniKeyboardStyle"
+ style="?attr/moreKeysKeyboardStyle"
>
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index 46114dedf..70cf6a2ca 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -20,190 +20,8 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="16.75%p"
+ latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
- <switch>
- <case
- latin:passwordInput="true"
- >
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="24.875%p" />
- <Key
- latin:keyStyle="num1KeyStyle" />
- <Key
- latin:keyStyle="num2KeyStyle" />
- <Key
- latin:keyStyle="num3KeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="24.875%p" />
- <Key
- latin:keyStyle="num4KeyStyle" />
- <Key
- latin:keyStyle="num5KeyStyle" />
- <Key
- latin:keyStyle="num6KeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="24.875%p" />
- <Key
- latin:keyStyle="num7KeyStyle" />
- <Key
- latin:keyStyle="num8KeyStyle" />
- <Key
- latin:keyStyle="num9KeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyWidth="11.00%p" />
- <Spacer
- latin:keyXPos="24.875%p" />
- <Key
- latin:keyStyle="num0KeyStyle" />
- <Spacer
- latin:keyXPos="-11.00%p"
- latin:keyWidth="0%p" />
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
- </Row>
- </case>
- <!-- latin:passwordInput="false" -->
- <default>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="11.00%p" />
- <Key
- latin:keyLabel="-"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="+"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="."
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="1"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="38.75%p" />
- <Key
- latin:keyLabel="2"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="3"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="11.00%p" />
- <Key
- latin:keyStyle="numStarKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="/"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel=","
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="4"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="38.75%p" />
- <Key
- latin:keyLabel="5"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="6"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="11.00%p" />
- <Key
- latin:keyLabel="("
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel=")"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="="
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="7"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="38.75%p" />
- <Key
- latin:keyLabel="8"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="9"
- latin:keyStyle="numKeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyWidth="11.00%p" />
- <Key
- latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
- latin:keyWidth="27.75%p" />
- <Key
- latin:keyStyle="numStarKeyStyle"
- latin:keyXPos="38.75%p" />
- <Key
- latin:keyLabel="0"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="#"
- latin:keyStyle="numKeyStyle" />
- <Spacer
- latin:keyXPos="-11.00%p"
- latin:keyWidth="0%p" />
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
- </Row>
- </default>
- </switch>
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index 303f8145b..72acef21c 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -20,104 +20,8 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="16.75%p"
+ latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="15.625%p" />
- <Key
- latin:keyLabel="-"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="+"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyStyle="num1KeyStyle"
- latin:keyXPos="38.867%p" />
- <Key
- latin:keyStyle="num2KeyStyle" />
- <Key
- latin:keyStyle="num3KeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="15.625%p" />
- <Key
- latin:keyLabel=","
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="."
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyStyle="num4KeyStyle"
- latin:keyXPos="38.867%p" />
- <Key
- latin:keyStyle="num5KeyStyle" />
- <Key
- latin:keyStyle="num6KeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="toMoreSymbolKeyStyle"
- latin:keyWidth="11.0%p" />
- <Key
- latin:keyLabel="("
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="15.625%p"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel=")"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyStyle="num7KeyStyle"
- latin:keyXPos="38.867%p" />
- <Key
- latin:keyStyle="num8KeyStyle" />
- <Key
- latin:keyStyle="num9KeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyWidth="11.00%p" />
- <Key
- latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
- latin:keyXPos="15.625%p"
- latin:keyWidth="18.50%p" />
- <Key
- latin:keyStyle="numStarKeyStyle"
- latin:keyXPos="38.867%p" />
- <Key
- latin:keyStyle="num0KeyStyle" />
- <Key
- latin:keyLabel="#"
- latin:keyStyle="numKeyStyle" />
- <Spacer
- latin:keyXPos="-11.00%p"
- latin:keyWidth="0%p" />
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
- </Row>
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
new file mode 100644
index 000000000..9faeaf4e0
--- /dev/null
+++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -0,0 +1,28 @@
+<?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.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyWidth="15.00%p"
+>
+ <!-- Tablet doesn't have phone symbols keyboard -->
+ <include
+ latin:keyboardLayout="@xml/rows_phone" />
+</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-sw600dp/kbd_rows_arabic.xml
deleted file mode 100644
index c2d3cd4cc..000000000
--- a/java/res/xml-sw600dp/kbd_rows_arabic.xml
+++ /dev/null
@@ -1,217 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="8.0%p"
- >
- <!-- \u0636: ARABIC LETTER DAD -->
- <Key
- latin:keyLabel="ض" />
- <!-- \u0635: ARABIC LETTER SAD -->
- <Key
- latin:keyLabel="ص" />
- <!-- \u062b: ARABIC LETTER THEH -->
- <Key
- latin:keyLabel="ث" />
- <!-- \u0642: ARABIC LETTER QAF
- \u06a8: ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
- <Key
- latin:keyLabel="ق"
- latin:moreKeys="ڨ" />
- <!-- \u0641: ARABIC LETTER FEH
- \u06a4: ARABIC LETTER VEH
- \u06a2: ARABIC LETTER FEH WITH DOT MOVED BELOW
- \u06a5: ARABIC LETTER FEH WITH THREE DOTS BELOW -->
- <Key
- latin:keyLabel="ف"
- latin:moreKeys="\u06a4,\u06a2,\u06a5" />
- <!-- \u063a: ARABIC LETTER GHAIN -->
- <Key
- latin:keyLabel="غ" />
- <!-- \u0639: ARABIC LETTER AIN -->
- <Key
- latin:keyLabel="ع" />
- <!-- \u0647: ARABIC LETTER HEH
- \ufeeb: ARABIC LETTER HEH INITIAL FORM
- \u0647\u0640: ARABIC LETTER HEH + Zero width joiner -->
- <Key
- latin:keyLabel="ه"
- latin:moreKeys="\ufeeb|\u0647\u200D" />
- <!-- \u062e: ARABIC LETTER KHAH -->
- <Key
- latin:keyLabel="خ" />
- <!-- \u062d: ARABIC LETTER HAH -->
- <Key
- latin:keyLabel="ح" />
- <!-- \u062c: ARABIC LETTER JEEM
- \u0686: ARABIC LETTER TCHEH -->
- <Key
- latin:keyLabel="ج"
- latin:moreKeys="چ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="8.0%p"
- >
- <!-- \u0634: ARABIC LETTER SHEEN
- \u069c: ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
- <Key
- latin:keyLabel="ش"
- latin:moreKeys="ڜ"
- latin:keyXPos="3.0%p" />
- <!-- \u0633: ARABIC LETTER SEEN -->
- <Key
- latin:keyLabel="س" />
- <!-- \u064a: ARABIC LETTER YEH
- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE
- \u0649: ARABIC LETTER ALEF MAKSURA -->
- <Key
- latin:keyLabel="ي"
- latin:moreKeys="\u0626,\u0649" />
- <!-- \u0628: ARABIC LETTER BEH
- \u067e: ARABIC LETTER PEH -->
- <Key
- latin:keyLabel="ب"
- latin:moreKeys="پ" />
- <!-- \u0644: ARABIC LETTER LAM
- \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
- \u0627: ARABIC LETTER ALEF
- \ufef7: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
- \ufef9: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
- \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
- \ufef5: ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
- \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
- <Key
- latin:keyLabel="ل"
- latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
- <!-- \u0627: ARABIC LETTER ALEF
- \u0621: ARABIC LETTER HAMZA
- \u0671: ARABIC LETTER ALEF WASLA
- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
- \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
- \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
- <Key
- latin:keyLabel="ا"
- latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
- <!-- \u062a: ARABIC LETTER TEH -->
- <Key
- latin:keyLabel="ت" />
- <!-- \u0646: ARABIC LETTER NOON -->
- <Key
- latin:keyLabel="ن" />
- <!-- \u0645: ARABIC LETTER MEEM -->
- <Key
- latin:keyLabel="م" />
- <!-- \u0643: ARABIC LETTER KAF
- \u06af: ARABIC LETTER GAF
- \u06a9: ARABIC LETTER KEHEH -->
- <Key
- latin:keyLabel="ك"
- latin:moreKeys="\u06af,\u06a9" />
- <!-- \u0637: ARABIC LETTER TAH -->
- <Key
- latin:keyLabel="ط" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="8.0%p"
- >
- <!-- kbd_row3_smiley -->
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="\@" />
- </case>
- <case
- latin:mode="url"
- >
- <Key
- latin:keyLabel="-"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="_"
- latin:moreKeys="_" />
- </case>
- <case
- latin:imeAction="actionSearch"
- >
- <Key
- latin:keyLabel=":"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="+"
- latin:moreKeys="+" />
- </case>
- <default>
- <Key
- latin:keyStyle="smileyKeyStyle" />
- </default>
- </switch>
- <!-- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE -->
- <Key
- latin:keyLabel="ئ" />
- <!-- \u0621: ARABIC LETTER HAMZA -->
- <Key
- latin:keyLabel="ء" />
- <!-- \u0624: ARABIC LETTER WAW WITH HAMZA ABOVE -->
- <Key
- latin:keyLabel="ؤ" />
- <!-- \u0631: ARABIC LETTER REH -->
- <Key
- latin:keyLabel="ر" />
- <!-- \u0630: ARABIC LETTER THAL -->
- <Key
- latin:keyLabel="ذ" />
- <!-- \u0649: ARABIC LETTER ALEF MAKSURA -->
- <Key
- latin:keyLabel="ى" />
- <!-- \u0629: ARABIC LETTER TEH MARBUTA -->
- <Key
- latin:keyLabel="ة" />
- <!-- \u0648: ARABIC LETTER WAW -->
- <Key
- latin:keyLabel="و" />
- <!-- \u0632: ARABIC LETTER ZAIN
- \u0698: ARABIC LETTER JEH -->
- <Key
- latin:keyLabel="ز"
- latin:moreKeys="ژ" />
- <!-- \u0638: ARABIC LETTER ZAH -->
- <Key
- latin:keyLabel="ظ" />
- <!-- \u062f: ARABIC LETTER DAL -->
- <Key
- latin:keyLabel="د" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_hebrew.xml b/java/res/xml-sw600dp/kbd_rows_hebrew.xml
deleted file mode 100644
index a8adbd34c..000000000
--- a/java/res/xml-sw600dp/kbd_rows_hebrew.xml
+++ /dev/null
@@ -1,147 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="9.0%p"
- >
- <include
- latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
- <Key
- latin:keyLabel="ק" />
- <Key
- latin:keyLabel="ר" />
- <Key
- latin:keyLabel="א" />
- <Key
- latin:keyLabel="ט" />
- <Key
- latin:keyLabel="ו" />
- <Key
- latin:keyLabel="ן" />
- <Key
- latin:keyLabel="ם" />
- <Key
- latin:keyLabel="פ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-12.000%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="9.0%p"
- >
- <Key
- latin:keyLabel="ש"
- latin:keyXPos="4.500%p" />
- <Key
- latin:keyLabel="ד" />
- <Key
- latin:keyLabel="ג"
- latin:moreKeys="ג׳" />
- <Key
- latin:keyLabel="כ" />
- <Key
- latin:keyLabel="ע" />
- <Key
- latin:keyLabel="י"
- latin:moreKeys="ײַ" />
- <Key
- latin:keyLabel="ח"
- latin:moreKeys="ח׳" />
- <Key
- latin:keyLabel="ל" />
- <Key
- latin:keyLabel="ך" />
- <Key
- latin:keyLabel="ף" />
- </Row>
- <Row
- latin:keyWidth="8.9%p"
- >
- <!-- kbd_row3_smiley -->
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="\@"
- latin:keyWidth="10.0%p" />
- </case>
- <case
- latin:mode="url"
- >
- <Key
- latin:keyLabel="-"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="_"
- latin:moreKeys="_"
- latin:keyWidth="10.0%p" />
- </case>
- <case
- latin:imeAction="actionSearch"
- >
- <Key
- latin:keyLabel=":"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="+"
- latin:moreKeys="+"
- latin:keyWidth="10.0%p" />
- </case>
- <default>
- <Key
- latin:keyStyle="smileyKeyStyle"
- latin:keyWidth="10.0%p" />
- </default>
- </switch>
- <Key
- latin:keyLabel="ז"
- latin:moreKeys="ז׳" />
- <Key
- latin:keyLabel="ס" />
- <Key
- latin:keyLabel="ב" />
- <Key
- latin:keyLabel="ה" />
- <Key
- latin:keyLabel="נ" />
- <Key
- latin:keyLabel="מ" />
- <Key
- latin:keyLabel="צ"
- latin:moreKeys="צ׳" />
- <Key
- latin:keyLabel="ת"
- latin:moreKeys="ת׳" />
- <Key
- latin:keyLabel="ץ"
- latin:moreKeys="ץ׳" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-10.400%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_russian.xml b/java/res/xml-sw600dp/kbd_rows_russian.xml
deleted file mode 100644
index cc9ad3aa7..000000000
--- a/java/res/xml-sw600dp/kbd_rows_russian.xml
+++ /dev/null
@@ -1,140 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="7.60%p"
- >
- <Key
- latin:keyLabel="й" />
- <Key
- latin:keyLabel="ц" />
- <Key
- latin:keyLabel="у" />
- <Key
- latin:keyLabel="к" />
- <Key
- latin:keyLabel="е"
- latin:moreKeys="@string/more_keys_for_cyrillic_e" />
- <Key
- latin:keyLabel="н" />
- <Key
- latin:keyLabel="г" />
- <Key
- latin:keyLabel="ш" />
- <Key
- latin:keyLabel="щ" />
- <Key
- latin:keyLabel="з" />
- <Key
- latin:keyLabel="х" />
- <Key
- latin:keyLabel="ъ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.60%p"
- >
- <Key
- latin:keyLabel="ф"
- latin:keyXPos="2.25%p" />
- <Key
- latin:keyLabel="ы" />
- <Key
- latin:keyLabel="в" />
- <Key
- latin:keyLabel="а" />
- <Key
- latin:keyLabel="п" />
- <Key
- latin:keyLabel="р" />
- <Key
- latin:keyLabel="о" />
- <Key
- latin:keyLabel="л" />
- <Key
- latin:keyLabel="д" />
- <Key
- latin:keyLabel="ж" />
- <Key
- latin:keyLabel="э" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.60%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle" />
- <Key
- latin:keyLabel="я" />
- <Key
- latin:keyLabel="ч" />
- <Key
- latin:keyLabel="с" />
- <Key
- latin:keyLabel="м" />
- <Key
- latin:keyLabel="и" />
- <Key
- latin:keyLabel="т" />
- <Key
- latin:keyLabel="ь" />
- <Key
- latin:keyLabel="б" />
- <Key
- latin:keyLabel="ю" />
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- </case>
- <default>
- <Key
- latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="!"
- latin:moreKeys="!" />
- <Key
- latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
- </default>
- </switch>
- <include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_serbian.xml b/java/res/xml-sw600dp/kbd_rows_serbian.xml
deleted file mode 100644
index db7560cdc..000000000
--- a/java/res/xml-sw600dp/kbd_rows_serbian.xml
+++ /dev/null
@@ -1,118 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="8.0%p"
- >
- <Key
- latin:keyLabel="љ"
- latin:keyXPos="2.15%p" />
- <Key
- latin:keyLabel="њ" />
- <Key
- latin:keyLabel="е" />
- <Key
- latin:keyLabel="р" />
- <Key
- latin:keyLabel="т" />
- <Key
- latin:keyLabel="з" />
- <Key
- latin:keyLabel="у" />
- <Key
- latin:keyLabel="и" />
- <Key
- latin:keyLabel="о" />
- <Key
- latin:keyLabel="п" />
- <Key
- latin:keyLabel="ш" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.9%p"
- >
- <Key
- latin:keyLabel="а" />
- <Key
- latin:keyLabel="с" />
- <Key
- latin:keyLabel="д" />
- <Key
- latin:keyLabel="ф" />
- <Key
- latin:keyLabel="г" />
- <Key
- latin:keyLabel="х" />
- <Key
- latin:keyLabel="ј" />
- <Key
- latin:keyLabel="к" />
- <Key
- latin:keyLabel="л" />
- <Key
- latin:keyLabel="ч" />
- <Key
- latin:keyLabel="ћ" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.5%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="8.0%p" />
- <Key
- latin:keyLabel="ѕ" />
- <Key
- latin:keyLabel="џ" />
- <Key
- latin:keyLabel="ц" />
- <Key
- latin:keyLabel="в" />
- <Key
- latin:keyLabel="б" />
- <Key
- latin:keyLabel="н" />
- <Key
- latin:keyLabel="м" />
- <Key
- latin:keyLabel="ђ" />
- <Key
- latin:keyLabel="ж" />
- <include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
- <include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_f2.xml b/java/res/xml-sw600dp/key_f2.xml
index b25afc12f..b25afc12f 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_f2.xml
+++ b/java/res/xml-sw600dp/key_f2.xml
diff --git a/java/res/xml-sw600dp/kbd_row3_smiley.xml b/java/res/xml-sw600dp/key_smiley.xml
index f9b647cdf..3430d7898 100644
--- a/java/res/xml-sw600dp/kbd_row3_smiley.xml
+++ b/java/res/xml-sw600dp/key_smiley.xml
@@ -26,37 +26,29 @@
latin:mode="email"
>
<Key
- latin:keyLabel="\@"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyLabel="\@" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="-"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
latin:moreKeys="_"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<Key
latin:keyLabel=":"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="+"
latin:moreKeys="+"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
- latin:keyStyle="smileyKeyStyle"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyStyle="smileyKeyStyle" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 25fa8b265..e524aa381 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -33,51 +33,92 @@
<default>
<key-style
latin:styleName="f2PopupStyle"
- latin:keyLabelOption="hasPopupHint"
- latin:moreKeys="\@icon/3|\@integer/key_settings"
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="\@icon/settingsKey|\@integer/key_settings"
latin:backgroundType="functional" />
</default>
</switch>
+ <switch>
+ <case
+ latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+ >
+ <key-style
+ latin:styleName="hasShiftedLetterHintStyle"
+ latin:keyLabelFlags="hasShiftedLetterHint|shiftedLetterActivated" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="hasShiftedLetterHintStyle"
+ latin:keyLabelFlags="hasShiftedLetterHint" />
+ </default>
+ </switch>
<!-- Functional key styles -->
- <key-style
- latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
- latin:keyIcon="iconShiftKey"
- latin:keyIconShifted="iconShiftedShiftKey"
- latin:backgroundType="sticky" />
+ <switch>
+ <case
+ latin:keyboardSetElement="alphabetManualShifted|alphabetAutomaticShifted"
+ >
+ <key-style
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKeyShifted"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOff" />
+ </case>
+ <case
+ latin:keyboardSetElement="alphabetShiftLocked|alphabetShiftLockShifted"
+ >
+ <key-style
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKeyShifted"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOn" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKey"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOff" />
+ </default>
+ </switch>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
- latin:backgroundType="functional"
- latin:isRepeatable="true" />
- <key-style
- latin:styleName="returnKeyStyle"
- latin:code="@integer/key_return"
- latin:keyIcon="iconReturnKey"
+ latin:keyActionFlags="isRepeatable|noKeyPreview"
latin:backgroundType="functional" />
+ <include
+ latin:keyboardLayout="@xml/key_styles_enter_tablet" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:code="@integer/key_space" />
+ latin:code="@integer/key_space"
+ latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="nonSpecialBackgroundSpaceKeyStyle"
- latin:code="@integer/key_space" />
+ latin:code="@integer/key_space"
+ latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="smileyKeyStyle"
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
- latin:keyLabelOption="hasPopupHint"
+ latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="@string/more_keys_for_smiley"
latin:maxMoreKeysColumn="5" />
<key-style
latin:styleName="shortcutKeyStyle"
latin:code="@integer/key_shortcut"
latin:keyIcon="iconShortcutKey"
+ latin:keyIconDisabled="iconDisabledShortcutKey"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:parentStyle="f2PopupStyle" />
<key-style
latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings"
latin:keyIcon="iconSettingsKey"
+ latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:backgroundType="functional" />
<key-style
latin:styleName="tabKeyStyle"
@@ -89,26 +130,34 @@
latin:styleName="toSymbolKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toAlphaKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_more_symbol_for_tablet_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_symbol_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="comKeyStyle"
latin:keyLabel="@string/keylabel_for_popular_domain"
- latin:keyLabelOption="fontNormal|hasPopupHint"
+ latin:keyLabelFlags="fontNormal|hasPopupHint|preserveCase"
latin:keyOutputText="@string/keylabel_for_popular_domain"
latin:moreKeys="@string/more_keys_for_popular_domain" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw600dp/keys_apostrophe_dash.xml
index 9536e81da..a53c1e4ab 100644
--- a/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml
+++ b/java/res/xml-sw600dp/keys_apostrophe_dash.xml
@@ -33,16 +33,16 @@
>
<Key
latin:keyLabel="/"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
- latin:moreKeys=":" />
+ latin:moreKeys=":"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyLabel="@string/keylabel_for_apostrophe"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="@string/keyhintlabel_for_apostrophe"
- latin:moreKeys="@string/more_keys_for_apostrophe" />
+ latin:moreKeys="@string/more_keys_for_apostrophe"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
<switch>
@@ -55,9 +55,9 @@
<default>
<Key
latin:keyLabel="@string/keylabel_for_dash"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="@string/keyhintlabel_for_dash"
- latin:moreKeys="@string/more_keys_for_dash" />
+ latin:moreKeys="@string/more_keys_for_dash"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/row_qwerty1.xml
index 07d8e2296..3d3a1a8ff 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml
+++ b/java/res/xml-sw600dp/row_qwerty1.xml
@@ -25,11 +25,9 @@
latin:keyWidth="9.0%p"
>
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="e"
latin:moreKeys="@string/more_keys_for_e" />
@@ -52,8 +50,7 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/row_qwerty2.xml
index 52a948f20..cabb9cb4a 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row2.xml
+++ b/java/res/xml-sw600dp/row_qwerty2.xml
@@ -50,7 +50,7 @@
latin:keyLabel="l"
latin:moreKeys="@string/more_keys_for_l" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/row_qwerty3.xml
index 4dabf633c..3d19904a1 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw600dp/row_qwerty3.xml
@@ -46,8 +46,10 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillBoth" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
index ef0292279..b06508e37 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/row_qwerty4.xml
@@ -45,9 +45,9 @@
<default>
<Key
latin:keyLabel="/"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="\@"
- latin:moreKeys="\@" />
+ latin:moreKeys="\@"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
<Key
@@ -59,18 +59,18 @@
latin:languageCode="iw"
>
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
</case>
<!-- not languageCode="iw" -->
<default>
<include
- latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+ latin:keyboardLayout="@xml/keys_apostrophe_dash" />
</default>
</switch>
<Spacer
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
new file mode 100644
index 000000000..715ec6cf6
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -0,0 +1,192 @@
+<?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.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="8.0%p"
+ >
+ <!-- \u0636: "ض" ARABIC LETTER DAD -->
+ <Key
+ latin:keyLabel="\u0636" />
+ <!-- \u0635: "ص" ARABIC LETTER SAD -->
+ <Key
+ latin:keyLabel="\u0635" />
+ <!-- \u062b: "ث" ARABIC LETTER THEH -->
+ <Key
+ latin:keyLabel="\u062b" />
+ <!-- \u0642: "ق" ARABIC LETTER QAF
+ \u06a8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u06a8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+ <Key
+ latin:keyLabel="\u0642"
+ latin:moreKeys="\u06a8" />
+ <!-- \u0641: "ف" ARABIC LETTER FEH
+ \u06a4: "ڤ" ARABIC LETTER VEH
+ \u06a2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
+ \u06a5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u06a2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u06a5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+ <Key
+ latin:keyLabel="\u0641"
+ latin:moreKeys="\u06a4,\u06a2,\u06a5" />
+ <!-- \u063a: "غ" ARABIC LETTER GHAIN -->
+ <Key
+ latin:keyLabel="\u063a" />
+ <!-- \u0639: "ع" ARABIC LETTER AIN -->
+ <Key
+ latin:keyLabel="\u0639" />
+ <!-- \u0647: "ه" ARABIC LETTER HEH
+ \ufeeb: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+ \u0647\u200d: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
+ <Key
+ latin:keyLabel="\u0647"
+ latin:moreKeys="\ufeeb|\u0647\u200d" />
+ <!-- \u062e: "خ" ARABIC LETTER KHAH -->
+ <Key
+ latin:keyLabel="\u062e" />
+ <!-- \u062d: "ح" ARABIC LETTER HAH -->
+ <Key
+ latin:keyLabel="\u062d" />
+ <!-- \u062c: "ج" ARABIC LETTER JEEM
+ \u0686: "چ" ARABIC LETTER TCHEH -->
+ <Key
+ latin:keyLabel="\u062c"
+ latin:moreKeys="\u0686" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-10.0%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="8.0%p"
+ >
+ <!-- \u0634: "ش" ARABIC LETTER SHEEN
+ \u069c: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u069c ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+ <Key
+ latin:keyLabel="\u0634"
+ latin:moreKeys="\u069c"
+ latin:keyXPos="3.0%p" />
+ <!-- \u0633: "س" ARABIC LETTER SEEN -->
+ <Key
+ latin:keyLabel="\u0633" />
+ <!-- \u064a: "ي" ARABIC LETTER YEH
+ \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+ \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+ <Key
+ latin:keyLabel="\u064a"
+ latin:moreKeys="\u0626,\u0649" />
+ <!-- \u0628: "ب" ARABIC LETTER BEH
+ \u067e: "پ" ARABIC LETTER PEH -->
+ <Key
+ latin:keyLabel="\u0628"
+ latin:moreKeys="\u067e" />
+ <!-- \u0644: "ل" ARABIC LETTER LAM
+ \ufefb: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+ \u0627: "ا" ARABIC LETTER ALEF
+ \ufef7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+ \u0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+ \ufef9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+ \u0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+ \ufef5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+ \u0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ <Key
+ latin:keyLabel="\u0644"
+ latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
+ <!-- \u0627: "ا" ARABIC LETTER ALEF
+ \u0621: "ء" ARABIC LETTER HAMZA
+ \u0671: "ٱ" ARABIC LETTER ALEF WASLA
+ \u0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+ \u0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+ \u0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ <Key
+ latin:keyLabel="\u0627"
+ latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
+ <!-- \u062a: "ت" ARABIC LETTER TEH -->
+ <Key
+ latin:keyLabel="\u062a" />
+ <!-- \u0646: "ن" ARABIC LETTER NOON -->
+ <Key
+ latin:keyLabel="\u0646" />
+ <!-- \u0645: "م" ARABIC LETTER MEEM -->
+ <Key
+ latin:keyLabel="\u0645" />
+ <!-- \u0643: "ك" ARABIC LETTER KAF
+ \u06af: "گ" ARABIC LETTER GAF
+ \u06a9: "ک" ARABIC LETTER KEHEH -->
+ <Key
+ latin:keyLabel="\u0643"
+ latin:moreKeys="\u06af,\u06a9" />
+ <!-- \u0637: "ط" ARABIC LETTER TAH -->
+ <Key
+ latin:keyLabel="\u0637" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-14.6%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="8.0%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/key_smiley" />
+ <!-- \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
+ <Key
+ latin:keyLabel="\u0626" />
+ <!-- \u0621: "ء" ARABIC LETTER HAMZA -->
+ <Key
+ latin:keyLabel="\u0621" />
+ <!-- \u0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
+ <Key
+ latin:keyLabel="\u0624" />
+ <!-- \u0631: "ر" ARABIC LETTER REH -->
+ <Key
+ latin:keyLabel="\u0631" />
+ <!-- \u0630: "ذ" ARABIC LETTER THAL -->
+ <Key
+ latin:keyLabel="\u0630" />
+ <!-- \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+ <Key
+ latin:keyLabel="\u0649" />
+ <!-- \u0629: "ة" ARABIC LETTER TEH MARBUTA -->
+ <Key
+ latin:keyLabel="\u0629" />
+ <!-- \u0648: "و" ARABIC LETTER WAW -->
+ <Key
+ latin:keyLabel="\u0648" />
+ <!-- \u0632: "ز" ARABIC LETTER ZAIN
+ \u0698: "ژ" ARABIC LETTER JEH -->
+ <Key
+ latin:keyLabel="\u0632"
+ latin:moreKeys="\u0698" />
+ <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
+ <Key
+ latin:keyLabel="\u0638" />
+ <!-- \u062f: "د" ARABIC LETTER DAL -->
+ <Key
+ latin:keyLabel="\u062f" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml
index 8ae74557c..5c799623d 100644
--- a/java/res/xml-sw600dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw600dp/rows_azerty.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.5%p"
>
@@ -54,8 +54,7 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
@@ -66,7 +65,6 @@
>
<Key
latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q"
latin:keyXPos="5.0%p" />
<Key
latin:keyLabel="s"
@@ -92,7 +90,7 @@
<Key
latin:keyLabel="m" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -103,8 +101,7 @@
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="x" />
<Key
@@ -119,32 +116,17 @@
latin:keyLabel="n"
latin:moreKeys="@string/more_keys_for_n" />
<Key
- latin:keyLabel="\'" />
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- </case>
- <default>
- <Key
- latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="!"
- latin:moreKeys="!" />
- <Key
- latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
- </default>
- </switch>
+ latin:keyLabel="\'"
+ latin:keyHintLabel=":"
+ latin:moreKeys=":"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml
new file mode 100644
index 000000000..554766310
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_bulgarian.xml
@@ -0,0 +1,147 @@
+<?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"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="7.692%p"
+ >
+ <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="\u0447" />
+ <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="\u0448" />
+ <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="\u0435" />
+ <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="\u0440" />
+ <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="\u0442" />
+ <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <Key
+ latin:keyLabel="\u044a" />
+ <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="\u0443" />
+ <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+ <Key
+ latin:keyLabel="\u0438"
+ latin:moreKeys="ѝ" />
+ <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="\u043e" />
+ <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="\u043f" />
+ <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+ <Key
+ latin:keyLabel="\u044f" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.692%p"
+ >
+ <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="\u0430"
+ latin:keyXPos="4.000%p" />
+ <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="\u0441" />
+ <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="\u0434" />
+ <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="\u0444" />
+ <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="\u0433" />
+ <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="\u0445" />
+ <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+ <Key
+ latin:keyLabel="\u0439" />
+ <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="\u043a" />
+ <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="\u043b" />
+ <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+ <Key
+ latin:keyLabel="\u0449" />
+ <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+ <Key
+ latin:keyLabel="\u044c" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.692%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="10.000%p" />
+ <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="\u0437" />
+ <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="\u0436" />
+ <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="\u0446" />
+ <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="\u0432" />
+ <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="\u0431" />
+ <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="\u043d" />
+ <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="\u043c" />
+ <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+ <Key
+ latin:keyLabel="\u044e" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
new file mode 100644
index 000000000..8a7d706a8
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -0,0 +1,142 @@
+<?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.
+*/
+-->
+
+<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/keys_apostrophe_dash" />
+ <!-- \u05e7: "ק" HEBREW LETTER QOF -->
+ <Key
+ latin:keyLabel="\u05e7" />
+ <!-- \u05e8: "ר" HEBREW LETTER RESH -->
+ <Key
+ latin:keyLabel="\u05e8" />
+ <!-- \u05d0: "א" HEBREW LETTER ALEF -->
+ <Key
+ latin:keyLabel="\u05d0" />
+ <!-- \u05d8: "ט" HEBREW LETTER TET -->
+ <Key
+ latin:keyLabel="\u05d8" />
+ <!-- \u05d5: "ו" HEBREW LETTER VAV -->
+ <Key
+ latin:keyLabel="\u05d5" />
+ <!-- \u05df: "ן" HEBREW LETTER FINAL NUN -->
+ <Key
+ latin:keyLabel="\u05df" />
+ <!-- \u05dd: "ם" HEBREW LETTER FINAL MEM -->
+ <Key
+ latin:keyLabel="\u05dd" />
+ <!-- \u05e4: "פ" HEBREW LETTER PE -->
+ <Key
+ latin:keyLabel="\u05e4" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-12.000%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="9.0%p"
+ >
+ <!-- \u05e9: "ש" HEBREW LETTER SHIN -->
+ <Key
+ latin:keyLabel="\u05e9"
+ latin:keyXPos="4.500%p" />
+ <!-- \u05d3: "ד" HEBREW LETTER DALET -->
+ <Key
+ latin:keyLabel="\u05d3" />
+ <!-- \u05d2: "ג" HEBREW LETTER GIMEL -->
+ <Key
+ latin:keyLabel="\u05d2"
+ latin:moreKeys="ג׳" />
+ <!-- \u05db: "כ" HEBREW LETTER KAF -->
+ <Key
+ latin:keyLabel="\u05db" />
+ <!-- \u05e2: "ע" HEBREW LETTER AYIN -->
+ <Key
+ latin:keyLabel="\u05e2" />
+ <!-- \u05d9: "י" HEBREW LETTER YOD -->
+ <Key
+ latin:keyLabel="\u05d9"
+ latin:moreKeys="ײַ" />
+ <!-- \u05d7: "ח" HEBREW LETTER HET -->
+ <Key
+ latin:keyLabel="\u05d7"
+ latin:moreKeys="ח׳" />
+ <!-- \u05dc: "ל" HEBREW LETTER LAMED -->
+ <Key
+ latin:keyLabel="\u05dc" />
+ <!-- \u05da: "ך" HEBREW LETTER FINAL KAF -->
+ <Key
+ latin:keyLabel="\u05da" />
+ <!-- \u05e3: "ף" HEBREW LETTER FINAL PE -->
+ <Key
+ latin:keyLabel="\u05e3" />
+ </Row>
+ <Row
+ latin:keyWidth="8.9%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyWidth="10.0%p" />
+ <!-- \u05d6: "ז" HEBREW LETTER ZAYIN -->
+ <Key
+ latin:keyLabel="\u05d6"
+ latin:moreKeys="ז׳" />
+ <!-- \u05e1: "ס" HEBREW LETTER SAMEKH -->
+ <Key
+ latin:keyLabel="\u05e1" />
+ <!-- \u05d1: "ב" HEBREW LETTER BET -->
+ <Key
+ latin:keyLabel="\u05d1" />
+ <!-- \u05d4: "ה" HEBREW LETTER HE -->
+ <Key
+ latin:keyLabel="\u05d4" />
+ <!-- \u05e0: "נ" HEBREW LETTER NUN -->
+ <Key
+ latin:keyLabel="\u05e0" />
+ <!-- \u05de: "מ" HEBREW LETTER MEM -->
+ <Key
+ latin:keyLabel="\u05de" />
+ <!-- \u05e6: "צ" HEBREW LETTER TSADI -->
+ <Key
+ latin:keyLabel="\u05e6"
+ latin:moreKeys="צ׳" />
+ <!-- \u05ea: "ת" HEBREW LETTER TAV -->
+ <Key
+ latin:keyLabel="\u05ea"
+ latin:moreKeys="ת׳" />
+ <!-- \u05e5: "ץ" HEBREW LETTER FINAL TSADI -->
+ <Key
+ latin:keyLabel="\u05e5"
+ latin:moreKeys="ץ׳" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-10.400%p"
+ latin:keyWidth="fillBoth" />
+ </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
new file mode 100644
index 000000000..3141bbdc7
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -0,0 +1,138 @@
+<?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"
+>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="12.75%p" />
+ <Key
+ latin:keyLabel="-"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="+"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="."
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="1"
+ latin:keyStyle="numKeyStyle"
+ latin:keyXPos="42.25%p" />
+ <Key
+ latin:keyLabel="2"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="3"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="12.75%p" />
+ <Key
+ latin:keyStyle="numStarKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="/"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel=","
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="4"
+ latin:keyStyle="numKeyStyle"
+ latin:keyXPos="42.25%p" />
+ <Key
+ latin:keyLabel="5"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="6"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="12.75%p" />
+ <Key
+ latin:keyLabel="("
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel=")"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="="
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="7"
+ latin:keyStyle="numKeyStyle"
+ latin:keyXPos="42.25%p" />
+ <Key
+ latin:keyLabel="8"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="9"
+ latin:keyStyle="numKeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
+ </Row>
+ <Row>
+ <Key
+ latin:keyStyle="numTabKeyStyle"
+ latin:keyWidth="11.00%p" />
+ <Key
+ latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
+ latin:keyWidth="27.75%p"
+ latin:keyXPos="12.75%p" />
+ <Key
+ latin:keyStyle="numStarKeyStyle"
+ latin:keyXPos="42.25%p" />
+ <Key
+ latin:keyLabel="0"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="#"
+ latin:keyStyle="numKeyStyle" />
+ <Spacer
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="0%p" />
+ <include
+ latin:keyboardLayout="@xml/key_f2" />
+ </Row>
+</merge>
diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml
new file mode 100644
index 000000000..0a71f74d7
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_number_password.xml
@@ -0,0 +1,81 @@
+<?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"
+>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="27.50%p" />
+ <Key
+ latin:keyStyle="num1KeyStyle" />
+ <Key
+ latin:keyStyle="num2KeyStyle" />
+ <Key
+ latin:keyStyle="num3KeyStyle" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="27.50%p" />
+ <Key
+ latin:keyStyle="num4KeyStyle" />
+ <Key
+ latin:keyStyle="num5KeyStyle" />
+ <Key
+ latin:keyStyle="num6KeyStyle" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="27.50%p" />
+ <Key
+ latin:keyStyle="num7KeyStyle" />
+ <Key
+ latin:keyStyle="num8KeyStyle" />
+ <Key
+ latin:keyStyle="num9KeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
+ </Row>
+ <Row>
+ <Key
+ latin:keyStyle="tabKeyStyle"
+ latin:keyWidth="11.00%p" />
+ <Key
+ latin:keyStyle="num0KeyStyle"
+ latin:keyXPos="42.50%p"/>
+ <Spacer
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="0%p" />
+ <include
+ latin:keyboardLayout="@xml/key_f2" />
+ </Row>
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_phone_shift.xml b/java/res/xml-sw600dp/rows_phone.xml
index 4c4f8ad12..d61b4b2ad 100644
--- a/java/res/xml-sw600dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -18,18 +18,17 @@
*/
-->
-<Keyboard
+<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="16.75%p"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
- latin:keyWidth="11.00%p" />
+ latin:keyWidth="12.75%p" />
<Key
latin:keyLabel="-"
latin:keyStyle="numKeyStyle"
@@ -39,13 +38,11 @@
latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
- latin:code="44"
- latin:keyLabel="@string/label_pause_key"
- latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"
+ latin:keyStyle="numPauseKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num1KeyStyle"
- latin:keyXPos="38.867%p" />
+ latin:keyXPos="42.25%p" />
<Key
latin:keyStyle="num2KeyStyle" />
<Key
@@ -53,12 +50,12 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
+ latin:keyWidth="fillRight" />
</Row>
<Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
- latin:keyWidth="11.00%p" />
+ latin:keyWidth="12.75%p" />
<Key
latin:keyLabel=","
latin:keyStyle="numKeyStyle"
@@ -68,30 +65,29 @@
latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
- latin:code="59"
- latin:keyLabel="@string/label_wait_key"
- latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"
+ latin:keyStyle="numWaitKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num4KeyStyle"
- latin:keyXPos="38.867%p" />
+ latin:keyXPos="42.25%p" />
<Key
latin:keyStyle="num5KeyStyle" />
<Key
latin:keyStyle="num6KeyStyle" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
+ latin:keyWidth="fillRight" />
</Row>
<Row>
- <Key
- latin:keyStyle="backFromMoreSymbolKeyStyle"
- latin:keyWidth="11.00%p" />
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="12.75%p" />
<Key
latin:keyLabel="("
latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
+ latin:keyWidth="9.25%p"
+ latin:keyXPos="12.75%p" />
<Key
latin:keyLabel=")"
latin:keyStyle="numKeyStyle"
@@ -102,7 +98,7 @@
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num7KeyStyle"
- latin:keyXPos="38.867%p" />
+ latin:keyXPos="42.25%p" />
<Key
latin:keyStyle="num8KeyStyle" />
<Key
@@ -113,14 +109,15 @@
</Row>
<Row>
<Key
- latin:keyStyle="tabKeyStyle"
+ latin:keyStyle="numTabKeyStyle"
latin:keyWidth="11.00%p" />
<Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
- latin:keyWidth="27.75%p" />
+ latin:keyWidth="27.75%p"
+ latin:keyXPos="12.75%p" />
<Key
latin:keyStyle="numStarKeyStyle"
- latin:keyXPos="38.867%p" />
+ latin:keyXPos="42.25%p" />
<Key
latin:keyStyle="num0KeyStyle" />
<Key
@@ -130,6 +127,6 @@
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
-</Keyboard>
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml
index a2d26b3de..eb41c5087 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwerty.xml
+++ b/java/res/xml-sw600dp/rows_qwerty.xml
@@ -22,13 +22,13 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml
index 98667e09c..6912f1c6d 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw600dp/rows_qwertz.xml
@@ -22,16 +22,14 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.0%p"
>
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="e"
latin:moreKeys="@string/more_keys_for_e" />
@@ -54,15 +52,14 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<Row
latin:keyWidth="8.9%p"
>
@@ -87,31 +84,13 @@
latin:moreKeys="@string/more_keys_for_n" />
<Key
latin:keyLabel="m" />
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- </case>
- <default>
- <Key
- latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="!"
- latin:moreKeys="!" />
- <Key
- latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
- </default>
- </switch>
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-sw600dp/rows_scandinavian.xml
index 19fb5212b..912c40658 100644
--- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw600dp/rows_scandinavian.xml
@@ -22,16 +22,14 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.9%p"
>
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="e"
latin:moreKeys="@string/more_keys_for_e" />
@@ -54,10 +52,9 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
- latin:keyLabel="å" />
+ latin:keyLabel="@string/keylabel_for_scandinavia_row1_11" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
@@ -98,7 +95,7 @@
latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
latin:moreKeys="@string/more_keys_for_scandinavia_row2_11" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -129,12 +126,12 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
- <Spacer
- latin:keyWidth="4.35%p" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_serbian.xml b/java/res/xml-sw600dp/rows_serbian.xml
new file mode 100644
index 000000000..8f2dc8da6
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_serbian.xml
@@ -0,0 +1,151 @@
+<?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.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="8.0%p"
+ >
+ <!-- \u0459: "љ" CYRILLIC SMALL LETTER LJE -->
+ <Key
+ latin:keyLabel="\u0459"
+ latin:keyXPos="2.15%p" />
+ <!-- \u045a: "њ" CYRILLIC SMALL LETTER NJE -->
+ <Key
+ latin:keyLabel="\u045a" />
+ <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="\u0435" />
+ <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="\u0440" />
+ <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="\u0442" />
+ <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="\u0437" />
+ <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="\u0443" />
+ <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+ <Key
+ latin:keyLabel="\u0438" />
+ <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="\u043e" />
+ <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="\u043f" />
+ <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="\u0448" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-10.0%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.9%p"
+ >
+ <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="\u0430" />
+ <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="\u0441" />
+ <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="\u0434" />
+ <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="\u0444" />
+ <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="\u0433" />
+ <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="\u0445" />
+ <!-- \u0458: "ј" CYRILLIC SMALL LETTER JE -->
+ <Key
+ latin:keyLabel="\u0458" />
+ <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="\u043a" />
+ <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="\u043b" />
+ <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="\u0447" />
+ <!-- \u045b: "ћ" CYRILLIC SMALL LETTER TSHE -->
+ <Key
+ latin:keyLabel="\u045b" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-14.6%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.5%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="8.0%p" />
+ <!-- \u0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
+ <Key
+ latin:keyLabel="\u0455" />
+ <!-- \u045f: "џ" CYRILLIC SMALL LETTER DZHE -->
+ <Key
+ latin:keyLabel="\u045f" />
+ <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="\u0446" />
+ <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="\u0432" />
+ <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="\u0431" />
+ <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="\u043d" />
+ <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="\u043c" />
+ <!-- \u0452: "ђ" CYRILLIC SMALL LETTER DJE -->
+ <Key
+ latin:keyLabel="\u0452" />
+ <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="\u0436" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/rows_slavic.xml b/java/res/xml-sw600dp/rows_slavic.xml
new file mode 100644
index 000000000..4ca15f6dd
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_slavic.xml
@@ -0,0 +1,155 @@
+<?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.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="7.60%p"
+ >
+ <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+ <Key
+ latin:keyLabel="\u0439" />
+ <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="\u0446" />
+ <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="\u0443"
+ latin:moreKeys="@string/more_keys_for_slavic_u" />
+ <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="\u043a" />
+ <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="\u0435"
+ latin:moreKeys="@string/more_keys_for_slavic_ye" />
+ <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="\u043d"
+ latin:moreKeys="@string/more_keys_for_slavic_en" />
+ <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="\u0433" />
+ <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="\u0448" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_shcha" />
+ <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="\u0437" />
+ <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="\u0445" />
+ <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <Key
+ latin:keyLabel="\u044a" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-10.0%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.60%p"
+ >
+ <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="\u0444"
+ latin:keyXPos="2.25%p" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_yery"
+ latin:moreKeys="@string/more_keys_for_slavic_yery" />
+ <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="\u0432" />
+ <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="\u0430" />
+ <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="\u043f" />
+ <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="\u0440" />
+ <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="\u043e"
+ latin:moreKeys="@string/more_keys_for_slavic_o" />
+ <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="\u043b" />
+ <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="\u0434" />
+ <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="\u0436" />
+ <!-- \u044d: "э" CYRILLIC SMALL LETTER E -->
+ <Key
+ latin:keyLabel="\u044d" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-14.6%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.60%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle" />
+ <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+ <Key
+ latin:keyLabel="\u044f" />
+ <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="\u0447" />
+ <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="\u0441" />
+ <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="\u043c" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_i" />
+ <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="\u0442" />
+ <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+ <Key
+ latin:keyLabel="\u044c" />
+ <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="\u0431" />
+ <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+ <Key
+ latin:keyLabel="\u044e" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml
index 8506af697..d7af5b139 100644
--- a/java/res/xml-sw600dp/kbd_rows_spanish.xml
+++ b/java/res/xml-sw600dp/rows_spanish.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<Row
latin:keyWidth="8.5%p"
>
@@ -53,15 +53,16 @@
<Key
latin:keyLabel="l"
latin:moreKeys="@string/more_keys_for_l" />
+ <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
<Key
- latin:keyLabel="ñ" />
+ latin:keyLabel="\u00f1" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
index bb48fe734..ce6e539a5 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -22,41 +22,51 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.0%p"
>
<Key
latin:keyLabel="@string/keylabel_for_symbols_1"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_1"
latin:moreKeys="@string/more_keys_for_symbols_1" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_2"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_2"
latin:moreKeys="@string/more_keys_for_symbols_2" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_3"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_3"
latin:moreKeys="@string/more_keys_for_symbols_3" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_4"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_4"
latin:moreKeys="@string/more_keys_for_symbols_4" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_5"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_5"
latin:moreKeys="@string/more_keys_for_symbols_5" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_6"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_6"
latin:moreKeys="@string/more_keys_for_symbols_6" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_7"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_7"
latin:moreKeys="@string/more_keys_for_symbols_7" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_8"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_8"
latin:moreKeys="@string/more_keys_for_symbols_8" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_9"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_9"
latin:moreKeys="@string/more_keys_for_symbols_9" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_0"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_0"
latin:moreKeys="@string/more_keys_for_symbols_0" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -85,14 +95,10 @@
<Key
latin:keyLabel="+"
latin:moreKeys="@string/more_keys_for_plus" />
+ <include
+ latin:keyboardLayout="@xml/keys_parentheses" />
<Key
- latin:keyLabel="("
- latin:moreKeys="[,{,&lt;" />
- <Key
- latin:keyLabel=")"
- latin:moreKeys="],},&gt;" />
- <Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -102,12 +108,8 @@
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="10.0%p" />
- <Key
- latin:keyLabel="&lt;"
- latin:moreKeys="≤,«,‹" />
- <Key
- latin:keyLabel="&gt;"
- latin:moreKeys="≥,»,›" />
+ <include
+ latin:keyboardLayout="@xml/keys_less_greater" />
<Key
latin:keyLabel="="
latin:moreKeys="≠,≈" />
@@ -116,8 +118,7 @@
latin:mode="url"
>
<Key
- latin:keyLabel="\'"
- latin:moreKeys="‘,’,‚,‛" />
+ latin:keyLabel="\'" />
</case>
<default>
<Key
@@ -156,17 +157,16 @@
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.750%p"
latin:keyWidth="39.750%p" />
- <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
- <!-- latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛" -->
<Key
latin:keyLabel="&quot;"
- latin:moreKeys="“,”,«,»,‘,’,‚,‛" />
+ latin:moreKeys="@string/more_keys_for_tablet_double_quote"
+ latin:maxMoreKeysColumn="4" />
<Key
latin:keyLabel="_" />
<Spacer
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index 8e4751502..960d3d0f5 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.0%p"
>
@@ -34,23 +34,32 @@
latin:keyLabel="`" />
<Key
latin:keyLabel="|" />
+ <!-- \u2022: "•" BULLET -->
<Key
- latin:keyLabel="•"
+ latin:keyLabel="\u2022"
latin:moreKeys="@string/more_keys_for_bullet" />
+ <!-- \u221a: "√" SQUARE ROOT -->
<Key
- latin:keyLabel="√" />
+ latin:keyLabel="\u221a" />
+ <!-- \u03c0: "π" GREEK SMALL LETTER PI
+ \u03a0: "Π" GREEK CAPITAL LETTER PI -->
<Key
- latin:keyLabel="π"
- latin:moreKeys="Π" />
+ latin:keyLabel="\u03c0"
+ latin:moreKeys="\u03a0" />
+ <!-- \u00f7: "÷" DIVISION SIGN -->
<Key
- latin:keyLabel="÷" />
+ latin:keyLabel="\u00f7" />
+ <!-- \u00d7: "×" MULTIPLICATION SIGN -->
<Key
- latin:keyLabel="×" />
+ latin:keyLabel="\u00d7" />
+ <!-- \u00a7: "§" SECTION SIGN
+ \u00b6: "¶" PILCROW SIGN -->
<Key
- latin:keyLabel="§"
- latin:moreKeys="¶" />
+ latin:keyLabel="\u00a7"
+ latin:moreKeys="\u00b6" />
+ <!-- \u0394: "Δ" GREEK CAPITAL LETTER DELTA -->
<Key
- latin:keyLabel="Δ" />
+ latin:keyLabel="\u0394" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
@@ -59,8 +68,9 @@
<Row
latin:keyWidth="9.0%p"
>
+ <!-- \u00a3: "£" POUND SIGN -->
<Key
- latin:keyLabel="£"
+ latin:keyLabel="\u00a3"
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="moreCurrency1KeyStyle" />
@@ -68,21 +78,28 @@
latin:keyStyle="moreCurrency2KeyStyle" />
<Key
latin:keyStyle="moreCurrency3KeyStyle" />
+ <!-- \u2191: "↑" UPWARDS ARROW
+ \u2193: "↓" DOWNWARDS ARROW
+ \u2190: "←" LEFTWARDS ARROW
+ \u2192: "→" RIGHTWARDS ARROW -->
<Key
latin:keyLabel="^"
- latin:moreKeys="↑,↓,←,→" />
- <Key
- latin:keyLabel="°"
- latin:moreKeys="′,″" />
- <Key
- latin:keyLabel="±"
- latin:moreKeys="∞" />
- <Key
- latin:keyLabel="{" />
- <Key
- latin:keyLabel="}" />
+ latin:moreKeys="\u2191,\u2193,\u2190,\u2192" />
+ <!-- \u00b0: "°" DEGREE SIGN
+ \u2032: "′" PRIME
+ \u2033: "″" DOUBLE PRIME -->
+ <Key
+ latin:keyLabel="\u00b0"
+ latin:moreKeys="\u2032,\u2033" />
+ <!-- \u00b1: "±" PLUS-MINUS SIGN
+ \u221e: "∞" INFINITY -->
+ <Key
+ latin:keyLabel="\u00b1"
+ latin:moreKeys="\u221e" />
+ <include
+ latin:keyboardLayout="@xml/keys_curly_brackets" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -94,22 +111,26 @@
latin:keyWidth="10.0%p" />
<Key
latin:keyLabel="\\" />
+ <!-- \u00a9: "©" COPYRIGHT SIGN -->
<Key
- latin:keyLabel="©" />
- <Key
- latin:keyLabel="®" />
+ latin:keyLabel="\u00a9" />
+ <!-- \u00ae: "®" REGISTERED SIGN -->
<Key
- latin:keyLabel="™" />
+ latin:keyLabel="\u00ae" />
+ <!-- \u2122: "™" TRADE MARK SIGN -->
<Key
- latin:keyLabel="℅" />
+ latin:keyLabel="\u2122" />
+ <!-- \u2105: "℅" CARE OF -->
<Key
- latin:keyLabel="[" />
- <Key
- latin:keyLabel="]" />
+ latin:keyLabel="\u2105" />
+ <include
+ latin:keyboardLayout="@xml/keys_square_brackets" />
+ <!-- \u00a1: "¡" INVERTED EXCLAMATION MARK -->
<Key
- latin:keyLabel="¡" />
+ latin:keyLabel="\u00a1" />
+ <!-- \u00bf: "¿" INVERTED QUESTION MARK -->
<Key
- latin:keyLabel="¿" />
+ latin:keyLabel="\u00bf" />
</Row>
<Row
latin:keyWidth="8.9%p"
@@ -127,6 +148,6 @@
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp-land/kbd_mini_keyboard_template.xml b/java/res/xml-sw768dp-land/kbd_more_keys_keyboard_template.xml
index 85e864a6c..f593fa944 100644
--- a/java/res/xml-sw768dp-land/kbd_mini_keyboard_template.xml
+++ b/java/res/xml-sw768dp-land/kbd_more_keys_keyboard_template.xml
@@ -21,6 +21,6 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="3.5%p"
latin:rowHeight="@dimen/popup_key_height"
- style="?attr/miniKeyboardStyle"
+ style="?attr/moreKeysKeyboardStyle"
>
</Keyboard>
diff --git a/java/res/xml-sw768dp-land/kbd_number.xml b/java/res/xml-sw768dp-land/kbd_number.xml
new file mode 100644
index 000000000..3ad25a392
--- /dev/null
+++ b/java/res/xml-sw768dp-land/kbd_number.xml
@@ -0,0 +1,28 @@
+<?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.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardHorizontalEdgesPadding="10%p"
+ latin:keyWidth="13.250%p"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_number" />
+</Keyboard>
diff --git a/java/res/xml-ar/kbd_symbols_shift.xml b/java/res/xml-sw768dp-land/kbd_phone.xml
index 934e6f849..abe7e7c41 100644
--- a/java/res/xml-ar/kbd_symbols_shift.xml
+++ b/java/res/xml-sw768dp-land/kbd_phone.xml
@@ -20,8 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:isRtlKeyboard="true"
+ latin:keyboardHorizontalEdgesPadding="10%p"
+ latin:keyWidth="13.250%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_symbols_shift" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-sw768dp-land/kbd_phone_symbols.xml b/java/res/xml-sw768dp-land/kbd_phone_symbols.xml
new file mode 100644
index 000000000..641464dbe
--- /dev/null
+++ b/java/res/xml-sw768dp-land/kbd_phone_symbols.xml
@@ -0,0 +1,29 @@
+<?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.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardHorizontalEdgesPadding="10%p"
+ latin:keyWidth="13.250%p"
+>
+ <!-- Tablet doesn't have phone symbols keyboard -->
+ <include
+ latin:keyboardLayout="@xml/rows_phone" />
+</Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_mini_keyboard_template.xml b/java/res/xml-sw768dp/kbd_more_keys_keyboard_template.xml
index 409c60556..f89a0a673 100644
--- a/java/res/xml-sw768dp/kbd_mini_keyboard_template.xml
+++ b/java/res/xml-sw768dp/kbd_more_keys_keyboard_template.xml
@@ -21,6 +21,6 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="5.0%p"
latin:rowHeight="@dimen/popup_key_height"
- style="?attr/miniKeyboardStyle"
+ style="?attr/moreKeysKeyboardStyle"
>
</Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_number.xml b/java/res/xml-sw768dp/kbd_number.xml
index 369e91a77..b20123c80 100644
--- a/java/res/xml-sw768dp/kbd_number.xml
+++ b/java/res/xml-sw768dp/kbd_number.xml
@@ -23,206 +23,5 @@
latin:keyWidth="13.250%p"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
- <switch>
- <case
- latin:passwordInput="true"
- >
- <Row>
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="11.172%p" />
- <Key
- latin:keyStyle="num1KeyStyle"
- latin:keyXPos="32.076%p" />
- <Key
- latin:keyStyle="num2KeyStyle" />
- <Key
- latin:keyStyle="num3KeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.172%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="32.076%p" />
- <Key
- latin:keyStyle="num4KeyStyle" />
- <Key
- latin:keyStyle="num5KeyStyle" />
- <Key
- latin:keyStyle="num6KeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-11.172%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="32.076%p" />
- <Key
- latin:keyStyle="num7KeyStyle" />
- <Key
- latin:keyStyle="num8KeyStyle" />
- <Key
- latin:keyStyle="num9KeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- <Row>
- <Spacer
- latin:keyXPos="32.076%p" />
- <Key
- latin:keyStyle="num0KeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- </case>
- <!-- latin:passwordInput="false" -->
- <default>
- <Row>
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="11.172%p" />
- <Key
- latin:keyLabel="-"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="13.829%p"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="+"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="."
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="1"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyLabel="2"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="3"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.172%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="13.829%p" />
- <Key
- latin:keyStyle="numStarKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="/"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel=","
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="4"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyLabel="5"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="6"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-11.172%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="13.829%p" />
- <Key
- latin:keyLabel="("
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel=")"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="="
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="7"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyLabel="8"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="9"
- latin:keyStyle="numKeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- <Row>
- <switch>
- <case latin:hasSettingsKey="true">
- <Key
- latin:keyStyle="settingsKeyStyle"
- latin:keyWidth="8.047%p" />
- </case>
- <default>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="8.047%p" />
- </default>
- </switch>
- <Key
- latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
- latin:keyXPos="13.829%p"
- latin:keyWidth="24.140%p" />
- <Key
- latin:keyStyle="numStarKeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyLabel="0"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="#"
- latin:keyStyle="numKeyStyle" />
- <switch>
- <case
- latin:shortcutKeyEnabled="true"
- >
- <Key
- latin:keyStyle="shortcutKeyStyle"
- latin:keyXPos="-8.047%p"
- latin:keyWidth="fillRight" />
- </case>
- <default>
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </default>
- </switch>
- </Row>
- </default>
- </switch>
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_phone.xml b/java/res/xml-sw768dp/kbd_phone.xml
index e55b1841a..fa9bf1bf4 100644
--- a/java/res/xml-sw768dp/kbd_phone.xml
+++ b/java/res/xml-sw768dp/kbd_phone.xml
@@ -23,122 +23,5 @@
latin:keyWidth="13.250%p"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
- <Row>
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="11.172%p" />
- <Key
- latin:keyLabel="-"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="20.400%p"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="+"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyStyle="num1KeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyStyle="num2KeyStyle" />
- <Key
- latin:keyStyle="num3KeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.172%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="toMoreSymbolKeyStyle"
- latin:keyWidth="11.172%p" />
- <Key
- latin:keyLabel=","
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="20.400%p"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="."
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyStyle="num4KeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyStyle="num5KeyStyle" />
- <Key
- latin:keyStyle="num6KeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-11.172%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="20.400%p" />
- <Key
- latin:keyLabel="("
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel=")"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyStyle="num7KeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyStyle="num8KeyStyle" />
- <Key
- latin:keyStyle="num9KeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- <Row>
- <switch>
- <case latin:hasSettingsKey="true">
- <Key
- latin:keyStyle="settingsKeyStyle"
- latin:keyWidth="8.047%p" />
- </case>
- <default>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="8.047%p" />
- </default>
- </switch>
- <Key
- latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
- latin:keyXPos="20.400%p"
- latin:keyWidth="16.084%p" />
- <Key
- latin:keyStyle="numStarKeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyStyle="num0KeyStyle" />
- <Key
- latin:keyLabel="#"
- latin:keyStyle="numKeyStyle" />
- <switch>
- <case
- latin:shortcutKeyEnabled="true"
- >
- <Key
- latin:keyStyle="shortcutKeyStyle"
- latin:keyXPos="-8.047%p"
- latin:keyWidth="fillRight" />
- </case>
- <default>
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </default>
- </switch>
- </Row>
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-sw768dp/kbd_phone_symbols.xml
index 37a50fdfd..e1a359e84 100644
--- a/java/res/xml-da/kbd_qwerty.xml
+++ b/java/res/xml-sw768dp/kbd_phone_symbols.xml
@@ -20,8 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="da"
+ latin:keyWidth="13.250%p"
>
+ <!-- Tablet doesn't have phone symbols keyboard -->
<include
- latin:keyboardLayout="@xml/kbd_rows_scandinavian" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_row3_comma_period.xml b/java/res/xml-sw768dp/kbd_row3_comma_period.xml
deleted file mode 100644
index b84443078..000000000
--- a/java/res/xml-sw768dp/kbd_row3_comma_period.xml
+++ /dev/null
@@ -1,46 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- </case>
- <default>
- <Key
- latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="!"
- latin:moreKeys="!" />
- <Key
- latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
- </default>
- </switch>
-</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_arabic.xml b/java/res/xml-sw768dp/kbd_rows_arabic.xml
deleted file mode 100644
index 7ec36fd94..000000000
--- a/java/res/xml-sw768dp/kbd_rows_arabic.xml
+++ /dev/null
@@ -1,193 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="7.375%p"
- >
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="7.500%p" />
- <!-- \u0636: ARABIC LETTER DAD -->
- <Key
- latin:keyLabel="ض" />
- <!-- \u0635: ARABIC LETTER SAD -->
- <Key
- latin:keyLabel="ص" />
- <!-- \u062b: ARABIC LETTER THEH -->
- <Key
- latin:keyLabel="ث" />
- <!-- \u0642: ARABIC LETTER QAF
- \u06a8: ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
- <Key
- latin:keyLabel="ق"
- latin:moreKeys="ڨ" />
- <!-- \u0641: ARABIC LETTER FEH
- \u06a4: ARABIC LETTER VEH
- \u06a2: ARABIC LETTER FEH WITH DOT MOVED BELOW
- \u06a5: ARABIC LETTER FEH WITH THREE DOTS BELOW -->
- <Key
- latin:keyLabel="ف"
- latin:moreKeys="\u06a4,\u06a2,\u06a5" />
- <!-- \u063a: ARABIC LETTER GHAIN -->
- <Key
- latin:keyLabel="غ" />
- <!-- \u0639: ARABIC LETTER AIN -->
- <Key
- latin:keyLabel="ع" />
- <!-- \u0647: ARABIC LETTER HEH
- \ufeeb: ARABIC LETTER HEH INITIAL FORM
- \u0647\u0640: ARABIC LETTER HEH + Zero width joiner -->
- <Key
- latin:keyLabel="ه"
- latin:moreKeys="\ufeeb|\u0647\u200D" />
- <!-- \u062e: ARABIC LETTER KHAH -->
- <Key
- latin:keyLabel="خ" />
- <!-- \u062d: ARABIC LETTER HAH -->
- <Key
- latin:keyLabel="ح" />
- <!-- \u062c: ARABIC LETTER JEEM
- \u0686: ARABIC LETTER TCHEH -->
- <Key
- latin:keyLabel="ج"
- latin:moreKeys="چ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.500%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.375%p"
- >
- <Key
- latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="9.375%p" />
- <!-- \u0634: ARABIC LETTER SHEEN
- \u069c: ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
- <Key
- latin:keyLabel="ش"
- latin:moreKeys="ڜ" />
- <!-- \u0633: ARABIC LETTER SEEN -->
- <Key
- latin:keyLabel="س" />
- <!-- \u064a: ARABIC LETTER YEH
- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE
- \u0649: ARABIC LETTER ALEF MAKSURA -->
- <Key
- latin:keyLabel="ي"
- latin:moreKeys="\u0626,\u0649" />
- <!-- \u0628: ARABIC LETTER BEH
- \u067e: ARABIC LETTER PEH -->
- <Key
- latin:keyLabel="ب"
- latin:moreKeys="پ" />
- <!-- \u0644: ARABIC LETTER LAM
- \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
- \u0627: ARABIC LETTER ALEF
- \ufef7: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
- \ufef9: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
- \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
- \ufef5: ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
- \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
- <Key
- latin:keyLabel="ل"
- latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
- <!-- \u0627: ARABIC LETTER ALEF
- \u0621: ARABIC LETTER HAMZA
- \u0671: ARABIC LETTER ALEF WASLA
- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
- \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
- \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
- <Key
- latin:keyLabel="ا"
- latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
- <!-- \u062a: ARABIC LETTER TEH -->
- <Key
- latin:keyLabel="ت" />
- <!-- \u0646: ARABIC LETTER NOON -->
- <Key
- latin:keyLabel="ن" />
- <!-- \u0645: ARABIC LETTER MEEM -->
- <Key
- latin:keyLabel="م" />
- <!-- \u0643: ARABIC LETTER KAF
- \u06af: ARABIC LETTER GAF -->
- <Key
- latin:keyLabel="ك"
- latin:moreKeys="گ" />
- <!-- \u0637: ARABIC LETTER TAH -->
- <Key
- latin:keyLabel="ط" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-9.375%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.375%p"
- >
- <!-- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE -->
- <Key
- latin:keyLabel="ئ"
- latin:keyXPos="12.750%p" />
- <!-- \u0621: ARABIC LETTER HAMZA -->
- <Key
- latin:keyLabel="ء" />
- <!-- \u0624: ARABIC LETTER WAW WITH HAMZA ABOVE -->
- <Key
- latin:keyLabel="ؤ" />
- <!-- \u0631: ARABIC LETTER REH -->
- <Key
- latin:keyLabel="ر" />
- <!-- \u0630: ARABIC LETTER THAL -->
- <Key
- latin:keyLabel="ذ" />
- <!-- \u0649: ARABIC LETTER ALEF MAKSURA -->
- <Key
- latin:keyLabel="ى" />
- <!-- \u0629: ARABIC LETTER TEH MARBUTA -->
- <Key
- latin:keyLabel="ة" />
- <!-- \u0648: ARABIC LETTER WAW -->
- <Key
- latin:keyLabel="و" />
- <!-- \u0632: ARABIC LETTER ZAIN
- \u0698: ARABIC LETTER JEH -->
- <Key
- latin:keyLabel="ز"
- latin:moreKeys="ژ" />
- <!-- \u0638: ARABIC LETTER ZAH -->
- <Key
- latin:keyLabel="ظ" />
- <!-- \u062f: ARABIC LETTER DAL -->
- <Key
- latin:keyLabel="د" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_hebrew.xml b/java/res/xml-sw768dp/kbd_rows_hebrew.xml
deleted file mode 100644
index 27b39d1ae..000000000
--- a/java/res/xml-sw768dp/kbd_rows_hebrew.xml
+++ /dev/null
@@ -1,120 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="8.282%p"
- >
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="7.969%p" />
- <include
- latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
- <Key
- latin:keyLabel="ק" />
- <Key
- latin:keyLabel="ר" />
- <Key
- latin:keyLabel="א" />
- <Key
- latin:keyLabel="ט" />
- <Key
- latin:keyLabel="ו" />
- <Key
- latin:keyLabel="ן" />
- <Key
- latin:keyLabel="ם" />
- <Key
- latin:keyLabel="פ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-12.000%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="8.125%p"
- >
- <Key
- latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="11.172%p" />
- <Key
- latin:keyLabel="ש" />
- <Key
- latin:keyLabel="ד" />
- <Key
- latin:keyLabel="ג"
- latin:moreKeys="ג׳" />
- <Key
- latin:keyLabel="כ" />
- <Key
- latin:keyLabel="ע" />
- <Key
- latin:keyLabel="י"
- latin:moreKeys="ײַ" />
- <Key
- latin:keyLabel="ח"
- latin:moreKeys="ח׳" />
- <Key
- latin:keyLabel="ל" />
- <Key
- latin:keyLabel="ך" />
- <Key
- latin:keyLabel="ף" />
- </Row>
- <Row
- latin:keyWidth="8.047%p"
- >
- <Key
- latin:keyLabel="ז"
- latin:moreKeys="ז׳"
- latin:keyXPos="13.829%p" />
- <Key
- latin:keyLabel="ס" />
- <Key
- latin:keyLabel="ב" />
- <Key
- latin:keyLabel="ה" />
- <Key
- latin:keyLabel="נ" />
- <Key
- latin:keyLabel="מ" />
- <Key
- latin:keyLabel="צ"
- latin:moreKeys="צ׳" />
- <Key
- latin:keyLabel="ת"
- latin:moreKeys="ת׳" />
- <Key
- latin:keyLabel="ץ"
- latin:moreKeys="ץ׳" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-10.400%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_russian.xml b/java/res/xml-sw768dp/kbd_rows_russian.xml
deleted file mode 100644
index e5f556958..000000000
--- a/java/res/xml-sw768dp/kbd_rows_russian.xml
+++ /dev/null
@@ -1,127 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="7.125%p"
- >
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft" />
- <Key
- latin:keyLabel="й" />
- <Key
- latin:keyLabel="ц" />
- <Key
- latin:keyLabel="у" />
- <Key
- latin:keyLabel="к" />
- <Key
- latin:keyLabel="е"
- latin:moreKeys="@string/more_keys_for_cyrillic_e" />
- <Key
- latin:keyLabel="н" />
- <Key
- latin:keyLabel="г" />
- <Key
- latin:keyLabel="ш" />
- <Key
- latin:keyLabel="щ" />
- <Key
- latin:keyLabel="з" />
- <Key
- latin:keyLabel="х" />
- <Key
- latin:keyLabel="ъ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.125%p"
- >
- <Key
- latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="9.375%p" />
- <Key
- latin:keyLabel="ф" />
- <Key
- latin:keyLabel="ы" />
- <Key
- latin:keyLabel="в" />
- <Key
- latin:keyLabel="а" />
- <Key
- latin:keyLabel="п" />
- <Key
- latin:keyLabel="р" />
- <Key
- latin:keyLabel="о" />
- <Key
- latin:keyLabel="л" />
- <Key
- latin:keyLabel="д" />
- <Key
- latin:keyLabel="ж" />
- <Key
- latin:keyLabel="э" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-9.375%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.125%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="12.750%p" />
- <Key
- latin:keyLabel="я" />
- <Key
- latin:keyLabel="ч" />
- <Key
- latin:keyLabel="с" />
- <Key
- latin:keyLabel="м" />
- <Key
- latin:keyLabel="и" />
- <Key
- latin:keyLabel="т" />
- <Key
- latin:keyLabel="ь" />
- <Key
- latin:keyLabel="б" />
- <Key
- latin:keyLabel="ю" />
- <include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="fillBoth" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_serbian.xml b/java/res/xml-sw768dp/kbd_rows_serbian.xml
deleted file mode 100644
index c07176ef6..000000000
--- a/java/res/xml-sw768dp/kbd_rows_serbian.xml
+++ /dev/null
@@ -1,123 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="7.125%p"
- >
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft" />
- <Key
- latin:keyLabel="љ" />
- <Key
- latin:keyLabel="њ" />
- <Key
- latin:keyLabel="е" />
- <Key
- latin:keyLabel="р" />
- <Key
- latin:keyLabel="т" />
- <Key
- latin:keyLabel="з" />
- <Key
- latin:keyLabel="у" />
- <Key
- latin:keyLabel="и" />
- <Key
- latin:keyLabel="о" />
- <Key
- latin:keyLabel="п" />
- <Key
- latin:keyLabel="ш" />
- <Key
- latin:keyLabel="ђ" />
- <Key
- latin:keyLabel="ж"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="7.250%p"
- >
- <Key
- latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="11.172%p" />
- <Key
- latin:keyLabel="а" />
- <Key
- latin:keyLabel="с" />
- <Key
- latin:keyLabel="д" />
- <Key
- latin:keyLabel="ф" />
- <Key
- latin:keyLabel="г" />
- <Key
- latin:keyLabel="х" />
- <Key
- latin:keyLabel="ј" />
- <Key
- latin:keyLabel="к" />
- <Key
- latin:keyLabel="л" />
- <Key
- latin:keyLabel="ч" />
- <Key
- latin:keyLabel="ћ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.250%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="13.829%p" />
- <Key
- latin:keyLabel="ѕ" />
- <Key
- latin:keyLabel="џ" />
- <Key
- latin:keyLabel="ц" />
- <Key
- latin:keyLabel="в" />
- <Key
- latin:keyLabel="б" />
- <Key
- latin:keyLabel="н" />
- <Key
- latin:keyLabel="м" />
- <include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-13.750%p"
- latin:keyWidth="fillRight" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/key_styles_common.xml
index f16f5b6af..07bdd7b18 100644
--- a/java/res/xml-sw768dp/kbd_key_styles.xml
+++ b/java/res/xml-sw768dp/key_styles_common.xml
@@ -21,80 +21,125 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <key-style
- latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
- latin:keyIcon="iconShiftKey"
- latin:keyIconShifted="iconShiftedShiftKey"
- latin:backgroundType="sticky" />
+ <switch>
+ <case
+ latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+ >
+ <key-style
+ latin:styleName="hasShiftedLetterHintStyle"
+ latin:keyLabelFlags="hasShiftedLetterHint|shiftedLetterActivated" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="hasShiftedLetterHintStyle"
+ latin:keyLabelFlags="hasShiftedLetterHint" />
+ </default>
+ </switch>
+ <switch>
+ <case
+ latin:keyboardSetElement="alphabetManualShifted|alphabetAutomaticShifted"
+ >
+ <key-style
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKeyShifted"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOff" />
+ </case>
+ <case
+ latin:keyboardSetElement="alphabetShiftLocked|alphabetShiftLockShifted"
+ >
+ <key-style
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKeyShifted"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOn" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKey"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOff" />
+ </default>
+ </switch>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
- latin:backgroundType="functional"
- latin:isRepeatable="true" />
- <key-style
- latin:styleName="returnKeyStyle"
- latin:code="@integer/key_return"
- latin:keyIcon="iconReturnKey"
+ latin:keyActionFlags="isRepeatable|noKeyPreview"
latin:backgroundType="functional" />
+ <include
+ latin:keyboardLayout="@xml/key_styles_enter_tablet" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:code="@integer/key_space" />
+ latin:code="@integer/key_space"
+ latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="nonSpecialBackgroundSpaceKeyStyle"
- latin:code="@integer/key_space" />
+ latin:code="@integer/key_space"
+ latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="smileyKeyStyle"
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
- latin:keyLabelOption="hasPopupHint"
+ latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="@string/more_keys_for_smiley"
latin:maxMoreKeysColumn="5" />
<key-style
- latin:styleName="settingsKeyStyle"
- latin:code="@integer/key_settings"
- latin:keyIcon="iconSettingsKey"
- latin:backgroundType="functional" />
- <key-style
latin:styleName="shortcutKeyStyle"
latin:code="@integer/key_shortcut"
latin:keyIcon="iconShortcutKey"
+ latin:keyIconDisabled="iconDisabledShortcutKey"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
+ latin:backgroundType="functional" />
+ <key-style
+ latin:styleName="settingsKeyStyle"
+ latin:code="@integer/key_settings"
+ latin:keyIcon="iconSettingsKey"
+ latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:backgroundType="functional" />
<key-style
latin:styleName="tabKeyStyle"
latin:code="@integer/key_tab"
latin:keyLabel="@string/label_tab_key"
- latin:keyLabelOption="fontNormal"
+ latin:keyLabelFlags="fontNormal|preserveCase"
latin:backgroundType="functional" />
<key-style
latin:styleName="toSymbolKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
- latin:keyLabelOption="fontNormal"
+ latin:keyLabelFlags="fontNormal|preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toAlphaKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key"
- latin:keyLabelOption="fontNormal"
+ latin:keyLabelFlags="fontNormal|preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_more_symbol_for_tablet_key"
- latin:keyLabelOption="fontNormal"
+ latin:keyLabelFlags="fontNormal|preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_symbol_key"
- latin:keyLabelOption="fontNormal"
+ latin:keyLabelFlags="fontNormal|preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="comKeyStyle"
latin:keyLabel="@string/keylabel_for_popular_domain"
- latin:keyLabelOption="fontNormal|hasPopupHint"
+ latin:keyLabelFlags="fontNormal|hasPopupHint|preserveCase"
latin:keyOutputText="@string/keylabel_for_popular_domain"
latin:moreKeys="@string/more_keys_for_popular_domain" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw768dp/keys_apostrophe_dash.xml
index 9536e81da..a53c1e4ab 100644
--- a/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml
+++ b/java/res/xml-sw768dp/keys_apostrophe_dash.xml
@@ -33,16 +33,16 @@
>
<Key
latin:keyLabel="/"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
- latin:moreKeys=":" />
+ latin:moreKeys=":"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyLabel="@string/keylabel_for_apostrophe"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="@string/keyhintlabel_for_apostrophe"
- latin:moreKeys="@string/more_keys_for_apostrophe" />
+ latin:moreKeys="@string/more_keys_for_apostrophe"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
<switch>
@@ -55,9 +55,9 @@
<default>
<Key
latin:keyLabel="@string/keylabel_for_dash"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="@string/keyhintlabel_for_dash"
- latin:moreKeys="@string/more_keys_for_dash" />
+ latin:moreKeys="@string/more_keys_for_dash"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row1.xml b/java/res/xml-sw768dp/row_qwerty1.xml
index 14b8bddfb..f6600ad03 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row1.xml
+++ b/java/res/xml-sw768dp/row_qwerty1.xml
@@ -26,14 +26,12 @@
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="e"
latin:moreKeys="@string/more_keys_for_e" />
@@ -56,8 +54,7 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row2.xml b/java/res/xml-sw768dp/row_qwerty2.xml
index 2c312a328..d348041fd 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row2.xml
+++ b/java/res/xml-sw768dp/row_qwerty2.xml
@@ -26,7 +26,7 @@
>
<Key
latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="11.172%p"/>
<Key
latin:keyLabel="a"
@@ -53,7 +53,7 @@
latin:keyLabel="l"
latin:moreKeys="@string/more_keys_for_l" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row3.xml b/java/res/xml-sw768dp/row_qwerty3.xml
index f2f137ea9..e2bb2e546 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw768dp/row_qwerty3.xml
@@ -46,7 +46,7 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p"
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row4.xml b/java/res/xml-sw768dp/row_qwerty4.xml
index e35e47d83..84c4a37f0 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw768dp/row_qwerty4.xml
@@ -57,9 +57,9 @@
>
<Key
latin:keyLabel=":"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="+"
- latin:moreKeys="+" />
+ latin:moreKeys="+"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
@@ -76,9 +76,9 @@
<default>
<Key
latin:keyLabel="/"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="\@"
- latin:moreKeys="\@" />
+ latin:moreKeys="\@"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</default>
@@ -92,11 +92,11 @@
latin:languageCode="iw"
>
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
</case>
<default>
<include
- latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+ latin:keyboardLayout="@xml/keys_apostrophe_dash" />
</default>
</switch>
<switch>
diff --git a/java/res/xml-sw768dp/rows_arabic.xml b/java/res/xml-sw768dp/rows_arabic.xml
new file mode 100644
index 000000000..872021766
--- /dev/null
+++ b/java/res/xml-sw768dp/rows_arabic.xml
@@ -0,0 +1,197 @@
+<?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.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="7.375%p"
+ >
+ <Key
+ latin:keyStyle="tabKeyStyle"
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="7.500%p" />
+ <!-- \u0636: "ض" ARABIC LETTER DAD -->
+ <Key
+ latin:keyLabel="\u0636" />
+ <!-- \u0635: "ص" ARABIC LETTER SAD -->
+ <Key
+ latin:keyLabel="\u0635" />
+ <!-- \u062b: "ث" ARABIC LETTER THEH -->
+ <Key
+ latin:keyLabel="\u062b" />
+ <!-- \u0642: "ق" ARABIC LETTER QAF
+ \u06a8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u06a8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+ <Key
+ latin:keyLabel="\u0642"
+ latin:moreKeys="\u06a8" />
+ <!-- \u0641: "ف" ARABIC LETTER FEH
+ \u06a4: "ڤ" ARABIC LETTER VEH
+ \u06a2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
+ \u06a5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u06a2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u06a5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+ <Key
+ latin:keyLabel="\u0641"
+ latin:moreKeys="\u06a4,\u06a2,\u06a5" />
+ <!-- \u063a: "غ" ARABIC LETTER GHAIN -->
+ <Key
+ latin:keyLabel="\u063a" />
+ <!-- \u0639: "ع" ARABIC LETTER AIN -->
+ <Key
+ latin:keyLabel="\u0639" />
+ <!-- \u0647: "ه" ARABIC LETTER HEH
+ \ufeeb: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+ \u0647\u200d: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
+ <Key
+ latin:keyLabel="\u0647"
+ latin:moreKeys="\ufeeb|\u0647\u200d" />
+ <!-- \u062e: "خ" ARABIC LETTER KHAH -->
+ <Key
+ latin:keyLabel="\u062e" />
+ <!-- \u062d: "ح" ARABIC LETTER HAH -->
+ <Key
+ latin:keyLabel="\u062d" />
+ <!-- \u062c: "ج" ARABIC LETTER JEEM
+ \u0686: "چ" ARABIC LETTER TCHEH -->
+ <Key
+ latin:keyLabel="\u062c"
+ latin:moreKeys="\u0686" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-11.500%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.375%p"
+ >
+ <Key
+ latin:keyStyle="toSymbolKeyStyle"
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="9.375%p" />
+ <!-- \u0634: "ش" ARABIC LETTER SHEEN
+ \u069c: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u069c ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+ <Key
+ latin:keyLabel="\u0634"
+ latin:moreKeys="\u069c" />
+ <!-- \u0633: "س" ARABIC LETTER SEEN -->
+ <Key
+ latin:keyLabel="\u0633" />
+ <!-- \u064a: "ي" ARABIC LETTER YEH
+ \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+ \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+ <Key
+ latin:keyLabel="\u064a"
+ latin:moreKeys="\u0626,\u0649" />
+ <!-- \u0628: "ب" ARABIC LETTER BEH
+ \u067e: "پ" ARABIC LETTER PEH -->
+ <Key
+ latin:keyLabel="\u0628"
+ latin:moreKeys="\u067e" />
+ <!-- \u0644: "ل" ARABIC LETTER LAM
+ \ufefb: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+ \u0627: "ا" ARABIC LETTER ALEF
+ \ufef7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+ \u0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+ \ufef9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+ \u0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+ \ufef5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+ \u0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ <Key
+ latin:keyLabel="\u0644"
+ latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
+ <!-- \u0627: "ا" ARABIC LETTER ALEF
+ \u0621: "ء" ARABIC LETTER HAMZA
+ \u0671: "ٱ" ARABIC LETTER ALEF WASLA
+ \u0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+ \u0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+ \u0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ <Key
+ latin:keyLabel="\u0627"
+ latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
+ <!-- \u062a: "ت" ARABIC LETTER TEH -->
+ <Key
+ latin:keyLabel="\u062a" />
+ <!-- \u0646: "ن" ARABIC LETTER NOON -->
+ <Key
+ latin:keyLabel="\u0646" />
+ <!-- \u0645: "م" ARABIC LETTER MEEM -->
+ <Key
+ latin:keyLabel="\u0645" />
+ <!-- \u0643: "ك" ARABIC LETTER KAF
+ \u06af: "گ" ARABIC LETTER GAF -->
+ <Key
+ latin:keyLabel="\u0643"
+ latin:moreKeys="\u06af" />
+ <!-- \u0637: "ط" ARABIC LETTER TAH -->
+ <Key
+ latin:keyLabel="\u0637" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-9.375%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.375%p"
+ >
+ <!-- \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
+ <Key
+ latin:keyLabel="\u0626"
+ latin:keyXPos="12.750%p" />
+ <!-- \u0621: "ء" ARABIC LETTER HAMZA -->
+ <Key
+ latin:keyLabel="\u0621" />
+ <!-- \u0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
+ <Key
+ latin:keyLabel="\u0624" />
+ <!-- \u0631: "ر" ARABIC LETTER REH -->
+ <Key
+ latin:keyLabel="\u0631" />
+ <!-- \u0630: "ذ" ARABIC LETTER THAL -->
+ <Key
+ latin:keyLabel="\u0630" />
+ <!-- \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+ <Key
+ latin:keyLabel="\u0649" />
+ <!-- \u0629: "ة" ARABIC LETTER TEH MARBUTA -->
+ <Key
+ latin:keyLabel="\u0629" />
+ <!-- \u0648: "و" ARABIC LETTER WAW -->
+ <Key
+ latin:keyLabel="\u0648" />
+ <!-- \u0632: "ز" ARABIC LETTER ZAIN
+ \u0698: "ژ" ARABIC LETTER JEH -->
+ <Key
+ latin:keyLabel="\u0632"
+ latin:moreKeys="\u0698" />
+ <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
+ <Key
+ latin:keyLabel="\u0638" />
+ <!-- \u062f: "د" ARABIC LETTER DAL -->
+ <Key
+ latin:keyLabel="\u062f" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_azerty.xml b/java/res/xml-sw768dp/rows_azerty.xml
index 4659d9924..6023e984b 100644
--- a/java/res/xml-sw768dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw768dp/rows_azerty.xml
@@ -22,13 +22,13 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.282%p"
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<Key
latin:keyLabel="a"
@@ -58,8 +58,7 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
@@ -70,11 +69,10 @@
>
<Key
latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="10.167%p" />
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
latin:keyLabel="s"
latin:moreKeys="@string/more_keys_for_s" />
@@ -99,7 +97,7 @@
<Key
latin:keyLabel="m" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -110,8 +108,7 @@
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="13.829%p" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="x" />
<Key
@@ -127,36 +124,16 @@
latin:moreKeys="@string/more_keys_for_n" />
<Key
latin:keyLabel="\'"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
- latin:moreKeys=":" />
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- </case>
- <default>
- <Key
- latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="!"
- latin:moreKeys="!" />
- <Key
- latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
- </default>
- </switch>
+ latin:moreKeys=":"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/rows_bulgarian.xml b/java/res/xml-sw768dp/rows_bulgarian.xml
new file mode 100644
index 000000000..844744eee
--- /dev/null
+++ b/java/res/xml-sw768dp/rows_bulgarian.xml
@@ -0,0 +1,152 @@
+<?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"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="7.333%p"
+ >
+ <Key
+ latin:keyStyle="tabKeyStyle"
+ latin:keyLabelFlags="alignLeft" />
+ <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="\u0447" />
+ <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="\u0448" />
+ <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="\u0435" />
+ <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="\u0440" />
+ <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="\u0442" />
+ <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <Key
+ latin:keyLabel="\u044a" />
+ <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="\u0443" />
+ <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+ <Key
+ latin:keyLabel="\u0438"
+ latin:moreKeys="ѝ" />
+ <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="\u043e" />
+ <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="\u043f" />
+ <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+ <Key
+ latin:keyLabel="\u044f" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.194%p"
+ >
+ <Key
+ latin:keyStyle="toSymbolKeyStyle"
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="9.375%p" />
+ <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="\u0430" />
+ <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="\u0441" />
+ <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="\u0434" />
+ <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="\u0444" />
+ <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="\u0433" />
+ <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="\u0445" />
+ <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+ <Key
+ latin:keyLabel="\u0439" />
+ <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="\u043a" />
+ <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="\u043b" />
+ <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+ <Key
+ latin:keyLabel="\u0449" />
+ <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+ <Key
+ latin:keyLabel="\u044c" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.125%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="14.375%p" />
+ <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="\u0437" />
+ <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="\u0436" />
+ <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="\u0446" />
+ <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="\u0432" />
+ <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="\u0431" />
+ <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="\u043d" />
+ <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="\u043c" />
+ <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+ <Key
+ latin:keyLabel="\u044e" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw768dp/rows_hebrew.xml b/java/res/xml-sw768dp/rows_hebrew.xml
new file mode 100644
index 000000000..a2090ae48
--- /dev/null
+++ b/java/res/xml-sw768dp/rows_hebrew.xml
@@ -0,0 +1,147 @@
+<?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.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="8.282%p"
+ >
+ <Key
+ latin:keyStyle="tabKeyStyle"
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="7.969%p" />
+ <include
+ latin:keyboardLayout="@xml/keys_apostrophe_dash" />
+ <!-- \u05e7: "ק" HEBREW LETTER QOF -->
+ <Key
+ latin:keyLabel="\u05e7" />
+ <!-- \u05e8: "ר" HEBREW LETTER RESH -->
+ <Key
+ latin:keyLabel="\u05e8" />
+ <!-- \u05d0: "א" HEBREW LETTER ALEF -->
+ <Key
+ latin:keyLabel="\u05d0" />
+ <!-- \u05d8: "ט" HEBREW LETTER TET -->
+ <Key
+ latin:keyLabel="\u05d8" />
+ <!-- \u05d5: "ו" HEBREW LETTER VAV -->
+ <Key
+ latin:keyLabel="\u05d5" />
+ <!-- \u05df: "ן" HEBREW LETTER FINAL NUN -->
+ <Key
+ latin:keyLabel="\u05df" />
+ <!-- \u05dd: "ם" HEBREW LETTER FINAL MEM -->
+ <Key
+ latin:keyLabel="\u05dd" />
+ <!-- \u05e4: "פ" HEBREW LETTER PE -->
+ <Key
+ latin:keyLabel="\u05e4" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-12.000%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="8.125%p"
+ >
+ <Key
+ latin:keyStyle="toSymbolKeyStyle"
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="11.172%p" />
+ <!-- \u05e9: "ש" HEBREW LETTER SHIN -->
+ <Key
+ latin:keyLabel="\u05e9" />
+ <!-- \u05d3: "ד" HEBREW LETTER DALET -->
+ <Key
+ latin:keyLabel="\u05d3" />
+ <!-- \u05d2: "ג" HEBREW LETTER GIMEL -->
+ <Key
+ latin:keyLabel="\u05d2"
+ latin:moreKeys="ג׳" />
+ <!-- \u05db: "כ" HEBREW LETTER KAF -->
+ <Key
+ latin:keyLabel="\u05db" />
+ <!-- \u05e2: "ע" HEBREW LETTER AYIN -->
+ <Key
+ latin:keyLabel="\u05e2" />
+ <!-- \u05d9: "י" HEBREW LETTER YOD -->
+ <Key
+ latin:keyLabel="\u05d9"
+ latin:moreKeys="ײַ" />
+ <!-- \u05d7: "ח" HEBREW LETTER HET -->
+ <Key
+ latin:keyLabel="\u05d7"
+ latin:moreKeys="ח׳" />
+ <!-- \u05dc: "ל" HEBREW LETTER LAMED -->
+ <Key
+ latin:keyLabel="\u05dc" />
+ <!-- \u05da: "ך" HEBREW LETTER FINAL KAF -->
+ <Key
+ latin:keyLabel="\u05da" />
+ <!-- \u05e3: "ף" HEBREW LETTER FINAL PE -->
+ <Key
+ latin:keyLabel="\u05e3" />
+ </Row>
+ <Row
+ latin:keyWidth="8.047%p"
+ >
+ <!-- \u05d6: "ז" HEBREW LETTER ZAYIN -->
+ <Key
+ latin:keyLabel="\u05d6"
+ latin:moreKeys="ז׳"
+ latin:keyXPos="13.829%p" />
+ <!-- \u05e1: "ס" HEBREW LETTER SAMEKH -->
+ <Key
+ latin:keyLabel="\u05e1" />
+ <!-- \u05d1: "ב" HEBREW LETTER BET -->
+ <Key
+ latin:keyLabel="\u05d1" />
+ <!-- \u05d4: "ה" HEBREW LETTER HE -->
+ <Key
+ latin:keyLabel="\u05d4" />
+ <!-- \u05e0: "נ" HEBREW LETTER NUN -->
+ <Key
+ latin:keyLabel="\u05e0" />
+ <!-- \u05de: "מ" HEBREW LETTER MEM -->
+ <Key
+ latin:keyLabel="\u05de" />
+ <!-- \u05e6: "צ" HEBREW LETTER TSADI -->
+ <Key
+ latin:keyLabel="\u05e6"
+ latin:moreKeys="צ׳" />
+ <!-- \u05ea: "ת" HEBREW LETTER TAV -->
+ <Key
+ latin:keyLabel="\u05ea"
+ latin:moreKeys="ת׳" />
+ <!-- \u05e5: "ץ" HEBREW LETTER FINAL TSADI -->
+ <Key
+ latin:keyLabel="\u05e5"
+ latin:moreKeys="ץ׳" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-10.400%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw768dp/rows_number_normal.xml b/java/res/xml-sw768dp/rows_number_normal.xml
new file mode 100644
index 000000000..cf947abd2
--- /dev/null
+++ b/java/res/xml-sw768dp/rows_number_normal.xml
@@ -0,0 +1,159 @@
+<?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"
+>
+ <Row>
+ <Key
+ latin:keyStyle="tabKeyStyle"
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="11.172%p" />
+ <Key
+ latin:keyLabel="-"
+ latin:keyStyle="numKeyStyle"
+ latin:keyXPos="13.829%p"
+ latin:keyWidth="8.047%p" />
+ <Key
+ latin:keyLabel="+"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
+ latin:keyLabel="."
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
+ latin:keyLabel="1"
+ latin:keyStyle="numKeyStyle"
+ latin:keyXPos="43.125%p" />
+ <Key
+ latin:keyLabel="2"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="3"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-11.172%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="13.829%p" />
+ <Key
+ latin:keyStyle="numStarKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
+ latin:keyLabel="/"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
+ latin:keyLabel=","
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
+ latin:keyLabel="4"
+ latin:keyStyle="numKeyStyle"
+ latin:keyXPos="43.125%p" />
+ <Key
+ latin:keyLabel="5"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="6"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-11.172%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="13.829%p" />
+ <Key
+ latin:keyLabel="("
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
+ latin:keyLabel=")"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
+ latin:keyLabel="="
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
+ latin:keyLabel="7"
+ latin:keyStyle="numKeyStyle"
+ latin:keyXPos="43.125%p" />
+ <Key
+ latin:keyLabel="8"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="9"
+ latin:keyStyle="numKeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
+ </Row>
+ <Row>
+ <switch>
+ <case latin:hasSettingsKey="true">
+ <Key
+ latin:keyStyle="settingsKeyStyle"
+ latin:keyWidth="8.047%p" />
+ </case>
+ <default>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="8.047%p" />
+ </default>
+ </switch>
+ <Key
+ latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
+ latin:keyXPos="13.829%p"
+ latin:keyWidth="24.140%p" />
+ <Key
+ latin:keyStyle="numStarKeyStyle"
+ latin:keyXPos="43.125%p" />
+ <Key
+ latin:keyLabel="0"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="#"
+ latin:keyStyle="numKeyStyle" />
+ <switch>
+ <case
+ latin:shortcutKeyEnabled="true"
+ >
+ <Key
+ latin:keyStyle="shortcutKeyStyle"
+ latin:keyXPos="-8.047%p"
+ latin:keyWidth="fillRight" />
+ </case>
+ <default>
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
+ </default>
+ </switch>
+ </Row>
+</merge>
diff --git a/java/res/xml-sw768dp/rows_number_password.xml b/java/res/xml-sw768dp/rows_number_password.xml
new file mode 100644
index 000000000..8acfac6ff
--- /dev/null
+++ b/java/res/xml-sw768dp/rows_number_password.xml
@@ -0,0 +1,79 @@
+<?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"
+>
+ <Row>
+ <Key
+ latin:keyStyle="numTabKeyStyle"
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="11.172%p" />
+ <Key
+ latin:keyStyle="num1KeyStyle"
+ latin:keyXPos="32.076%p" />
+ <Key
+ latin:keyStyle="num2KeyStyle" />
+ <Key
+ latin:keyStyle="num3KeyStyle" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-11.172%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="32.076%p" />
+ <Key
+ latin:keyStyle="num4KeyStyle" />
+ <Key
+ latin:keyStyle="num5KeyStyle" />
+ <Key
+ latin:keyStyle="num6KeyStyle" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-11.172%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="32.076%p" />
+ <Key
+ latin:keyStyle="num7KeyStyle" />
+ <Key
+ latin:keyStyle="num8KeyStyle" />
+ <Key
+ latin:keyStyle="num9KeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
+ </Row>
+ <Row>
+ <Spacer
+ latin:keyXPos="32.076%p" />
+ <Key
+ latin:keyStyle="num0KeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
+ </Row>
+</merge>
diff --git a/java/res/xml-sw768dp/kbd_phone_shift.xml b/java/res/xml-sw768dp/rows_phone.xml
index 46f67d311..0404bb1fb 100644
--- a/java/res/xml-sw768dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw768dp/rows_phone.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2010, 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,18 +18,17 @@
*/
-->
-<Keyboard
+<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="13.250%p"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<Key
- latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyStyle="numTabKeyStyle"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="11.172%p" />
<Key
latin:keyLabel="-"
@@ -41,9 +40,7 @@
latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
- latin:code="44"
- latin:keyLabel="@string/label_pause_key"
- latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"
+ latin:keyStyle="numPauseKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyStyle="num1KeyStyle"
@@ -58,9 +55,9 @@
latin:keyWidth="fillRight" />
</Row>
<Row>
- <Key
- latin:keyStyle="backFromMoreSymbolKeyStyle"
- latin:keyWidth="11.172%p" />
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="13.829%p" />
<Key
latin:keyLabel=","
latin:keyStyle="numKeyStyle"
@@ -71,9 +68,7 @@
latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
- latin:code="59"
- latin:keyLabel="@string/label_wait_key"
- latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"
+ latin:keyStyle="numWaitKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyStyle="num4KeyStyle"
@@ -83,7 +78,7 @@
<Key
latin:keyStyle="num6KeyStyle" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-11.172%p"
latin:keyWidth="fillRight" />
</Row>
@@ -155,4 +150,4 @@
</default>
</switch>
</Row>
-</Keyboard>
+</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_qwerty.xml b/java/res/xml-sw768dp/rows_qwerty.xml
index 6237712f6..71be44e31 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwerty.xml
+++ b/java/res/xml-sw768dp/rows_qwerty.xml
@@ -22,13 +22,13 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_qwertz.xml b/java/res/xml-sw768dp/rows_qwertz.xml
index 82e0dd09c..7056a94ea 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw768dp/rows_qwertz.xml
@@ -22,20 +22,18 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.282%p"
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="e"
latin:moreKeys="@string/more_keys_for_e" />
@@ -58,15 +56,14 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<Row
latin:keyWidth="8.047%p"
>
@@ -91,33 +88,13 @@
latin:moreKeys="@string/more_keys_for_n" />
<Key
latin:keyLabel="m" />
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- </case>
- <default>
- <Key
- latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="!"
- latin:moreKeys="!" />
- <Key
- latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
- </default>
- </switch>
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml b/java/res/xml-sw768dp/rows_scandinavian.xml
index b9d168036..437316699 100644
--- a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw768dp/rows_scandinavian.xml
@@ -22,20 +22,18 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.375%p"
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.500%p" />
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="e"
latin:moreKeys="@string/more_keys_for_e" />
@@ -58,10 +56,9 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
- latin:keyLabel="å" />
+ latin:keyLabel="@string/keylabel_for_scandinavia_row1_11" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.500%p"
@@ -72,7 +69,7 @@
>
<Key
latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="9.375%p" />
<Key
latin:keyLabel="a"
@@ -105,7 +102,7 @@
latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
latin:moreKeys="@string/more_keys_for_scandinavia_row2_11" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-9.375%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -134,12 +131,12 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-12.750%p"
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/rows_serbian.xml b/java/res/xml-sw768dp/rows_serbian.xml
new file mode 100644
index 000000000..89556ddbd
--- /dev/null
+++ b/java/res/xml-sw768dp/rows_serbian.xml
@@ -0,0 +1,154 @@
+<?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.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="7.125%p"
+ >
+ <Key
+ latin:keyStyle="tabKeyStyle"
+ latin:keyLabelFlags="alignLeft" />
+ <!-- \u0459: "љ" CYRILLIC SMALL LETTER LJE -->
+ <Key
+ latin:keyLabel="\u0459" />
+ <!-- \u045a: "њ" CYRILLIC SMALL LETTER NJE -->
+ <Key
+ latin:keyLabel="\u045a" />
+ <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="\u0435" />
+ <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="\u0440" />
+ <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="\u0442" />
+ <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="\u0437" />
+ <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="\u0443" />
+ <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+ <Key
+ latin:keyLabel="\u0438" />
+ <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="\u043e" />
+ <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="\u043f" />
+ <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="\u0448" />
+ <!-- \u0452: "ђ" CYRILLIC SMALL LETTER DJE -->
+ <Key
+ latin:keyLabel="\u0452" />
+ <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="\u0436"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="7.250%p"
+ >
+ <Key
+ latin:keyStyle="toSymbolKeyStyle"
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="11.172%p" />
+ <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="\u0430" />
+ <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="\u0441" />
+ <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="\u0434" />
+ <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="\u0444" />
+ <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="\u0433" />
+ <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="\u0445" />
+ <!-- \u0458: "ј" CYRILLIC SMALL LETTER JE -->
+ <Key
+ latin:keyLabel="\u0458" />
+ <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="\u043a" />
+ <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="\u043b" />
+ <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="\u0447" />
+ <!-- \u045b: "ћ" CYRILLIC SMALL LETTER TSHE -->
+ <Key
+ latin:keyLabel="\u045b" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-9.219%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.250%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="13.829%p" />
+ <!-- \u0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
+ <Key
+ latin:keyLabel="\u0455" />
+ <!-- \u045f: "џ" CYRILLIC SMALL LETTER DZHE -->
+ <Key
+ latin:keyLabel="\u045f" />
+ <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="\u0446" />
+ <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="\u0432" />
+ <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="\u0431" />
+ <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="\u043d" />
+ <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="\u043c" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-13.750%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw768dp/rows_slavic.xml b/java/res/xml-sw768dp/rows_slavic.xml
new file mode 100644
index 000000000..deca884d2
--- /dev/null
+++ b/java/res/xml-sw768dp/rows_slavic.xml
@@ -0,0 +1,160 @@
+<?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.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="7.125%p"
+ >
+ <Key
+ latin:keyStyle="tabKeyStyle"
+ latin:keyLabelFlags="alignLeft" />
+ <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+ <Key
+ latin:keyLabel="\u0439" />
+ <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="\u0446" />
+ <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="\u0443"
+ latin:moreKeys="@string/more_keys_for_slavic_u" />
+ <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="\u043a" />
+ <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="\u0435"
+ latin:moreKeys="@string/more_keys_for_slavic_ye" />
+ <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="\u043d"
+ latin:moreKeys="@string/more_keys_for_slavic_en" />
+ <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="\u0433" />
+ <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="\u0448" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_shcha" />
+ <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="\u0437" />
+ <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="\u0445" />
+ <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <Key
+ latin:keyLabel="\u044a" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.125%p"
+ >
+ <Key
+ latin:keyStyle="toSymbolKeyStyle"
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="9.375%p" />
+ <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="\u0444" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_yery"
+ latin:moreKeys="@string/more_keys_for_slavic_yery" />
+ <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="\u0432" />
+ <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="\u0430" />
+ <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="\u043f" />
+ <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="\u0440" />
+ <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="\u043e"
+ latin:moreKeys="@string/more_keys_for_slavic_o" />
+ <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="\u043b" />
+ <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="\u0434" />
+ <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="\u0436" />
+ <!-- \u044d: "э" CYRILLIC SMALL LETTER E -->
+ <Key
+ latin:keyLabel="\u044d" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-9.375%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.125%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="12.750%p" />
+ <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+ <Key
+ latin:keyLabel="\u044f" />
+ <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="\u0447" />
+ <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="\u0441" />
+ <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="\u043c" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_i" />
+ <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="\u0442" />
+ <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+ <Key
+ latin:keyLabel="\u044c" />
+ <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="\u0431" />
+ <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+ <Key
+ latin:keyLabel="\u044e" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_spanish.xml b/java/res/xml-sw768dp/rows_spanish.xml
index c737f400a..210c38d86 100644
--- a/java/res/xml-sw768dp/kbd_rows_spanish.xml
+++ b/java/res/xml-sw768dp/rows_spanish.xml
@@ -22,15 +22,15 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<Row
latin:keyWidth="8.125%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="10.167%p" />
<Key
latin:keyLabel="a"
@@ -56,15 +56,16 @@
<Key
latin:keyLabel="l"
latin:moreKeys="@string/more_keys_for_l" />
+ <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
<Key
- latin:keyLabel="ñ" />
+ latin:keyLabel="\u00f1" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_symbols.xml b/java/res/xml-sw768dp/rows_symbols.xml
index 987b10cdc..c199ae404 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw768dp/rows_symbols.xml
@@ -22,45 +22,55 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="8.282%p"
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_1"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_1"
latin:moreKeys="@string/more_keys_for_symbols_1" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_2"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_2"
latin:moreKeys="@string/more_keys_for_symbols_2" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_3"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_3"
latin:moreKeys="@string/more_keys_for_symbols_3" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_4"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_4"
latin:moreKeys="@string/more_keys_for_symbols_4" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_5"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_5"
latin:moreKeys="@string/more_keys_for_symbols_5" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_6"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_6"
latin:moreKeys="@string/more_keys_for_symbols_6" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_7"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_7"
latin:moreKeys="@string/more_keys_for_symbols_7" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_8"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_8"
latin:moreKeys="@string/more_keys_for_symbols_8" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_9"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_9"
latin:moreKeys="@string/more_keys_for_symbols_9" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_0"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_0"
latin:moreKeys="@string/more_keys_for_symbols_0" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -72,7 +82,7 @@
>
<Key
latin:keyStyle="toAlphaKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="11.172%p" />
<Key
latin:keyLabel="#" />
@@ -92,14 +102,10 @@
<Key
latin:keyLabel="+"
latin:moreKeys="@string/more_keys_for_plus" />
+ <include
+ latin:keyboardLayout="@xml/keys_parentheses" />
<Key
- latin:keyLabel="("
- latin:moreKeys="[,{,&lt;" />
- <Key
- latin:keyLabel=")"
- latin:moreKeys="],},&gt;" />
- <Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -109,12 +115,8 @@
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="13.829%p" />
- <Key
- latin:keyLabel="&lt;"
- latin:moreKeys="≤,«,‹" />
- <Key
- latin:keyLabel="&gt;"
- latin:moreKeys="≥,»,›" />
+ <include
+ latin:keyboardLayout="@xml/keys_less_greater" />
<Key
latin:keyLabel="="
latin:moreKeys="≠,≈" />
@@ -123,8 +125,7 @@
latin:mode="url"
>
<Key
- latin:keyLabel="\'"
- latin:moreKeys="‘,’,‚,‛" />
+ latin:keyLabel="\'" />
</case>
<default>
<Key
@@ -171,11 +172,10 @@
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="31.250%p"
latin:keyWidth="37.500%p" />
- <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
- <!-- latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛" -->
<Key
latin:keyLabel="&quot;"
- latin:moreKeys="“,”,«,»,‘,’,‚,‛" />
+ latin:moreKeys="@string/more_keys_for_tablet_double_quote"
+ latin:maxMoreKeysColumn="4" />
<Key
latin:keyLabel="_" />
<switch>
diff --git a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw768dp/rows_symbols_shift.xml
index 9a9c3a276..ced62f383 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw768dp/rows_symbols_shift.xml
@@ -22,15 +22,15 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="8.282%p"
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<Key
latin:keyLabel="~" />
@@ -38,23 +38,32 @@
latin:keyLabel="`" />
<Key
latin:keyLabel="|" />
+ <!-- \u2022: "•" BULLET -->
<Key
- latin:keyLabel="•"
+ latin:keyLabel="\u2022"
latin:moreKeys="@string/more_keys_for_bullet" />
+ <!-- \u221a: "√" SQUARE ROOT -->
<Key
- latin:keyLabel="√" />
+ latin:keyLabel="\u221a" />
+ <!-- \u03c0: "π" GREEK SMALL LETTER PI
+ \u03a0: "Π" GREEK CAPITAL LETTER PI -->
<Key
- latin:keyLabel="π"
- latin:moreKeys="Π" />
+ latin:keyLabel="\u03c0"
+ latin:moreKeys="\u03a0" />
+ <!-- \u00f7: "÷" DIVISION SIGN -->
<Key
- latin:keyLabel="÷" />
+ latin:keyLabel="\u00f7" />
+ <!-- \u00d7: "×" MULTIPLICATION SIGN -->
<Key
- latin:keyLabel="×" />
+ latin:keyLabel="\u00d7" />
+ <!-- \u00a7: "§" SECTION SIGN
+ \u00b6: "¶" PILCROW SIGN -->
<Key
- latin:keyLabel="§"
- latin:moreKeys="¶" />
+ latin:keyLabel="\u00a7"
+ latin:moreKeys="\u00b6" />
+ <!-- \u0394: "Δ" GREEK CAPITAL LETTER DELTA -->
<Key
- latin:keyLabel="Δ" />
+ latin:keyLabel="\u0394" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
@@ -65,7 +74,7 @@
>
<Key
latin:keyStyle="toAlphaKeyStyle"
- latin:keyLabelOption="alignLeft"
+ latin:keyLabelFlags="alignLeft"
latin:keyWidth="11.172%p" />
<Key
latin:keyStyle="moreCurrency1KeyStyle" />
@@ -75,21 +84,28 @@
latin:keyStyle="moreCurrency3KeyStyle" />
<Key
latin:keyStyle="moreCurrency4KeyStyle" />
+ <!-- \u2191: "↑" UPWARDS ARROW
+ \u2193: "↓" DOWNWARDS ARROW
+ \u2190: "←" LEFTWARDS ARROW
+ \u2192: "→" RIGHTWARDS ARROW -->
<Key
latin:keyLabel="^"
- latin:moreKeys="↑,↓,←,→" />
- <Key
- latin:keyLabel="°"
- latin:moreKeys="′,″" />
- <Key
- latin:keyLabel="±"
- latin:moreKeys="∞" />
- <Key
- latin:keyLabel="{" />
- <Key
- latin:keyLabel="}" />
- <Key
- latin:keyStyle="returnKeyStyle"
+ latin:moreKeys="\u2191,\u2193,\u2190,\u2192" />
+ <!-- \u00b0: "°" DEGREE SIGN
+ \u2032: "′" PRIME
+ \u2033: "″" DOUBLE PRIME -->
+ <Key
+ latin:keyLabel="\u00b0"
+ latin:moreKeys="\u2032,\u2033" />
+ <!-- \u00b1: "±" PLUS-MINUS SIGN
+ \u221e: "∞" INFINITY -->
+ <Key
+ latin:keyLabel="\u00b1"
+ latin:moreKeys="\u221e" />
+ <include
+ latin:keyboardLayout="@xml/keys_curly_brackets" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -101,22 +117,26 @@
latin:keyWidth="13.829%p" />
<Key
latin:keyLabel="\\" />
+ <!-- \u00a9: "©" COPYRIGHT SIGN -->
<Key
- latin:keyLabel="©" />
- <Key
- latin:keyLabel="®" />
- <Key
- latin:keyLabel="™" />
+ latin:keyLabel="\u00a9" />
+ <!-- \u00ae: "®" REGISTERED SIGN -->
<Key
- latin:keyLabel="℅" />
+ latin:keyLabel="\u00ae" />
+ <!-- \u2122: "™" TRADE MARK SIGN -->
<Key
- latin:keyLabel="[" />
+ latin:keyLabel="\u2122" />
+ <!-- \u2105: "℅" CARE OF -->
<Key
- latin:keyLabel="]" />
+ latin:keyLabel="\u2105" />
+ <include
+ latin:keyboardLayout="@xml/keys_square_brackets" />
+ <!-- \u00a1: "¡" INVERTED EXCLAMATION MARK -->
<Key
- latin:keyLabel="¡" />
+ latin:keyLabel="\u00a1" />
+ <!-- \u00bf: "¿" INVERTED QUESTION MARK -->
<Key
- latin:keyLabel="¿" />
+ latin:keyLabel="\u00bf" />
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyXPos="-13.750%p"
diff --git a/java/res/xml-tr/kbd_qwerty.xml b/java/res/xml-tr/kbd_qwerty.xml
deleted file mode 100644
index d2c38f60a..000000000
--- a/java/res/xml-tr/kbd_qwerty.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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="tr"
->
- <include
- latin:keyboardLayout="@xml/kbd_rows_qwerty" />
-</Keyboard>
diff --git a/java/res/xml-tr/keyboard_set.xml b/java/res/xml-tr/keyboard_set.xml
new file mode 100644
index 000000000..da79758ec
--- /dev/null
+++ b/java/res/xml-tr/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="tr">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-uk/keyboard_set.xml b/java/res/xml-uk/keyboard_set.xml
new file mode 100644
index 000000000..8eb9eccb7
--- /dev/null
+++ b/java/res/xml-uk/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="uk">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_slavic" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-vi/keyboard_set.xml b/java/res/xml-vi/keyboard_set.xml
new file mode 100644
index 000000000..6d38eb1b4
--- /dev/null
+++ b/java/res/xml-vi/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="vi">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-de-rZZ/kbd_qwerty.xml b/java/res/xml/kbd_arabic.xml
index d5fd8ef7a..ce5f30b2f 100644
--- a/java/res/xml-de-rZZ/kbd_qwerty.xml
+++ b/java/res/xml/kbd_arabic.xml
@@ -20,8 +20,7 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="de"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_qwerty" />
+ latin:keyboardLayout="@xml/rows_arabic" />
</Keyboard>
diff --git a/java/res/xml-pl/kbd_qwerty.xml b/java/res/xml/kbd_azerty.xml
index 44312c52c..7bafe5bca 100644
--- a/java/res/xml-pl/kbd_qwerty.xml
+++ b/java/res/xml/kbd_azerty.xml
@@ -20,8 +20,7 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="pl"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_qwerty" />
+ latin:keyboardLayout="@xml/rows_azerty" />
</Keyboard>
diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml/kbd_bulgarian.xml
index 8c730a24f..a651991c0 100644
--- a/java/res/xml-fr/kbd_qwerty.xml
+++ b/java/res/xml/kbd_bulgarian.xml
@@ -2,9 +2,9 @@
<!--
/*
**
-** Copyright 2008, The Android Open Source Project
+** Copyright 2012, The Android Open Source Project
**
-** Licensed under the Apache License, Version 2.0 (the "License");
+** 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
**
@@ -20,8 +20,7 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="fr"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_azerty" />
+ latin:keyboardLayout="@xml/rows_bulgarian" />
</Keyboard>
diff --git a/java/res/xml-hu/kbd_qwerty.xml b/java/res/xml/kbd_hebrew.xml
index 3195d5b1f..74836f342 100644
--- a/java/res/xml-hu/kbd_qwerty.xml
+++ b/java/res/xml/kbd_hebrew.xml
@@ -20,8 +20,7 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="hu"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_qwertz" />
+ latin:keyboardLayout="@xml/rows_hebrew" />
</Keyboard>
diff --git a/java/res/xml/kbd_mini_keyboard_template.xml b/java/res/xml/kbd_more_keys_keyboard_template.xml
index ad6cf51fe..8e977c5ad 100644
--- a/java/res/xml/kbd_mini_keyboard_template.xml
+++ b/java/res/xml/kbd_more_keys_keyboard_template.xml
@@ -21,6 +21,6 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="10%p"
latin:rowHeight="@dimen/popup_key_height"
- style="?attr/miniKeyboardStyle"
+ style="?attr/moreKeysKeyboardStyle"
>
</Keyboard>
diff --git a/java/res/xml/kbd_number.xml b/java/res/xml/kbd_number.xml
index 38dd6bf62..8b0deea97 100644
--- a/java/res/xml/kbd_number.xml
+++ b/java/res/xml/kbd_number.xml
@@ -23,5 +23,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_number" />
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index b550f17c5..91637b62c 100644
--- a/java/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
@@ -23,5 +23,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml/kbd_phone_shift.xml b/java/res/xml/kbd_phone_symbols.xml
index eea823fc0..7f59a855a 100644
--- a/java/res/xml/kbd_phone_shift.xml
+++ b/java/res/xml/kbd_phone_symbols.xml
@@ -23,5 +23,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+ latin:keyboardLayout="@xml/rows_phone_symbols" />
</Keyboard>
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index 40917b921..2f49b943a 100644
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -20,8 +20,7 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="en_GB,en_US"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_qwerty" />
+ latin:keyboardLayout="@xml/rows_qwerty" />
</Keyboard>
diff --git a/java/res/xml-cs/kbd_qwerty.xml b/java/res/xml/kbd_qwertz.xml
index 9991ea2d2..9f7e9019c 100644
--- a/java/res/xml-cs/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwertz.xml
@@ -20,8 +20,7 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyboardLocale="cs"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_qwertz" />
+ latin:keyboardLayout="@xml/rows_qwertz" />
</Keyboard>
diff --git a/java/res/xml/kbd_rows_arabic.xml b/java/res/xml/kbd_rows_arabic.xml
deleted file mode 100644
index dd5123e4c..000000000
--- a/java/res/xml/kbd_rows_arabic.xml
+++ /dev/null
@@ -1,189 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="10%p"
- >
- <!-- \u0636: ARABIC LETTER DAD -->
- <Key
- latin:keyLabel="ض"
- latin:keyHintLabel="1"
- latin:moreKeys="1,١" />
- <!-- \u0635: ARABIC LETTER SAD -->
- <Key
- latin:keyLabel="ص"
- latin:keyHintLabel="2"
- latin:moreKeys="2,٢" />
- <!-- \u0642: ARABIC LETTER QAF
- \u06a8: ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
- <Key
- latin:keyLabel="ق"
- latin:keyHintLabel="3"
- latin:moreKeys="3,٣,\u06a8" />
- <!-- \u0641: ARABIC LETTER FEH
- \u06a4: ARABIC LETTER VEH
- \u06a2: ARABIC LETTER FEH WITH DOT MOVED BELOW
- \u06a5: ARABIC LETTER FEH WITH THREE DOTS BELOW -->
- <Key
- latin:keyLabel="ف"
- latin:keyHintLabel="4"
- latin:moreKeys="4,٤,\u06a4,\u06a2,\u06a5" />
- <!-- \u063a: ARABIC LETTER GHAIN -->
- <Key
- latin:keyLabel="غ"
- latin:keyHintLabel="5"
- latin:moreKeys="5,٥" />
- <!-- \u0639: ARABIC LETTER AIN -->
- <Key
- latin:keyLabel="ع"
- latin:keyHintLabel="6"
- latin:moreKeys="6,٦" />
- <!-- \u0647: ARABIC LETTER HEH
- \ufeeb: ARABIC LETTER HEH INITIAL FORM
- \u0647\u0640: ARABIC LETTER HEH + Zero width joiner -->
- <Key
- latin:keyLabel="ه"
- latin:keyHintLabel="7"
- latin:moreKeys="7,٧,\ufeeb|\u0647\u200D" />
- <!-- \u062e: ARABIC LETTER KHAH -->
- <Key
- latin:keyLabel="خ"
- latin:keyHintLabel="8"
- latin:moreKeys="8,٨" />
- <!-- \u062d: ARABIC LETTER HAH -->
- <Key
- latin:keyLabel="ح"
- latin:keyHintLabel="9"
- latin:moreKeys="9,٩" />
- <!-- \u062c: ARABIC LETTER JEEM
- \u0686: ARABIC LETTER TCHEH -->
- <Key
- latin:keyLabel="ج"
- latin:keyHintLabel="0"
- latin:moreKeys="0,٠,\u0686"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="10%p"
- >
- <!-- \u0634: ARABIC LETTER SHEEN
- \u069c: ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
- <Key
- latin:keyLabel="ش"
- latin:moreKeys="ڜ" />
- <!-- \u0633: ARABIC LETTER SEEN -->
- <Key
- latin:keyLabel="س" />
- <!-- \u064a: ARABIC LETTER YEH
- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE
- \u0649: ARABIC LETTER ALEF MAKSURA -->
- <Key
- latin:keyLabel="ي"
- latin:moreKeys="\u0626,\u0649" />
- <!-- \u0628: ARABIC LETTER BEH
- \u067e: ARABIC LETTER PEH -->
- <Key
- latin:keyLabel="ب"
- latin:moreKeys="پ" />
- <!-- \u0644: ARABIC LETTER LAM
- \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
- \u0627: ARABIC LETTER ALEF
- \ufef7: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
- \ufef9: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
- \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
- \ufef5: ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
- \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
- <Key
- latin:keyLabel="ل"
- latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
- <!-- \u0627: ARABIC LETTER ALEF
- \u0621: ARABIC LETTER HAMZA
- \u0671: ARABIC LETTER ALEF WASLA
- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
- \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
- \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
- <Key
- latin:keyLabel="ا"
- latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
- <!-- \u062a: ARABIC LETTER TEH
- \u062b: ARABIC LETTER THEH -->
- <Key
- latin:keyLabel="ت"
- latin:moreKeys="ث" />
- <!-- \u0646: ARABIC LETTER NOON -->
- <Key
- latin:keyLabel="ن" />
- <!-- \u0645: ARABIC LETTER MEEM -->
- <Key
- latin:keyLabel="م" />
- <!-- \u0643: ARABIC LETTER KAF
- \u06af: ARABIC LETTER GAF
- \u06a9: ARABIC LETTER KEHEH -->
- <Key
- latin:keyLabel="ك"
- latin:moreKeys="\u06af,\u06a9"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="10%p"
- >
- <!-- \u0638: ARABIC LETTER ZAH -->
- <Key
- latin:keyLabel="ظ"
- latin:keyXPos="5.0%p" />
- <!-- \u0637: ARABIC LETTER TAH -->
- <Key
- latin:keyLabel="ط" />
- <!-- \u0630: ARABIC LETTER THAL -->
- <Key
- latin:keyLabel="ذ" />
- <!-- \u062f: ARABIC LETTER DAL -->
- <Key
- latin:keyLabel="د" />
- <!-- \u0632: ARABIC LETTER ZAIN
- \u0698: ARABIC LETTER JEH -->
- <Key
- latin:keyLabel="ز"
- latin:moreKeys="ژ" />
- <!-- \u0631: ARABIC LETTER REH -->
- <Key
- latin:keyLabel="ر" />
- <!-- \u0629: ARABIC LETTER TEH MARBUTA -->
- <Key
- latin:keyLabel="ة" />
- <!-- \u0648: ARABIC LETTER WAW
- \u0624: ARABIC LETTER WAW WITH HAMZA ABOVE -->
- <Key
- latin:keyLabel="و"
- latin:moreKeys="ؤ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight"
- latin:visualInsetsLeft="1%p" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml/kbd_rows_hebrew.xml b/java/res/xml/kbd_rows_hebrew.xml
deleted file mode 100644
index 6be8174c5..000000000
--- a/java/res/xml/kbd_rows_hebrew.xml
+++ /dev/null
@@ -1,109 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="10%p"
- >
- <Key
- latin:keyLabel="ק"
- latin:keyXPos="5%p" />
- <Key
- latin:keyLabel="ר" />
- <Key
- latin:keyLabel="א" />
- <Key
- latin:keyLabel="ט" />
- <Key
- latin:keyLabel="ו" />
- <Key
- latin:keyLabel="ן" />
- <Key
- latin:keyLabel="ם" />
- <Key
- latin:keyLabel="פ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight"
- latin:visualInsetsLeft="1%p" />
- </Row>
- <Row
- latin:keyWidth="10%p"
- >
- <Key
- latin:keyLabel="ש" />
- <Key
- latin:keyLabel="ד" />
- <Key
- latin:keyLabel="ג"
- latin:moreKeys="ג׳" />
- <Key
- latin:keyLabel="כ" />
- <Key
- latin:keyLabel="ע" />
- <Key
- latin:keyLabel="י"
- latin:moreKeys="ײַ" />
- <Key
- latin:keyLabel="ח"
- latin:moreKeys="ח׳" />
- <Key
- latin:keyLabel="ל" />
- <Key
- latin:keyLabel="ך" />
- <Key
- latin:keyLabel="ף"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="10%p"
- >
- <Key
- latin:keyLabel="ז"
- latin:moreKeys="ז׳"
- latin:keyXPos="5%p" />
- <Key
- latin:keyLabel="ס" />
- <Key
- latin:keyLabel="ב" />
- <Key
- latin:keyLabel="ה" />
- <Key
- latin:keyLabel="נ" />
- <Key
- latin:keyLabel="מ" />
- <Key
- latin:keyLabel="צ"
- latin:moreKeys="צ׳" />
- <Key
- latin:keyLabel="ת"
- latin:moreKeys="ת׳" />
- <Key
- latin:keyLabel="ץ"
- latin:moreKeys="ץ׳" />
- <!-- Here is 5%p space -->
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml/kbd_rows_number.xml b/java/res/xml/kbd_rows_number.xml
deleted file mode 100644
index 90ac5686b..000000000
--- a/java/res/xml/kbd_rows_number.xml
+++ /dev/null
@@ -1,132 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
- <switch>
- <case
- latin:passwordInput="true"
- >
- <Row>
- <Key
- latin:keyStyle="num1KeyStyle" />
- <Key
- latin:keyStyle="num2KeyStyle" />
- <Key
- latin:keyStyle="num3KeyStyle" />
- <Spacer />
- </Row>
- <Row>
- <Key
- latin:keyStyle="num4KeyStyle" />
- <Key
- latin:keyStyle="num5KeyStyle" />
- <Key
- latin:keyStyle="num6KeyStyle" />
- <Spacer />
- </Row>
- <Row>
- <Key
- latin:keyStyle="num7KeyStyle" />
- <Key
- latin:keyStyle="num8KeyStyle" />
- <Key
- latin:keyStyle="num9KeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <Spacer />
- <Key
- latin:keyStyle="num0KeyStyle" />
- <Spacer />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- </case>
- <!-- latin:passwordInput="false" -->
- <default>
- <Row>
- <Key
- latin:keyLabel="1"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="2"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="3"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="-"
- latin:keyStyle="numFunctionalKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <Key
- latin:keyLabel="4"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="5"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="6"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel=","
- latin:keyStyle="numFunctionalKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <Key
- latin:keyLabel="7"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="8"
- latin:keyStyle="numKeyStyle"/>
- <Key
- latin:keyLabel="9"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="numSpaceKeyStyle" />
- <Key
- latin:keyLabel="0"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="."
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- </default>
- </switch>
-</merge>
diff --git a/java/res/xml/kbd_rows_russian.xml b/java/res/xml/kbd_rows_russian.xml
deleted file mode 100644
index f1794e750..000000000
--- a/java/res/xml/kbd_rows_russian.xml
+++ /dev/null
@@ -1,133 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="9.091%p"
- >
- <Key
- latin:keyLabel="й"
- latin:keyHintLabel="1"
- latin:moreKeys="1" />
- <Key
- latin:keyLabel="ц"
- latin:keyHintLabel="2"
- latin:moreKeys="2" />
- <Key
- latin:keyLabel="у"
- latin:keyHintLabel="3"
- latin:moreKeys="3" />
- <Key
- latin:keyLabel="к"
- latin:keyHintLabel="4"
- latin:moreKeys="4" />
- <Key
- latin:keyLabel="е"
- latin:keyHintLabel="5"
- latin:moreKeys="@string/more_keys_for_cyrillic_e" />
- <Key
- latin:keyLabel="н"
- latin:keyHintLabel="6"
- latin:moreKeys="6" />
- <Key
- latin:keyLabel="г"
- latin:keyHintLabel="7"
- latin:moreKeys="7" />
- <Key
- latin:keyLabel="ш"
- latin:keyHintLabel="8"
- latin:moreKeys="8" />
- <Key
- latin:keyLabel="щ"
- latin:keyHintLabel="9"
- latin:moreKeys="9" />
- <Key
- latin:keyLabel="з"
- latin:keyHintLabel="0"
- latin:moreKeys="0" />
- <Key
- latin:keyLabel="х"
- latin:moreKeys="@string/more_keys_for_cyrillic_ha"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="9.091%p"
- >
- <Key
- latin:keyLabel="ф"
- latin:keyWidth="8.75%p" />
- <Key
- latin:keyLabel="ы" />
- <Key
- latin:keyLabel="в" />
- <Key
- latin:keyLabel="а" />
- <Key
- latin:keyLabel="п" />
- <Key
- latin:keyLabel="р" />
- <Key
- latin:keyLabel="о" />
- <Key
- latin:keyLabel="л" />
- <Key
- latin:keyLabel="д" />
- <Key
- latin:keyLabel="ж" />
- <Key
- latin:keyLabel="э"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="8.5%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="11.75%p" />
- <Key
- latin:keyLabel="я" />
- <Key
- latin:keyLabel="ч" />
- <Key
- latin:keyLabel="с" />
- <Key
- latin:keyLabel="м" />
- <Key
- latin:keyLabel="и" />
- <Key
- latin:keyLabel="т" />
- <Key
- latin:keyLabel="ь"
- latin:moreKeys="@string/more_keys_for_cyrillic_soft_sign" />
- <Key
- latin:keyLabel="б" />
- <Key
- latin:keyLabel="ю" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml/kbd_rows_serbian.xml b/java/res/xml/kbd_rows_serbian.xml
deleted file mode 100644
index da4d69521..000000000
--- a/java/res/xml/kbd_rows_serbian.xml
+++ /dev/null
@@ -1,130 +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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <Row
- latin:keyWidth="9.091%p"
- >
- <Key
- latin:keyLabel="љ"
- latin:keyHintLabel="1"
- latin:moreKeys="1" />
- <Key
- latin:keyLabel="њ"
- latin:keyHintLabel="2"
- latin:moreKeys="2" />
- <Key
- latin:keyLabel="е"
- latin:keyHintLabel="3"
- latin:moreKeys="3" />
- <Key
- latin:keyLabel="р"
- latin:keyHintLabel="4"
- latin:moreKeys="4" />
- <Key
- latin:keyLabel="т"
- latin:keyHintLabel="5"
- latin:moreKeys="5" />
- <Key
- latin:keyLabel="з"
- latin:keyHintLabel="6"
- latin:moreKeys="6" />
- <Key
- latin:keyLabel="у"
- latin:keyHintLabel="7"
- latin:moreKeys="7" />
- <Key
- latin:keyLabel="и"
- latin:keyHintLabel="8"
- latin:moreKeys="8" />
- <Key
- latin:keyLabel="о"
- latin:keyHintLabel="9"
- latin:moreKeys="9" />
- <Key
- latin:keyLabel="п"
- latin:keyHintLabel="0"
- latin:moreKeys="0" />
- <Key
- latin:keyLabel="ш"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="9.091%p"
- >
- <Key
- latin:keyLabel="а" />
- <Key
- latin:keyLabel="с" />
- <Key
- latin:keyLabel="д" />
- <Key
- latin:keyLabel="ф" />
- <Key
- latin:keyLabel="г" />
- <Key
- latin:keyLabel="х" />
- <Key
- latin:keyLabel="ј" />
- <Key
- latin:keyLabel="к" />
- <Key
- latin:keyLabel="л" />
- <Key
- latin:keyLabel="ч" />
- <Key
- latin:keyLabel="ћ"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="8.5%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="11.75%p" />
- <Key
- latin:keyLabel="ѕ" />
- <Key
- latin:keyLabel="џ" />
- <Key
- latin:keyLabel="ц" />
- <Key
- latin:keyLabel="в" />
- <Key
- latin:keyLabel="б" />
- <Key
- latin:keyLabel="н" />
- <Key
- latin:keyLabel="м" />
- <Key
- latin:keyLabel="ђ" />
- <Key
- latin:keyLabel="ж" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml/kbd_scandinavian.xml b/java/res/xml/kbd_scandinavian.xml
new file mode 100644
index 000000000..46ddfcb8f
--- /dev/null
+++ b/java/res/xml/kbd_scandinavian.xml
@@ -0,0 +1,26 @@
+<?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.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_scandinavian" />
+</Keyboard>
diff --git a/java/res/xml/kbd_serbian.xml b/java/res/xml/kbd_serbian.xml
new file mode 100644
index 000000000..05597c4eb
--- /dev/null
+++ b/java/res/xml/kbd_serbian.xml
@@ -0,0 +1,26 @@
+<?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.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_serbian" />
+</Keyboard>
diff --git a/java/res/xml/kbd_slavic.xml b/java/res/xml/kbd_slavic.xml
new file mode 100644
index 000000000..ca891c000
--- /dev/null
+++ b/java/res/xml/kbd_slavic.xml
@@ -0,0 +1,26 @@
+<?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.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_slavic" />
+</Keyboard>
diff --git a/java/res/xml/kbd_spanish.xml b/java/res/xml/kbd_spanish.xml
new file mode 100644
index 000000000..6ce2b5d24
--- /dev/null
+++ b/java/res/xml/kbd_spanish.xml
@@ -0,0 +1,26 @@
+<?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.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_spanish" />
+</Keyboard>
diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index 737f684a7..f6612a2f7 100644
--- a/java/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_symbols" />
+ latin:keyboardLayout="@xml/rows_symbols" />
</Keyboard>
diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
index 9c163d694..41a5571ef 100644
--- a/java/res/xml/kbd_symbols_shift.xml
+++ b/java/res/xml/kbd_symbols_shift.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_symbols_shift" />
+ latin:keyboardLayout="@xml/rows_symbols_shift" />
</Keyboard>
diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/key_f1.xml
index 83b6ecc8d..83b6ecc8d 100644
--- a/java/res/xml/kbd_qwerty_f1.xml
+++ b/java/res/xml/key_f1.xml
diff --git a/java/res/xml/kbd_settings_or_tab.xml b/java/res/xml/key_settings_or_tab.xml
index 4a8bcc7a6..2d35e3b4a 100644
--- a/java/res/xml/kbd_settings_or_tab.xml
+++ b/java/res/xml/key_settings_or_tab.xml
@@ -25,8 +25,11 @@
<case
latin:hasSettingsKey="true"
>
+ <!-- Because this settings key is not adjacent to the space key, this key should be
+ just ignored while typing (altCode=CODE_UNSPECIFIED). -->
<Key
latin:keyStyle="settingsKeyStyle"
+ latin:altCode="@integer/key_unspecified"
latin:keyWidth="9.2%p" />
</case>
<!-- hasSettingsKey="false" -->
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/key_styles_common.xml
index 453b05dff..0e31bcb31 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -28,7 +28,7 @@
>
<key-style
latin:styleName="f1PopupStyle"
- latin:keyLabelOption="hasPopupHint"
+ latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="@string/more_keys_for_f1"
latin:backgroundType="functional" />
</case>
@@ -38,7 +38,7 @@
>
<key-style
latin:styleName="f1PopupStyle"
- latin:keyLabelOption="hasPopupHint"
+ latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="@string/more_keys_for_f1_settings"
latin:backgroundType="functional" />
</case>
@@ -48,7 +48,7 @@
>
<key-style
latin:styleName="f1PopupStyle"
- latin:keyLabelOption="hasPopupHint"
+ latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="@string/more_keys_for_f1_navigate"
latin:backgroundType="functional" />
</case>
@@ -56,109 +56,70 @@
<default>
<key-style
latin:styleName="f1PopupStyle"
- latin:keyLabelOption="hasPopupHint"
+ latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="@string/more_keys_for_f1"
latin:backgroundType="functional" />
</default>
</switch>
<!-- Functional key styles -->
- <key-style
- latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
- latin:keyIcon="iconShiftKey"
- latin:keyIconShifted="iconShiftedShiftKey"
- latin:backgroundType="sticky" />
- <key-style
- latin:styleName="deleteKeyStyle"
- latin:code="@integer/key_delete"
- latin:keyIcon="iconDeleteKey"
- latin:backgroundType="functional"
- latin:isRepeatable="true" />
- <!-- Return key style -->
<switch>
<case
- latin:mode="im"
- >
- <!-- Smiley key. -->
- <key-style
- latin:styleName="returnKeyStyle"
- latin:keyLabel=":-)"
- latin:keyOutputText=":-) "
- latin:keyLabelOption="hasPopupHint"
- latin:moreKeys="@string/more_keys_for_smiley"
- latin:maxMoreKeysColumn="5"
- latin:backgroundType="functional" />
- </case>
- <case
- latin:imeAction="actionGo"
- >
- <key-style
- latin:styleName="returnKeyStyle"
- latin:code="@integer/key_return"
- latin:keyLabel="@string/label_go_key"
- latin:keyLabelOption="autoXScale"
- latin:backgroundType="action" />
- </case>
- <case
- latin:imeAction="actionNext"
+ latin:keyboardSetElement="alphabetManualShifted|alphabetAutomaticShifted"
>
<key-style
- latin:styleName="returnKeyStyle"
- latin:code="@integer/key_return"
- latin:keyLabel="@string/label_next_key"
- latin:keyLabelOption="autoXScale"
- latin:backgroundType="action" />
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKeyShifted"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOff" />
</case>
<case
- latin:imeAction="actionDone"
+ latin:keyboardSetElement="alphabetShiftLocked|alphabetShiftLockShifted"
>
<key-style
- latin:styleName="returnKeyStyle"
- latin:code="@integer/key_return"
- latin:keyLabel="@string/label_done_key"
- latin:keyLabelOption="autoXScale"
- latin:backgroundType="action" />
- </case>
- <case
- latin:imeAction="actionSend"
- >
- <key-style
- latin:styleName="returnKeyStyle"
- latin:code="@integer/key_return"
- latin:keyLabel="@string/label_send_key"
- latin:keyLabelOption="autoXScale"
- latin:backgroundType="action" />
- </case>
- <case
- latin:imeAction="actionSearch"
- >
- <key-style
- latin:styleName="returnKeyStyle"
- latin:code="@integer/key_return"
- latin:keyIcon="iconSearchKey"
- latin:backgroundType="action" />
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKeyShifted"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOn" />
</case>
<default>
<key-style
- latin:styleName="returnKeyStyle"
- latin:code="@integer/key_return"
- latin:keyIcon="iconReturnKey"
- latin:backgroundType="functional" />
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKey"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOff" />
</default>
</switch>
<key-style
+ latin:styleName="deleteKeyStyle"
+ latin:code="@integer/key_delete"
+ latin:keyIcon="iconDeleteKey"
+ latin:keyActionFlags="isRepeatable|noKeyPreview"
+ latin:backgroundType="functional" />
+ <include
+ latin:keyboardLayout="@xml/key_styles_enter_phone" />
+ <key-style
latin:styleName="spaceKeyStyle"
latin:code="@integer/key_space"
+ latin:keyActionFlags="noKeyPreview|enableLongPress"
latin:backgroundType="functional" />
<key-style
latin:styleName="shortcutKeyStyle"
latin:code="@integer/key_shortcut"
latin:keyIcon="iconShortcutKey"
+ latin:keyIconDisabled="iconDisabledShortcutKey"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
+ latin:altCode="@integer/key_space"
latin:parentStyle="f1PopupStyle" />
<key-style
latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings"
latin:keyIcon="iconSettingsKey"
+ latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
+ latin:altCode="@integer/key_space"
latin:backgroundType="functional" />
<key-style
latin:styleName="tabKeyStyle"
@@ -186,7 +147,8 @@
latin:code="@integer/key_switch_alpha_symbol"
latin:keyIcon="iconShortcutForLabel"
latin:keyLabel="@string/label_to_symbol_with_microphone_key"
- latin:keyLabelOption="withIconRight"
+ latin:keyLabelFlags="withIconRight|preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</case>
<default>
@@ -194,6 +156,8 @@
latin:styleName="toSymbolKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</default>
</switch>
@@ -201,23 +165,29 @@
latin:styleName="toAlphaKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_more_symbol_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_symbol_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="punctuationKeyStyle"
latin:keyLabel="."
latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
- latin:keyLabelOption="hasPopupHint"
+ latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="@string/more_keys_for_punctuation"
- latin:maxMoreKeysColumn="@integer/mini_keyboard_column_for_punctuation"
+ latin:maxMoreKeysColumn="@integer/more_keys_keyboard_column_for_punctuation"
latin:backgroundType="functional" />
</merge>
diff --git a/java/res/xml/kbd_currency_key_styles.xml b/java/res/xml/key_styles_currency.xml
index 225888337..3e4afdfb5 100644
--- a/java/res/xml/kbd_currency_key_styles.xml
+++ b/java/res/xml/key_styles_currency.xml
@@ -26,7 +26,7 @@
latin:passwordInput="true"
>
<include
- latin:keyboardLayout="@xml/kbd_currency_dollar_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency_dollar" />
</case>
<!-- Countries using Euro currency, 23 countries as for January 2011. -->
1. Andorra (ca_AD, ca_ES)
@@ -62,19 +62,19 @@
latin:localeCode="da|de|es|el|fi|fr|it|nl|sk|sl|pt_PT|tr"
>
<include
- latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency_euro" />
</case>
<case
latin:languageCode="ca|et|lb|mt|sla"
>
<include
- latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency_euro" />
</case>
<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"
>
<include
- latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency_euro" />
</case>
<case
latin:languageCode="iw"
@@ -121,7 +121,7 @@
</case>
<default>
<include
- latin:keyboardLayout="@xml/kbd_currency_dollar_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency_dollar" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/kbd_currency_dollar_key_styles.xml b/java/res/xml/key_styles_currency_dollar.xml
index d5dca2afa..d5dca2afa 100644
--- a/java/res/xml/kbd_currency_dollar_key_styles.xml
+++ b/java/res/xml/key_styles_currency_dollar.xml
diff --git a/java/res/xml/kbd_currency_euro_key_styles.xml b/java/res/xml/key_styles_currency_euro.xml
index 6edddf074..6edddf074 100644
--- a/java/res/xml/kbd_currency_euro_key_styles.xml
+++ b/java/res/xml/key_styles_currency_euro.xml
diff --git a/java/res/xml/key_styles_enter_phone.xml b/java/res/xml/key_styles_enter_phone.xml
new file mode 100644
index 000000000..6af81fb7b
--- /dev/null
+++ b/java/res/xml/key_styles_enter_phone.xml
@@ -0,0 +1,124 @@
+<?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"
+>
+ <!-- Enter key style -->
+ <key-style
+ latin:styleName="defaultEnterKeyStyle"
+ latin:code="@integer/key_enter"
+ latin:keyIcon="iconReturnKey"
+ latin:keyLabelFlags="autoXScale|preserveCase"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="functional" />
+ <key-style
+ latin:styleName="defaultActionKeyStyle"
+ latin:code="@integer/key_action_enter"
+ latin:keyIcon="iconUndefined"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ <switch>
+ <!-- Shift + Enter in textMultiLine field. -->
+ <case
+ latin:isMultiLine="true"
+ latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ </case>
+ <!-- Smiley in textShortMessage field. -->
+ <case
+ latin:mode="im"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel=":-)"
+ latin:keyOutputText=":-) "
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="@string/more_keys_for_smiley"
+ latin:maxMoreKeysColumn="5"
+ latin:backgroundType="functional" />
+ </case>
+ <case
+ latin:imeAction="actionGo"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel="@string/label_go_key"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionNext"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel="@string/label_next_key"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionPrevious"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel="@string/label_previous_key"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionDone"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel="@string/label_done_key"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionSend"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel="@string/label_send_key"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionSearch"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyIcon="iconSearchKey"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionCustomLabel"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabelFlags="fromCustomActionLabel"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <!-- imeAction is either actionNone or actionUnspecified. -->
+ <default>
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml/key_styles_enter_tablet.xml b/java/res/xml/key_styles_enter_tablet.xml
new file mode 100644
index 000000000..702089181
--- /dev/null
+++ b/java/res/xml/key_styles_enter_tablet.xml
@@ -0,0 +1,111 @@
+<?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"
+>
+ <!-- Enter key style -->
+ <key-style
+ latin:styleName="defaultEnterKeyStyle"
+ latin:code="@integer/key_enter"
+ latin:keyIcon="iconReturnKey"
+ latin:keyLabelFlags="autoXScale|preserveCase"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="functional" />
+ <key-style
+ latin:styleName="defaultActionKeyStyle"
+ latin:code="@integer/key_action_enter"
+ latin:keyIcon="iconUndefined"
+ latin:backgroundType="action"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ <switch>
+ <!-- Shift + Enter in textMultiLine field. -->
+ <case
+ latin:isMultiLine="true"
+ latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionGo"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel="@string/label_go_key"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionNext"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel="@string/label_next_key"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionPrevious"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel="@string/label_previous_key"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionDone"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel="@string/label_done_key"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionSend"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabel="@string/label_send_key"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionSearch"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyIcon="iconSearchKey"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionCustomLabel"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keyLabelFlags="fromCustomActionLabel"
+ latin:parentStyle="defaultActionKeyStyle" />
+ </case>
+ <!-- imeAction is either actionNone or actionUnspecified. -->
+ <default>
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml/kbd_numkey_styles.xml b/java/res/xml/key_styles_number.xml
index 5d5439906..7307a1a2b 100644
--- a/java/res/xml/kbd_numkey_styles.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -22,23 +22,30 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<key-style
+ latin:styleName="numKeyBaseStyle"
+ latin:keyActionFlags="noKeyPreview" />
+ <key-style
latin:styleName="numKeyStyle"
- latin:keyLabelOption="largeLetter|followKeyLetterRatio" />
+ latin:keyLabelFlags="largeLetter|followKeyLetterRatio"
+ latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numModeKeyStyle"
- latin:keyLabelOption="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio"
+ latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numFunctionalKeyStyle"
- latin:keyLabelOption="largeLetter|followKeyLetterRatio"
- latin:backgroundType="functional" />
+ latin:keyLabelFlags="largeLetter|followKeyLetterRatio"
+ latin:backgroundType="functional"
+ latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numberKeyStyle"
- latin:keyLabelOption="alignLeftOfCenter|hasHintLabel"
+ latin:keyLabelFlags="alignLeftOfCenter|hasHintLabel"
latin:parentStyle="numKeyStyle" />
<key-style
latin:styleName="num0KeyStyle"
latin:code="48"
latin:keyLabel="0 +"
+ latin:keyActionFlags="enableLongPress"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num1KeyStyle"
@@ -89,18 +96,37 @@
latin:code="42"
latin:keyLabel="\uff0a"
latin:parentStyle="numKeyStyle" />
+ <!-- Only for non-tablet device -->
<key-style
- latin:styleName="numSwitchToAltKeyStyle"
- latin:code="@integer/key_shift"
+ latin:styleName="numPhoneToSymbolKeyStyle"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_phone_symbols_key"
latin:parentStyle="numModeKeyStyle" />
<key-style
- latin:styleName="numSwitchToNumericKeyStyle"
- latin:code="@integer/key_shift"
+ latin:styleName="numPhoneToNumericKeyStyle"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_phone_numeric_key"
latin:parentStyle="numModeKeyStyle" />
<key-style
+ latin:styleName="numPauseKeyStyle"
+ latin:code="44"
+ latin:keyLabel="@string/label_pause_key"
+ latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"
+ latin:parentStyle="numKeyBaseStyle" />
+ <key-style
+ latin:styleName="numWaitKeyStyle"
+ latin:code="59"
+ latin:keyLabel="@string/label_wait_key"
+ latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"
+ latin:parentStyle="numKeyBaseStyle" />
+ <key-style
+ latin:styleName="numTabKeyStyle"
+ latin:keyActionFlags="noKeyPreview"
+ latin:parentStyle="tabKeyStyle" />
+ <key-style
latin:styleName="numSpaceKeyStyle"
latin:code="@integer/key_space"
- latin:keyIcon="iconSpaceKey" />
+ latin:keyIcon="iconSpaceKeyForNumberLayout"
+ latin:keyActionFlags="enableLongPress"
+ latin:parentStyle="numKeyBaseStyle" />
</merge>
diff --git a/java/res/xml/kbd_symbols_f1.xml b/java/res/xml/key_symbols_f1.xml
index 0dd3d9109..0dd3d9109 100644
--- a/java/res/xml/kbd_symbols_f1.xml
+++ b/java/res/xml/key_symbols_f1.xml
diff --git a/java/res/xml/keyboard_set.xml b/java/res/xml/keyboard_set.xml
new file mode 100644
index 000000000..1398b137c
--- /dev/null
+++ b/java/res/xml/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?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.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="en_GB,en_US">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_qwerty" />
+ <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" />
+</KeyboardSet>
diff --git a/java/res/xml-sw600dp/kbd_row3_comma_period.xml b/java/res/xml/keys_comma_period.xml
index b84443078..6db02b61d 100644
--- a/java/res/xml-sw600dp/kbd_row3_comma_period.xml
+++ b/java/res/xml/keys_comma_period.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2011, The Android Open Source Project
+** 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.
@@ -33,14 +33,14 @@
<default>
<Key
latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="!"
- latin:moreKeys="!" />
+ latin:moreKeys="!"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
+ latin:moreKeys="\?"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/keys_curly_brackets.xml b/java/res/xml/keys_curly_brackets.xml
new file mode 100644
index 000000000..d21a09281
--- /dev/null
+++ b/java/res/xml/keys_curly_brackets.xml
@@ -0,0 +1,30 @@
+<?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"
+>
+ <Key
+ latin:keyLabel="{"
+ latin:code="@integer/keycode_for_left_curly_bracket" />
+ <Key
+ latin:keyLabel="}"
+ latin:code="@integer/keycode_for_right_curly_bracket" />
+</merge>
diff --git a/java/res/xml/keys_less_greater.xml b/java/res/xml/keys_less_greater.xml
new file mode 100644
index 000000000..8961d9ce6
--- /dev/null
+++ b/java/res/xml/keys_less_greater.xml
@@ -0,0 +1,32 @@
+<?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"
+>
+ <Key
+ latin:keyLabel="&lt;"
+ latin:code="@integer/keycode_for_less_than"
+ latin:moreKeys="@string/more_keys_for_less_than" />
+ <Key
+ latin:keyLabel="&gt;"
+ latin:code="@integer/keycode_for_greater_than"
+ latin:moreKeys="@string/more_keys_for_greater_than" />
+</merge>
diff --git a/java/res/xml/keys_parentheses.xml b/java/res/xml/keys_parentheses.xml
new file mode 100644
index 000000000..6853bf167
--- /dev/null
+++ b/java/res/xml/keys_parentheses.xml
@@ -0,0 +1,32 @@
+<?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"
+>
+ <Key
+ latin:keyLabel="("
+ latin:code="@integer/keycode_for_left_parenthesis"
+ latin:moreKeys="@string/more_keys_for_left_parenthesis" />
+ <Key
+ latin:keyLabel=")"
+ latin:code="@integer/keycode_for_right_parenthesis"
+ latin:moreKeys="@string/more_keys_for_right_parenthesis" />
+</merge>
diff --git a/java/res/xml/keys_square_brackets.xml b/java/res/xml/keys_square_brackets.xml
new file mode 100644
index 000000000..44387c3bf
--- /dev/null
+++ b/java/res/xml/keys_square_brackets.xml
@@ -0,0 +1,30 @@
+<?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"
+>
+ <Key
+ latin:keyLabel="["
+ latin:code="@integer/keycode_for_left_square_bracket" />
+ <Key
+ latin:keyLabel="]"
+ latin:code="@integer/keycode_for_right_square_bracket" />
+</merge>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 6184add4d..650f91b9b 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -20,7 +20,8 @@
<!-- The attributes in this XML file provide configuration information -->
<!-- for the Input Method Manager. -->
-<!-- Keyboard: en_US, en_GB, ar, cs, da, de, de(QWERTY), es, es_US, fi, fr, fr_CA, fr_CH, hr, hu, it, iw, nb, nl, pl, pt, ru, sr, sv, tr -->
+<!-- Keyboard: en_US, en_GB, ar, be, bg, cs, da, de, de(QWERTY), es, es_US, et, fi, fr, fr_CA,
+ fr_CH, hr, hu, it, iw, ky, lt, lv, nb, nl, pl, pt, ro, ru, sk, sl, sr, sv, tr, uk, vi -->
<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
<!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
subtype.-->
@@ -31,7 +32,7 @@
android:label="@string/subtype_en_US"
android:imeSubtypeLocale="en_US"
android:imeSubtypeMode="keyboard"
- android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection"
+ android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EnabledWhenDefaultIsNotAsciiCapable"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_en_GB"
@@ -47,6 +48,18 @@
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="be"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="bg"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="cs"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
@@ -64,7 +77,7 @@
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
- android:label="@string/subtype_de_qwerty"
+ android:label="@string/subtype_generic_qwerty"
android:imeSubtypeLocale="de"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,KeyboardLocale=de_ZZ,SupportTouchPositionCorrection"
@@ -77,6 +90,12 @@
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="et"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="fi"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
@@ -126,6 +145,24 @@
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="ky"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="lt"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="lv"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="nb"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
@@ -150,12 +187,30 @@
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="ro"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="ru"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="sk"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="sl"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="sr"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
@@ -172,4 +227,16 @@
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
/>
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="uk"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="vi"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
+ />
</input-method>
diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml
index 80613a56f..f38b85f0b 100644
--- a/java/res/xml/prefs_for_debug.xml
+++ b/java/res/xml/prefs_for_debug.xml
@@ -42,4 +42,10 @@
android:defaultValue="false"
/>
+ <CheckBoxPreference
+ android:key="force_non_distinct_multitouch"
+ android:title="@string/prefs_force_non_distinct_multitouch"
+ android:persistent="true"
+ android:defaultValue="false"
+ />
</PreferenceScreen>
diff --git a/java/res/xml/kbd_qwerty_row1.xml b/java/res/xml/row_qwerty1.xml
index e8e8d1b46..cb1f4d297 100644
--- a/java/res/xml/kbd_qwerty_row1.xml
+++ b/java/res/xml/row_qwerty1.xml
@@ -27,43 +27,50 @@
<Key
latin:keyLabel="q"
latin:keyHintLabel="1"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="w"
latin:keyHintLabel="2"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="e"
latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
latin:moreKeys="@string/more_keys_for_e" />
<Key
latin:keyLabel="r"
latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4"
latin:moreKeys="@string/more_keys_for_r" />
<Key
latin:keyLabel="t"
latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
latin:moreKeys="@string/more_keys_for_t" />
<Key
latin:keyLabel="y"
latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
latin:moreKeys="@string/more_keys_for_y" />
<Key
latin:keyLabel="u"
latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7"
latin:moreKeys="@string/more_keys_for_u" />
<Key
latin:keyLabel="i"
latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8"
latin:moreKeys="@string/more_keys_for_i" />
<Key
latin:keyLabel="o"
latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9"
latin:moreKeys="@string/more_keys_for_o" />
<Key
latin:keyLabel="p"
latin:keyHintLabel="0"
- latin:moreKeys="@string/more_keys_for_p"
+ latin:additionalMoreKeys="0"
latin:keyWidth="fillRight" />
</Row>
</merge>
diff --git a/java/res/xml/kbd_qwerty_row2.xml b/java/res/xml/row_qwerty2.xml
index 8986780b7..8986780b7 100644
--- a/java/res/xml/kbd_qwerty_row2.xml
+++ b/java/res/xml/row_qwerty2.xml
diff --git a/java/res/xml/kbd_qwerty_row3.xml b/java/res/xml/row_qwerty3.xml
index c2b45e752..c2b45e752 100644
--- a/java/res/xml/kbd_qwerty_row3.xml
+++ b/java/res/xml/row_qwerty3.xml
diff --git a/java/res/xml/kbd_qwerty_row4.xml b/java/res/xml/row_qwerty4.xml
index eb1e9b8b3..8c20a72dc 100644
--- a/java/res/xml/kbd_qwerty_row4.xml
+++ b/java/res/xml/row_qwerty4.xml
@@ -33,14 +33,14 @@
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="15%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f1" />
+ latin:keyboardLayout="@xml/key_f1" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" />
<Key
latin:keyStyle="punctuationKeyStyle" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</case>
<!-- hasSettingsKey="true" or navigateAction="true" -->
@@ -49,9 +49,9 @@
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="13.75%p" />
<include
- latin:keyboardLayout="@xml/kbd_settings_or_tab" />
+ latin:keyboardLayout="@xml/key_settings_or_tab" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f1" />
+ latin:keyboardLayout="@xml/key_f1" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="35.83%p" />
@@ -59,7 +59,7 @@
latin:keyStyle="punctuationKeyStyle"
latin:keyWidth="9.2%p" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</default>
</switch>
diff --git a/java/res/xml/kbd_symbols_row4.xml b/java/res/xml/row_symbols4.xml
index 864cf2b8e..be0c94ffa 100644
--- a/java/res/xml/kbd_symbols_row4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -33,14 +33,14 @@
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="15%p" />
<include
- latin:keyboardLayout="@xml/kbd_symbols_f1" />
+ latin:keyboardLayout="@xml/key_symbols_f1" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" />
<Key
latin:keyStyle="punctuationKeyStyle" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</case>
<!-- hasSettingsKey="true" or navigateAction="true" -->
@@ -49,9 +49,9 @@
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="13.75%p" />
<include
- latin:keyboardLayout="@xml/kbd_settings_or_tab" />
+ latin:keyboardLayout="@xml/key_settings_or_tab" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f1" />
+ latin:keyboardLayout="@xml/key_f1" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="35.83%p" />
@@ -59,7 +59,7 @@
latin:keyStyle="punctuationKeyStyle"
latin:keyWidth="9.2%p" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</default>
</switch>
diff --git a/java/res/xml/kbd_symbols_shift_row4.xml b/java/res/xml/row_symbols_shift4.xml
index 89e80e5f7..78d5d0297 100644
--- a/java/res/xml/kbd_symbols_shift_row4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -33,19 +33,21 @@
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="15%p" />
<!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
- <!-- latin:keyLabelOption="hasPopupHint" -->
+ <!-- latin:keyLabelFlags="hasPopupHint" -->
<!-- latin:moreKeys="‟" -->
+ <!-- \u201e: "„" DOUBLE LOW-9 QUOTATION MARK -->
<Key
- latin:keyLabel="„"
+ latin:keyLabel="\u201e"
latin:backgroundType="functional" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" />
+ <!-- \u2026: "…" HORIZONTAL ELLIPSIS -->
<Key
- latin:keyLabel="…"
+ latin:keyLabel="\u2026"
latin:backgroundType="functional" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</case>
<!-- hasSettingsKey="true" or navigateAction="true" -->
@@ -54,23 +56,25 @@
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="13.75%p" />
<include
- latin:keyboardLayout="@xml/kbd_settings_or_tab" />
+ latin:keyboardLayout="@xml/key_settings_or_tab" />
<!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
- <!-- latin:keyLabelOption="hasPopupHint" -->
+ <!-- latin:keyLabelFlags="hasPopupHint" -->
<!-- latin:moreKeys="‟" -->
+ <!-- \u201e: "„" DOUBLE LOW-9 QUOTATION MARK -->
<Key
- latin:keyLabel="„"
+ latin:keyLabel="\u201e"
latin:keyWidth="9.2%p"
latin:backgroundType="functional" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="35.83%p" />
+ <!-- \u2026: "…" HORIZONTAL ELLIPSIS -->
<Key
- latin:keyLabel="…"
+ latin:keyLabel="\u2026"
latin:keyWidth="9.2%p"
latin:backgroundType="functional" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</default>
</switch>
diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml
new file mode 100644
index 000000000..449b24041
--- /dev/null
+++ b/java/res/xml/rows_arabic.xml
@@ -0,0 +1,207 @@
+<?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.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="10%p"
+ >
+ <!-- \u0636: "ض" ARABIC LETTER DAD
+ \u0661: "١" ARABIC-INDIC DIGIT ONE -->
+ <Key
+ latin:keyLabel="\u0636"
+ latin:keyHintLabel="1"
+ latin:additionalMoreKeys="1,\u0661" />
+ <!-- \u0635: "ص" ARABIC LETTER SAD
+ \u0662: "٢" ARABIC-INDIC DIGIT TWO -->
+ <Key
+ latin:keyLabel="\u0635"
+ latin:keyHintLabel="2"
+ latin:additionalMoreKeys="2,\u0662" />
+ <!-- \u0642: "ق" ARABIC LETTER QAF
+ \u06a8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE
+ \u0663: "٣" ARABIC-INDIC DIGIT THREE -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u06a8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+ <Key
+ latin:keyLabel="\u0642"
+ latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3,\u0663"
+ latin:moreKeys="\u06a8" />
+ <!-- \u0641: "ف" ARABIC LETTER FEH
+ \u06a4: "ڤ" ARABIC LETTER VEH
+ \u06a2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
+ \u06a5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW
+ \u0664: "٤" ARABIC-INDIC DIGIT FOUR -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u06a2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u06a5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+ <Key
+ latin:keyLabel="\u0641"
+ latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4,\u0664"
+ latin:moreKeys="\u06a4,\u06a2,\u06a5" />
+ <!-- \u063a: "غ" ARABIC LETTER GHAIN
+ \u0665: "٥" ARABIC-INDIC DIGIT FIVE -->
+ <Key
+ latin:keyLabel="\u063a"
+ latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5,\u0665" />
+ <!-- \u0639: "ع" ARABIC LETTER AIN
+ \u0666: "٦" ARABIC-INDIC DIGIT SIX -->
+ <Key
+ latin:keyLabel="\u0639"
+ latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6,\u0666" />
+ <!-- \u0647: "ه" ARABIC LETTER HEH
+ \ufeeb: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+ \u0647\u200d: ARABIC LETTER HEH + ZERO WIDTH JOINER
+ \u0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
+ <Key
+ latin:keyLabel="\u0647"
+ latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7,\u0667"
+ latin:moreKeys="\ufeeb|\u0647\u200d" />
+ <!-- \u062e: "خ" ARABIC LETTER KHAH
+ \u0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
+ <Key
+ latin:keyLabel="\u062e"
+ latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8,\u0668" />
+ <!-- \u062d: "ح" ARABIC LETTER HAH
+ \u0669: "٩" ARABIC-INDIC DIGIT NINE -->
+ <Key
+ latin:keyLabel="\u062d"
+ latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9,\u0669" />
+ <!-- \u062c: "ج" ARABIC LETTER JEEM
+ \u0686: "چ" ARABIC LETTER TCHEH
+ \u0660: "٠" ARABIC-INDIC DIGIT ZERO -->
+ <Key
+ latin:keyLabel="\u062c"
+ latin:keyHintLabel="0"
+ latin:additionalMoreKeys="0,\u0660"
+ latin:moreKeys="\u0686"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="10%p"
+ >
+ <!-- \u0634: "ش" ARABIC LETTER SHEEN
+ \u069c: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+ <!-- TODO: DroidSansArabic lacks the glyph of \u069c ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+ <Key
+ latin:keyLabel="\u0634"
+ latin:moreKeys="\u069c" />
+ <!-- \u0633: "س" ARABIC LETTER SEEN -->
+ <Key
+ latin:keyLabel="\u0633" />
+ <!-- \u064a: "ي" ARABIC LETTER YEH
+ \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+ \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+ <Key
+ latin:keyLabel="\u064a"
+ latin:moreKeys="\u0626,\u0649" />
+ <!-- \u0628: "ب" ARABIC LETTER BEH
+ \u067e: "پ" ARABIC LETTER PEH -->
+ <Key
+ latin:keyLabel="\u0628"
+ latin:moreKeys="\u067e" />
+ <!-- \u0644: "ل" ARABIC LETTER LAM
+ \ufefb: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+ \u0627: "ا" ARABIC LETTER ALEF
+ \ufef7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+ \u0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+ \ufef9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+ \u0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+ \ufef5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+ \u0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ <Key
+ latin:keyLabel="\u0644"
+ latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
+ <!-- \u0627: "ا" ARABIC LETTER ALEF
+ \u0621: "ء" ARABIC LETTER HAMZA
+ \u0671: "ٱ" ARABIC LETTER ALEF WASLA
+ \u0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+ \u0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+ \u0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ <Key
+ latin:keyLabel="\u0627"
+ latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
+ <!-- \u062a: "ت" ARABIC LETTER TEH
+ \u062b: "ﺙ" ARABIC LETTER THEH -->
+ <Key
+ latin:keyLabel="\u062a"
+ latin:moreKeys="\u062b" />
+ <!-- \u0646: "ن" ARABIC LETTER NOON -->
+ <Key
+ latin:keyLabel="\u0646" />
+ <!-- \u0645: "م" ARABIC LETTER MEEM -->
+ <Key
+ latin:keyLabel="\u0645" />
+ <!-- \u0643: "ك" ARABIC LETTER KAF
+ \u06af: "گ" ARABIC LETTER GAF
+ \u06a9: "ک" ARABIC LETTER KEHEH -->
+ <Key
+ latin:keyLabel="\u0643"
+ latin:moreKeys="\u06af,\u06a9"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="10%p"
+ >
+ <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
+ <Key
+ latin:keyLabel="\u0638"
+ latin:keyXPos="5.0%p" />
+ <!-- \u0637: "ط" ARABIC LETTER TAH -->
+ <Key
+ latin:keyLabel="\u0637" />
+ <!-- \u0630: "ذ" ARABIC LETTER THAL -->
+ <Key
+ latin:keyLabel="\u0630" />
+ <!-- \u062f: "د" ARABIC LETTER DAL -->
+ <Key
+ latin:keyLabel="\u062f" />
+ <!-- \u0632: "ز" ARABIC LETTER ZAIN
+ \u0698: "ژ" ARABIC LETTER JEH -->
+ <Key
+ latin:keyLabel="\u0632"
+ latin:moreKeys="\u0698" />
+ <!-- \u0631: "ر" ARABIC LETTER REH -->
+ <Key
+ latin:keyLabel="\u0631" />
+ <!-- \u0629: "ة" ARABIC LETTER TEH MARBUTA -->
+ <Key
+ latin:keyLabel="\u0629" />
+ <!-- \u0648: "و" ARABIC LETTER WAW
+ \u0624: "ﺅ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
+ <Key
+ latin:keyLabel="\u0648"
+ latin:moreKeys="\u0624" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight"
+ latin:visualInsetsLeft="1%p" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml/kbd_rows_azerty.xml b/java/res/xml/rows_azerty.xml
index 54fe546e3..533c683d6 100644
--- a/java/res/xml/kbd_rows_azerty.xml
+++ b/java/res/xml/rows_azerty.xml
@@ -22,58 +22,66 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="10%p"
>
<Key
latin:keyLabel="a"
latin:keyHintLabel="1"
+ latin:additionalMoreKeys="1"
latin:moreKeys="@string/more_keys_for_a" />
<Key
latin:keyLabel="z"
latin:keyHintLabel="2"
+ latin:additionalMoreKeys="2"
latin:moreKeys="@string/more_keys_for_z" />
<Key
latin:keyLabel="e"
latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
latin:moreKeys="@string/more_keys_for_e" />
<Key
latin:keyLabel="r"
latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4"
latin:moreKeys="@string/more_keys_for_r" />
<Key
latin:keyLabel="t"
latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
latin:moreKeys="@string/more_keys_for_t" />
<Key
latin:keyLabel="y"
latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
latin:moreKeys="@string/more_keys_for_y" />
<Key
latin:keyLabel="u"
latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7"
latin:moreKeys="@string/more_keys_for_u" />
<Key
latin:keyLabel="i"
latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8"
latin:moreKeys="@string/more_keys_for_i" />
<Key
latin:keyLabel="o"
latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9"
latin:moreKeys="@string/more_keys_for_o" />
<Key
latin:keyLabel="p"
latin:keyHintLabel="0"
- latin:moreKeys="@string/more_keys_for_p"
+ latin:additionalMoreKeys="0"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="10%p"
>
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
latin:keyLabel="s"
latin:moreKeys="@string/more_keys_for_s" />
@@ -107,8 +115,7 @@
latin:keyWidth="15%p"
latin:visualInsetsRight="1%p" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="x" />
<Key
@@ -123,14 +130,18 @@
<Key
latin:keyLabel="n"
latin:moreKeys="@string/more_keys_for_n" />
+ <!-- TODO: Introduce a flag, such as strinctMoreKeysOrder, to control moreKeys display
+ order more precisely. -->
+ <!-- This key is close enough to right edge, so that the 4-more keys will be displayed in
+ order of "4,3,1,2". See @string/more_keys_for_single_quote -->
<Key
latin:keyLabel="\'"
- latin:moreKeys="‘,’,‚,‛" />
+ latin:moreKeys="\u2018,\u2019,\u201b,\u201a" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
new file mode 100644
index 000000000..3a8da0485
--- /dev/null
+++ b/java/res/xml/rows_bulgarian.xml
@@ -0,0 +1,160 @@
+<?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"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="\u0447"
+ latin:keyHintLabel="1"
+ latin:additionalMoreKeys="1" />
+ <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="\u0448"
+ latin:keyHintLabel="2"
+ latin:additionalMoreKeys="2" />
+ <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="\u0435"
+ latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3" />
+ <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="\u0440"
+ latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4" />
+ <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="\u0442"
+ latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5" />
+ <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <Key
+ latin:keyLabel="\u044a"
+ latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6" />
+ <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="\u0443"
+ latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7" />
+ <!-- \u0438: "и" CYRILLIC SMALL LETTER I
+ \u045d: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
+ <Key
+ latin:keyLabel="\u0438"
+ latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8"
+ latin:moreKeys="\u045d" />
+ <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="\u043e"
+ latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9" />
+ <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="\u043f"
+ latin:keyHintLabel="0"
+ latin:additionalMoreKeys="0" />
+ <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+ <Key
+ latin:keyLabel="\u044f"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="\u0430" />
+ <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="\u0441" />
+ <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="\u0434" />
+ <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="\u0444" />
+ <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="\u0433" />
+ <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="\u0445" />
+ <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+ <Key
+ latin:keyLabel="\u0439" />
+ <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="\u043a" />
+ <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="\u043b" />
+ <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+ <Key
+ latin:keyLabel="\u0449" />
+ <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+ <Key
+ latin:keyLabel="\u044c"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="13.636%p" />
+ <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="\u0437" />
+ <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="\u0436" />
+ <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="\u0446" />
+ <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="\u0432" />
+ <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="\u0431" />
+ <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="\u043d" />
+ <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="\u043c" />
+ <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+ <Key
+ latin:keyLabel="\u044e" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml/rows_hebrew.xml b/java/res/xml/rows_hebrew.xml
new file mode 100644
index 000000000..ca18a0c23
--- /dev/null
+++ b/java/res/xml/rows_hebrew.xml
@@ -0,0 +1,143 @@
+<?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.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="10%p"
+ >
+ <!-- \u05e7: "ק" HEBREW LETTER QOF -->
+ <Key
+ latin:keyLabel="\u05e7"
+ latin:keyXPos="5%p" />
+ <!-- \u05e8: "ר" HEBREW LETTER RESH -->
+ <Key
+ latin:keyLabel="\u05e8" />
+ <!-- \u05d0: "א" HEBREW LETTER ALEF -->
+ <Key
+ latin:keyLabel="\u05d0" />
+ <!-- \u05d8: "ט" HEBREW LETTER TET -->
+ <Key
+ latin:keyLabel="\u05d8" />
+ <!-- \u05d5: "ו" HEBREW LETTER VAV -->
+ <Key
+ latin:keyLabel="\u05d5" />
+ <!-- \u05df: "ן" HEBREW LETTER FINAL NUN -->
+ <Key
+ latin:keyLabel="\u05df" />
+ <!-- \u05dd: "ם" HEBREW LETTER FINAL MEM -->
+ <Key
+ latin:keyLabel="\u05dd" />
+ <!-- \u05e4: "פ" HEBREW LETTER PE -->
+ <Key
+ latin:keyLabel="\u05e4" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight"
+ latin:visualInsetsLeft="1%p" />
+ </Row>
+ <Row
+ latin:keyWidth="10%p"
+ >
+ <!-- \u05e9: "ש" HEBREW LETTER SHIN -->
+ <Key
+ latin:keyLabel="\u05e9" />
+ <!-- \u05d3: "ד" HEBREW LETTER DALET -->
+ <Key
+ latin:keyLabel="\u05d3" />
+ <!-- \u05d2: "ג" HEBREW LETTER GIMEL
+ \u05d2\u05f3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="\u05d2"
+ latin:moreKeys="\u05d2\u05f3" />
+ <!-- \u05db: "כ" HEBREW LETTER KAF -->
+ <Key
+ latin:keyLabel="\u05db" />
+ <!-- \u05e2: "ע" HEBREW LETTER AYIN -->
+ <Key
+ latin:keyLabel="\u05e2" />
+ <!-- \u05d9: "י" HEBREW LETTER YOD
+ \u05f2\u05b7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
+ <Key
+ latin:keyLabel="\u05d9"
+ latin:moreKeys="\u05f2\u05b7" />
+ <!-- \u05d7: "ח" HEBREW LETTER HET
+ \u05d7\u05f3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="\u05d7"
+ latin:moreKeys="\u05d7\u05f3" />
+ <!-- \u05dc: "ל" HEBREW LETTER LAMED -->
+ <Key
+ latin:keyLabel="\u05dc" />
+ <!-- \u05da: "ך" HEBREW LETTER FINAL KAF -->
+ <Key
+ latin:keyLabel="\u05da" />
+ <!-- \u05e3: "ף" HEBREW LETTER FINAL PE -->
+ <Key
+ latin:keyLabel="\u05e3"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="10%p"
+ >
+ <!-- \u05d6: "ז" HEBREW LETTER ZAYIN
+ \u05d6\u05f3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="\u05d6"
+ latin:moreKeys="\u05d6\u05f3"
+ latin:keyXPos="5%p" />
+ <!-- \u05e1: "ס" HEBREW LETTER SAMEKH -->
+ <Key
+ latin:keyLabel="\u05e1" />
+ <!-- \u05d1: "ב" HEBREW LETTER BET -->
+ <Key
+ latin:keyLabel="\u05d1" />
+ <!-- \u05d4: "ה" HEBREW LETTER HE -->
+ <Key
+ latin:keyLabel="\u05d4" />
+ <!-- \u05e0: "נ" HEBREW LETTER NUN -->
+ <Key
+ latin:keyLabel="\u05e0" />
+ <!-- \u05de: "מ" HEBREW LETTER MEM -->
+ <Key
+ latin:keyLabel="\u05de" />
+ <!-- \u05e6: "צ" HEBREW LETTER TSADI
+ \u05e6\u05f3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="\u05e6"
+ latin:moreKeys="\u05e6\u05f3" />
+ <!-- \u05ea: "ת" HEBREW LETTER TAV
+ \u05ea\u05f3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="\u05ea"
+ latin:moreKeys="\u05ea\u05f3" />
+ <!-- \u05e5: "ץ" HEBREW LETTER FINAL TSADI
+ \u05e5\u05f3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="\u05e5"
+ latin:moreKeys="\u05e5\u05f3" />
+ <!-- Here is 5%p space -->
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml/rows_number.xml b/java/res/xml/rows_number.xml
new file mode 100644
index 000000000..8da83be80
--- /dev/null
+++ b/java/res/xml/rows_number.xml
@@ -0,0 +1,41 @@
+<?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.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyWidth="26.67%p"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <include
+ latin:keyboardLayout="@xml/key_styles_number" />
+ <switch>
+ <case
+ latin:passwordInput="true"
+ >
+ <include
+ latin:keyboardLayout="@xml/rows_number_password" />
+ </case>
+ <default>
+ <include
+ latin:keyboardLayout="@xml/rows_number_normal" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml
new file mode 100644
index 000000000..b581fb5cd
--- /dev/null
+++ b/java/res/xml/rows_number_normal.xml
@@ -0,0 +1,81 @@
+<?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"
+>
+ <Row>
+<Key
+ latin:keyLabel="1"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="2"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="3"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="-"
+ latin:keyStyle="numFunctionalKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <Key
+ latin:keyLabel="4"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="5"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="6"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel=","
+ latin:keyStyle="numFunctionalKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <Key
+ latin:keyLabel="7"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="8"
+ latin:keyStyle="numKeyStyle"/>
+ <Key
+ latin:keyLabel="9"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <Key
+ latin:keyStyle="numSpaceKeyStyle" />
+ <Key
+ latin:keyLabel="0"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="."
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+</merge>
diff --git a/java/res/xml/rows_number_password.xml b/java/res/xml/rows_number_password.xml
new file mode 100644
index 000000000..e4272ed3f
--- /dev/null
+++ b/java/res/xml/rows_number_password.xml
@@ -0,0 +1,62 @@
+<?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"
+>
+ <Row>
+ <Key
+ latin:keyStyle="num1KeyStyle" />
+ <Key
+ latin:keyStyle="num2KeyStyle" />
+ <Key
+ latin:keyStyle="num3KeyStyle" />
+ <Spacer />
+ </Row>
+ <Row>
+ <Key
+ latin:keyStyle="num4KeyStyle" />
+ <Key
+ latin:keyStyle="num5KeyStyle" />
+ <Key
+ latin:keyStyle="num6KeyStyle" />
+ <Spacer />
+ </Row>
+ <Row>
+ <Key
+ latin:keyStyle="num7KeyStyle" />
+ <Key
+ latin:keyStyle="num8KeyStyle" />
+ <Key
+ latin:keyStyle="num9KeyStyle" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <Spacer />
+ <Key
+ latin:keyStyle="num0KeyStyle" />
+ <Spacer />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+</merge>
diff --git a/java/res/xml/kbd_rows_phone.xml b/java/res/xml/rows_phone.xml
index 5500a6078..60296d061 100644
--- a/java/res/xml/kbd_rows_phone.xml
+++ b/java/res/xml/rows_phone.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<Key
latin:keyStyle="num1KeyStyle" />
@@ -62,13 +62,13 @@
</Row>
<Row>
<Key
- latin:keyStyle="numSwitchToAltKeyStyle" />
+ latin:keyStyle="numPhoneToSymbolKeyStyle" />
<Key
latin:keyStyle="num0KeyStyle" />
<Key
latin:keyStyle="numSpaceKeyStyle" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
</merge>
diff --git a/java/res/xml/kbd_rows_phone_shift.xml b/java/res/xml/rows_phone_symbols.xml
index 3c283d3e6..7841c56e5 100644
--- a/java/res/xml/kbd_rows_phone_shift.xml
+++ b/java/res/xml/rows_phone_symbols.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<Key
latin:keyLabel="("
@@ -42,13 +42,12 @@
</Row>
<Row>
<Key
- latin:keyLabel="N" />
+ latin:keyLabel="N"
+ latin:keyStyle="numKeyBaseStyle" />
<!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
has changed. -->
<Key
- latin:code="44"
- latin:keyLabel="@string/label_pause_key"
- latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" />
+ latin:keyStyle="numPauseKeyStyle" />
<Key
latin:keyLabel=","
latin:keyStyle="numKeyStyle" />
@@ -62,9 +61,7 @@
latin:keyStyle="numStarKeyStyle" />
<!-- Wait is a semicolon. -->
<Key
- latin:code="59"
- latin:keyLabel="@string/label_wait_key"
- latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" />
+ latin:keyStyle="numWaitKeyStyle" />
<Key
latin:keyLabel="#"
latin:keyStyle="numKeyStyle" />
@@ -74,14 +71,14 @@
</Row>
<Row>
<Key
- latin:keyStyle="numSwitchToNumericKeyStyle" />
+ latin:keyStyle="numPhoneToNumericKeyStyle" />
<Key
latin:keyLabel="+"
latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="numSpaceKeyStyle" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
</merge>
diff --git a/java/res/xml/kbd_rows_qwerty.xml b/java/res/xml/rows_qwerty.xml
index 6237712f6..71be44e31 100644
--- a/java/res/xml/kbd_rows_qwerty.xml
+++ b/java/res/xml/rows_qwerty.xml
@@ -22,13 +22,13 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_qwertz.xml b/java/res/xml/rows_qwertz.xml
index 71bb601e6..11fd9332c 100644
--- a/java/res/xml/kbd_rows_qwertz.xml
+++ b/java/res/xml/rows_qwertz.xml
@@ -22,54 +22,61 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="10%p"
>
<Key
latin:keyLabel="q"
latin:keyHintLabel="1"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="w"
latin:keyHintLabel="2"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="e"
latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
latin:moreKeys="@string/more_keys_for_e" />
<Key
latin:keyLabel="r"
latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4"
latin:moreKeys="@string/more_keys_for_r" />
<Key
latin:keyLabel="t"
latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
latin:moreKeys="@string/more_keys_for_t" />
<Key
latin:keyLabel="z"
latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
latin:moreKeys="@string/more_keys_for_z" />
<Key
latin:keyLabel="u"
latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7"
latin:moreKeys="@string/more_keys_for_u" />
<Key
latin:keyLabel="i"
latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8"
latin:moreKeys="@string/more_keys_for_i" />
<Key
latin:keyLabel="o"
latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9"
latin:moreKeys="@string/more_keys_for_o" />
<Key
latin:keyLabel="p"
latin:keyHintLabel="0"
- latin:moreKeys="@string/more_keys_for_p"
+ latin:additionalMoreKeys="0"
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<Row
latin:keyWidth="10%p"
>
@@ -101,5 +108,5 @@
latin:visualInsetsLeft="1%p" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_scandinavian.xml b/java/res/xml/rows_scandinavian.xml
index 4f138c514..f5ba96c27 100644
--- a/java/res/xml/kbd_rows_scandinavian.xml
+++ b/java/res/xml/rows_scandinavian.xml
@@ -22,52 +22,59 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.091%p"
>
<Key
latin:keyLabel="q"
latin:keyHintLabel="1"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="w"
latin:keyHintLabel="2"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="e"
latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
latin:moreKeys="@string/more_keys_for_e" />
<Key
latin:keyLabel="r"
latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4"
latin:moreKeys="@string/more_keys_for_r" />
<Key
latin:keyLabel="t"
latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
latin:moreKeys="@string/more_keys_for_t" />
<Key
latin:keyLabel="y"
latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
latin:moreKeys="@string/more_keys_for_y" />
<Key
latin:keyLabel="u"
latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7"
latin:moreKeys="@string/more_keys_for_u" />
<Key
latin:keyLabel="i"
latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8"
latin:moreKeys="@string/more_keys_for_i" />
<Key
latin:keyLabel="o"
latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9"
latin:moreKeys="@string/more_keys_for_o" />
<Key
latin:keyLabel="p"
latin:keyHintLabel="0"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:additionalMoreKeys="0" />
<Key
- latin:keyLabel="å"
+ latin:keyLabel="@string/keylabel_for_scandinavia_row1_11"
latin:keyWidth="fillRight" />
</Row>
<Row
@@ -75,8 +82,7 @@
>
<Key
latin:keyLabel="a"
- latin:moreKeys="@string/more_keys_for_a"
- latin:keyWidth="8.75%p" />
+ latin:moreKeys="@string/more_keys_for_a" />
<Key
latin:keyLabel="s"
latin:moreKeys="@string/more_keys_for_s" />
@@ -107,7 +113,7 @@
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_serbian.xml b/java/res/xml/rows_serbian.xml
new file mode 100644
index 000000000..5591ced36
--- /dev/null
+++ b/java/res/xml/rows_serbian.xml
@@ -0,0 +1,161 @@
+<?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.
+*/
+-->
+
+<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"
+ >
+ <!-- \u0459: "љ" CYRILLIC SMALL LETTER LJE -->
+ <Key
+ latin:keyLabel="\u0459"
+ latin:keyHintLabel="1"
+ latin:additionalMoreKeys="1" />
+ <!-- \u045a: "њ" CYRILLIC SMALL LETTER NJE -->
+ <Key
+ latin:keyLabel="\u045a"
+ latin:keyHintLabel="2"
+ latin:additionalMoreKeys="2" />
+ <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="\u0435"
+ latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3" />
+ <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="\u0440"
+ latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4" />
+ <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="\u0442"
+ latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5" />
+ <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="\u0437"
+ latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6" />
+ <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="\u0443"
+ latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7" />
+ <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+ <Key
+ latin:keyLabel="\u0438"
+ latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8" />
+ <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="\u043e"
+ latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9" />
+ <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="\u043f"
+ latin:keyHintLabel="0"
+ latin:additionalMoreKeys="0" />
+ <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="\u0448"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="\u0430" />
+ <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="\u0441" />
+ <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="\u0434" />
+ <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="\u0444" />
+ <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="\u0433" />
+ <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="\u0445" />
+ <!-- \u0458: "ј" CYRILLIC SMALL LETTER JE -->
+ <Key
+ latin:keyLabel="\u0458" />
+ <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="\u043a" />
+ <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="\u043b" />
+ <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="\u0447" />
+ <!-- \u045b: "ћ" CYRILLIC SMALL LETTER TSHE -->
+ <Key
+ latin:keyLabel="\u045b"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="8.5%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="11.75%p" />
+ <!-- \u0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
+ <Key
+ latin:keyLabel="\u0455" />
+ <!-- \u045f: "џ" CYRILLIC SMALL LETTER DZHE -->
+ <Key
+ latin:keyLabel="\u045f" />
+ <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="\u0446" />
+ <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="\u0432" />
+ <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="\u0431" />
+ <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="\u043d" />
+ <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="\u043c" />
+ <!-- \u0452: "ђ" CYRILLIC SMALL LETTER DJE -->
+ <Key
+ latin:keyLabel="\u0452" />
+ <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="\u0436" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml/rows_slavic.xml b/java/res/xml/rows_slavic.xml
new file mode 100644
index 000000000..4472f8efd
--- /dev/null
+++ b/java/res/xml/rows_slavic.xml
@@ -0,0 +1,165 @@
+<?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.
+*/
+-->
+
+<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"
+ >
+ <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+ <Key
+ latin:keyLabel="\u0439"
+ latin:keyHintLabel="1"
+ latin:additionalMoreKeys="1" />
+ <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="\u0446"
+ latin:keyHintLabel="2"
+ latin:additionalMoreKeys="2" />
+ <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="\u0443"
+ latin:keyHintLabel="3"
+ latin:additionalMoreKeys="3"
+ latin:moreKeys="@string/more_keys_for_slavic_u" />
+ <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="\u043a"
+ latin:keyHintLabel="4"
+ latin:additionalMoreKeys="4" />
+ <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="\u0435"
+ latin:keyHintLabel="5"
+ latin:additionalMoreKeys="5"
+ latin:moreKeys="@string/more_keys_for_slavic_ye" />
+ <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="\u043d"
+ latin:keyHintLabel="6"
+ latin:additionalMoreKeys="6"
+ latin:moreKeys="@string/more_keys_for_slavic_en" />
+ <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="\u0433"
+ latin:keyHintLabel="7"
+ latin:additionalMoreKeys="7" />
+ <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="\u0448"
+ latin:keyHintLabel="8"
+ latin:additionalMoreKeys="8" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_shcha"
+ latin:keyHintLabel="9"
+ latin:additionalMoreKeys="9" />
+ <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="\u0437"
+ latin:keyHintLabel="0"
+ latin:additionalMoreKeys="0" />
+ <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="\u0445"
+ latin:moreKeys="@string/more_keys_for_slavic_ha"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="\u0444" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_yery"
+ latin:moreKeys="@string/more_keys_for_slavic_yery" />
+ <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="\u0432" />
+ <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="\u0430" />
+ <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="\u043f" />
+ <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="\u0440" />
+ <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="\u043e"
+ latin:moreKeys="@string/more_keys_for_slavic_o" />
+ <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="\u043b" />
+ <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="\u0434" />
+ <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="\u0436" />
+ <!-- \u044d: "э" CYRILLIC SMALL LETTER E -->
+ <Key
+ latin:keyLabel="\u044d"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="8.5%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="11.75%p" />
+ <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+ <Key
+ latin:keyLabel="\u044f" />
+ <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="\u0447" />
+ <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="\u0441" />
+ <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="\u043c" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_i" />
+ <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="\u0442" />
+ <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+ <Key
+ latin:keyLabel="\u044c"
+ latin:moreKeys="@string/more_keys_for_slavic_soft_sign" />
+ <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="\u0431" />
+ <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+ <Key
+ latin:keyLabel="\u044e" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml/kbd_rows_spanish.xml b/java/res/xml/rows_spanish.xml
index 03d631ee0..5fc2a00b9 100644
--- a/java/res/xml/kbd_rows_spanish.xml
+++ b/java/res/xml/rows_spanish.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<Row
latin:keyWidth="10%p"
>
@@ -52,11 +52,12 @@
<Key
latin:keyLabel="l"
latin:moreKeys="@string/more_keys_for_l" />
+ <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
<Key
- latin:keyLabel="ñ" />
+ latin:keyLabel="\u00f1" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_symbols.xml b/java/res/xml/rows_symbols.xml
index c5bcb14c3..81a9a4602 100644
--- a/java/res/xml/kbd_rows_symbols.xml
+++ b/java/res/xml/rows_symbols.xml
@@ -22,41 +22,51 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="10%p"
>
<Key
latin:keyLabel="@string/keylabel_for_symbols_1"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_1"
latin:moreKeys="@string/more_keys_for_symbols_1" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_2"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_2"
latin:moreKeys="@string/more_keys_for_symbols_2" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_3"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_3"
latin:moreKeys="@string/more_keys_for_symbols_3" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_4"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_4"
latin:moreKeys="@string/more_keys_for_symbols_4" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_5"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_5"
latin:moreKeys="@string/more_keys_for_symbols_5" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_6"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_6"
latin:moreKeys="@string/more_keys_for_symbols_6" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_7"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_7"
latin:moreKeys="@string/more_keys_for_symbols_7" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_8"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_8"
latin:moreKeys="@string/more_keys_for_symbols_8" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_9"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_9"
latin:moreKeys="@string/more_keys_for_symbols_9" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_0"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_0"
latin:moreKeys="@string/more_keys_for_symbols_0"
latin:keyWidth="fillRight" />
</Row>
@@ -83,13 +93,8 @@
<Key
latin:keyLabel="+"
latin:moreKeys="@string/more_keys_for_plus" />
- <Key
- latin:keyLabel="("
- latin:moreKeys="@string/more_keys_for_left_parenthesis" />
- <Key
- latin:keyLabel=")"
- latin:moreKeys="@string/more_keys_for_right_parenthesis"
- latin:keyWidth="fillRight" />
+ <include
+ latin:keyboardLayout="@xml/keys_parentheses" />
</Row>
<Row
latin:keyWidth="10%p"
@@ -101,15 +106,13 @@
<Key
latin:keyLabel="!"
latin:moreKeys="¡" />
- <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
- <!-- latin:moreKeys="“,”,„,‟,«,»" -->
<Key
latin:keyLabel="&quot;"
- latin:moreKeys="“,”,«,»"
- latin:maxMoreKeysColumn="6" />
+ latin:moreKeys="@string/more_keys_for_double_quote"
+ latin:maxMoreKeysColumn="4" />
<Key
latin:keyLabel="\'"
- latin:moreKeys="‘,’,‚,‛" />
+ latin:moreKeys="@string/more_keys_for_single_quote" />
<Key
latin:keyLabel=":" />
<Key
@@ -126,5 +129,5 @@
latin:visualInsetsLeft="1%p" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_symbols_row4" />
+ latin:keyboardLayout="@xml/row_symbols4" />
</merge>
diff --git a/java/res/xml/kbd_rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
index 91654b04b..168fc9ef9 100644
--- a/java/res/xml/kbd_rows_symbols_shift.xml
+++ b/java/res/xml/rows_symbols_shift.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="10%p"
>
@@ -34,23 +34,25 @@
latin:keyLabel="`" />
<Key
latin:keyLabel="|" />
+ <!-- \u2022: "•" BULLET -->
<Key
- latin:keyLabel="•"
+ latin:keyLabel="\u2022"
latin:moreKeys="@string/more_keys_for_bullet" />
+ <!-- \u221a: "√" SQUARE ROOT -->
<Key
- latin:keyLabel="√" />
+ latin:keyLabel="\u221a" />
+ <!-- \u03c0: "π" GREEK SMALL LETTER PI -->
<Key
- latin:keyLabel="π"
+ latin:keyLabel="\u03c0"
latin:moreKeys="Π" />
+ <!-- \u00f7: "÷" DIVISION SIGN -->
<Key
- latin:keyLabel="÷" />
+ latin:keyLabel="\u00f7" />
+ <!-- \u00d7: "×" MULTIPLICATION SIGN -->
<Key
- latin:keyLabel="×" />
- <Key
- latin:keyLabel="{" />
- <Key
- latin:keyLabel="}"
- latin:keyWidth="fillRight" />
+ latin:keyLabel="\u00d7" />
+ <include
+ latin:keyboardLayout="@xml/keys_curly_brackets" />
</Row>
<Row
latin:keyWidth="10%p"
@@ -63,22 +65,29 @@
latin:keyStyle="moreCurrency2KeyStyle" />
<Key
latin:keyStyle="moreCurrency3KeyStyle" />
+ <!-- \u00b0: "°" DEGREE SIGN
+ \u2032: "′" PRIME
+ \u2033: "″" DOUBLE PRIME -->
<Key
- latin:keyLabel="°"
- latin:moreKeys="′,″" />
+ latin:keyLabel="\u00b0"
+ latin:moreKeys="\u2032,\u2033" />
+ <!-- \u2191: "↑" UPWARDS ARROW
+ \u2193: "↓" DOWNWARDS ARROW
+ \u2190: "←" LEFTWARDS ARROW
+ \u2192: "→" RIGHTWARDS ARROW -->
<Key
latin:keyLabel="^"
- latin:moreKeys="↑,↓,←,→" />
+ latin:moreKeys="\u2191,\u2193,\u2190,\u2192" />
<Key
latin:keyLabel="_" />
+ <!-- \u2260: "≠" NOT EQUAL TO
+ \u2248: "≈" ALMOST EQUAL TO
+ \u221e: "∞" INFINITY -->
<Key
latin:keyLabel="="
- latin:moreKeys="≠,≈,∞" />
- <Key
- latin:keyLabel="[" />
- <Key
- latin:keyLabel="]"
- latin:keyWidth="fillRight" />
+ latin:moreKeys="\u2260,\u2248,\u221e" />
+ <include
+ latin:keyboardLayout="@xml/keys_square_brackets" />
</Row>
<Row
latin:keyWidth="10%p"
@@ -87,28 +96,29 @@
latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyWidth="15%p"
latin:visualInsetsRight="1%p" />
+ <!-- \u2122: "™" TRADE MARK SIGN -->
<Key
- latin:keyLabel="™" />
+ latin:keyLabel="\u2122" />
+ <!-- \u00ae: "®" REGISTERED SIGN -->
<Key
- latin:keyLabel="®" />
+ latin:keyLabel="\u00ae" />
+ <!-- \u00a9: "©" COPYRIGHT SIGN -->
<Key
- latin:keyLabel="©" />
+ latin:keyLabel="\u00a9" />
+ <!-- \u00b6: "¶" PILCROW SIGN
+ \u00a7: "§" SECTION SIGN -->
<Key
- latin:keyLabel="¶"
- latin:moreKeys="§" />
+ latin:keyLabel="\u00b6"
+ latin:moreKeys="\u00a7" />
<Key
latin:keyLabel="\\" />
- <Key
- latin:keyLabel="&lt;"
- latin:moreKeys="≤,«,‹" />
- <Key
- latin:keyLabel="&gt;"
- latin:moreKeys="≥,»,›" />
+ <include
+ latin:keyboardLayout="@xml/keys_less_greater" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_symbols_shift_row4" />
+ latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>
diff --git a/java/res/xml/spell_checker_settings.xml b/java/res/xml/spell_checker_settings.xml
index f402555c9..222b98b6b 100644
--- a/java/res/xml/spell_checker_settings.xml
+++ b/java/res/xml/spell_checker_settings.xml
@@ -18,9 +18,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/android_spell_checker_settings">
<CheckBoxPreference
- android:key="use_proximity"
- android:title="@string/use_proximity_option_title"
- android:summary="@string/use_proximity_option_summary"
+ android:key="pref_spellcheck_use_contacts"
+ android:title="@string/use_contacts_for_spellchecking_option_title"
+ android:summary="@string/use_contacts_for_spellchecking_option_summary"
android:persistent="true"
android:defaultValue="true" />
</PreferenceScreen>
diff --git a/java/res/xml/spellchecker.xml b/java/res/xml/spellchecker.xml
index 30fac5b20..b48dc52cd 100644
--- a/java/res/xml/spellchecker.xml
+++ b/java/res/xml/spellchecker.xml
@@ -21,7 +21,8 @@
<!-- for the spell checker -->
<spell-checker xmlns:android="http://schemas.android.com/apk/res/android"
- android:label="@string/spell_checker_service_name">
+ android:label="@string/spell_checker_service_name"
+ android:settingsActivity="com.android.inputmethod.latin.spellcheck.SpellCheckerSettingsActivity">
<subtype
android:label="@string/subtype_generic"
android:subtypeLocale="en"
@@ -42,4 +43,16 @@
android:label="@string/subtype_generic"
android:subtypeLocale="es"
/>
+ <subtype
+ android:label="@string/subtype_generic"
+ android:subtypeLocale="ru"
+ />
+ <subtype
+ android:label="@string/subtype_generic"
+ android:subtypeLocale="cs"
+ />
+ <subtype
+ android:label="@string/subtype_generic"
+ android:subtypeLocale="nl"
+ />
</spell-checker>