diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-20 08:39:11 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-04-20 15:48:30 +0900 |
| commit | 6bfd5f631908c4afd893c9b25b353e5e16c5fc0c (patch) | |
| tree | 9dc066fff7aa501872f201fd31e337772eeb0f79 /java/res | |
| parent | cf41aff251ecc94b729307ede05208a104fcd8b0 (diff) | |
| download | latinime-6bfd5f631908c4afd893c9b25b353e5e16c5fc0c.tar.gz latinime-6bfd5f631908c4afd893c9b25b353e5e16c5fc0c.tar.xz latinime-6bfd5f631908c4afd893c9b25b353e5e16c5fc0c.zip | |
Fix confusable "label" usage, use "text" instead
* Rename makelabel tool to maketext
* Rename KeyboardLablesSet class to KeyboardTextsSet
* Rename "!label/name" to "!text/name"
Change-Id: Ia9494a89fe56f20ca8e8fedb253adbcf8b771bd3
Diffstat (limited to 'java/res')
44 files changed, 202 insertions, 202 deletions
diff --git a/java/res/xml-sw600dp/key_shortcut.xml b/java/res/xml-sw600dp/key_shortcut.xml index 2114c67bd..f8cbdf6b6 100644 --- a/java/res/xml-sw600dp/key_shortcut.xml +++ b/java/res/xml-sw600dp/key_shortcut.xml @@ -29,7 +29,7 @@ <Key latin:keyStyle="shortcutKeyStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!label/settings_as_more_key" + latin:moreKeys="!text/settings_as_more_key" latin:keyWidth="fillBoth" /> </case> <case diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index d2e523f11..54ec5483e 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -92,7 +92,7 @@ latin:keyLabel=":-)" latin:keyOutputText=":-) " latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!label/more_keys_for_smiley" /> + latin:moreKeys="!text/more_keys_for_smiley" /> <key-style latin:styleName="shortcutKeyStyle" latin:code="!code/key_shortcut" @@ -130,32 +130,32 @@ <key-style latin:styleName="toSymbolKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!label/label_to_symbol_key" + latin:keyLabel="!text/label_to_symbol_key" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="toAlphaKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!label/label_to_alpha_key" + latin:keyLabel="!text/label_to_alpha_key" latin:keyLabelFlags="preserveCase" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="toMoreSymbolKeyStyle" latin:code="!code/key_shift" - latin:keyLabel="!label/label_to_more_symbol_for_tablet_key" + latin:keyLabel="!text/label_to_more_symbol_for_tablet_key" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="backFromMoreSymbolKeyStyle" latin:code="!code/key_shift" - latin:keyLabel="!label/label_to_symbol_key" + latin:keyLabel="!text/label_to_symbol_key" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="comKeyStyle" - latin:keyLabel="!label/keylabel_for_popular_domain" + latin:keyLabel="!text/keylabel_for_popular_domain" latin:keyLabelFlags="fontNormal|hasPopupHint|preserveCase" - latin:keyOutputText="!label/keylabel_for_popular_domain" - latin:moreKeys="!label/more_keys_for_popular_domain" /> + latin:keyOutputText="!text/keylabel_for_popular_domain" + latin:moreKeys="!text/more_keys_for_popular_domain" /> </merge> diff --git a/java/res/xml-sw600dp/keys_apostrophe_dash.xml b/java/res/xml-sw600dp/keys_apostrophe_dash.xml index faaae50c9..badc6e516 100644 --- a/java/res/xml-sw600dp/keys_apostrophe_dash.xml +++ b/java/res/xml-sw600dp/keys_apostrophe_dash.xml @@ -39,9 +39,9 @@ </case> <default> <Key - latin:keyLabel="!label/keylabel_for_apostrophe" - latin:keyHintLabel="!label/keyhintlabel_for_apostrophe" - latin:moreKeys="!label/more_keys_for_apostrophe" + latin:keyLabel="!text/keylabel_for_apostrophe" + latin:keyHintLabel="!text/keyhintlabel_for_apostrophe" + latin:moreKeys="!text/more_keys_for_apostrophe" latin:keyStyle="hasShiftedLetterHintStyle" /> </default> </switch> @@ -54,9 +54,9 @@ </case> <default> <Key - latin:keyLabel="!label/keylabel_for_dash" - latin:keyHintLabel="!label/keyhintlabel_for_dash" - latin:moreKeys="!label/more_keys_for_dash" + latin:keyLabel="!text/keylabel_for_dash" + latin:keyHintLabel="!text/keyhintlabel_for_dash" + latin:moreKeys="!text/more_keys_for_dash" latin:keyStyle="hasShiftedLetterHintStyle" /> </default> </switch> diff --git a/java/res/xml-sw600dp/keys_comma_period.xml b/java/res/xml-sw600dp/keys_comma_period.xml index 4a83cc817..752f75b5f 100644 --- a/java/res/xml-sw600dp/keys_comma_period.xml +++ b/java/res/xml-sw600dp/keys_comma_period.xml @@ -32,14 +32,14 @@ </case> <default> <Key - latin:keyLabel="!label/keylabel_for_tablet_comma" - latin:keyHintLabel="!label/keyhintlabel_for_tablet_comma" - latin:moreKeys="!label/more_keys_for_tablet_comma" + latin:keyLabel="!text/keylabel_for_tablet_comma" + latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma" + latin:moreKeys="!text/more_keys_for_tablet_comma" latin:keyStyle="hasShiftedLetterHintStyle" /> <Key latin:keyLabel="." - latin:keyHintLabel="!label/keyhintlabel_for_tablet_period" - latin:moreKeys="!label/more_keys_for_tablet_period" + latin:keyHintLabel="!text/keyhintlabel_for_tablet_period" + latin:moreKeys="!text/more_keys_for_tablet_period" latin:keyStyle="hasShiftedLetterHintStyle" /> </default> </switch> diff --git a/java/res/xml-sw600dp/rowkeys_symbols2.xml b/java/res/xml-sw600dp/rowkeys_symbols2.xml index fd774168f..6fe86240c 100644 --- a/java/res/xml-sw600dp/rowkeys_symbols2.xml +++ b/java/res/xml-sw600dp/rowkeys_symbols2.xml @@ -26,13 +26,13 @@ <Key latin:keyStyle="currencyKeyStyle" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_percent" - latin:moreKeys="!label/more_keys_for_symbols_percent" /> + latin:keyLabel="!text/keylabel_for_symbols_percent" + latin:moreKeys="!text/more_keys_for_symbols_percent" /> <Key latin:keyLabel="&" /> <Key latin:keyLabel="*" - latin:moreKeys="!label/more_keys_for_star" /> + latin:moreKeys="!text/more_keys_for_star" /> <!-- U+2013: "–" EN DASH U+2014: "—" EM DASH --> <Key @@ -40,7 +40,7 @@ latin:moreKeys="_,–,—" /> <Key latin:keyLabel="+" - latin:moreKeys="!label/more_keys_for_plus" /> + latin:moreKeys="!text/more_keys_for_plus" /> <include latin:keyboardLayout="@xml/keys_parentheses" /> </merge> diff --git a/java/res/xml-sw600dp/rowkeys_symbols3.xml b/java/res/xml-sw600dp/rowkeys_symbols3.xml index 536ac05a2..4eb9618cf 100644 --- a/java/res/xml-sw600dp/rowkeys_symbols3.xml +++ b/java/res/xml-sw600dp/rowkeys_symbols3.xml @@ -41,11 +41,11 @@ </default> </switch> <Key - latin:keyLabel="!label/keylabel_for_symbols_semicolon" - latin:moreKeys="!label/more_keys_for_symbols_semicolon" /> + latin:keyLabel="!text/keylabel_for_symbols_semicolon" + latin:moreKeys="!text/more_keys_for_symbols_semicolon" /> <Key - latin:keyLabel="!label/keylabel_for_comma" - latin:moreKeys="!label/more_keys_for_comma" /> + latin:keyLabel="!text/keylabel_for_comma" + latin:moreKeys="!text/more_keys_for_comma" /> <Key latin:keyLabel="." /> <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK --> @@ -53,6 +53,6 @@ latin:keyLabel="!" latin:moreKeys="¡" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_question" - latin:moreKeys="!label/more_keys_for_symbols_question" /> + latin:keyLabel="!text/keylabel_for_symbols_question" + latin:moreKeys="!text/more_keys_for_symbols_question" /> </merge> diff --git a/java/res/xml-sw600dp/rowkeys_symbols_shift1.xml b/java/res/xml-sw600dp/rowkeys_symbols_shift1.xml index 914a4499b..3549fdda4 100644 --- a/java/res/xml-sw600dp/rowkeys_symbols_shift1.xml +++ b/java/res/xml-sw600dp/rowkeys_symbols_shift1.xml @@ -30,7 +30,7 @@ <!-- U+2022: "•" BULLET --> <Key latin:keyLabel="•" - latin:moreKeys="!label/more_keys_for_bullet" /> + latin:moreKeys="!text/more_keys_for_bullet" /> <!-- U+221A: "√" SQUARE ROOT --> <Key latin:keyLabel="√" /> diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml index 00fda2899..3fda2aa13 100644 --- a/java/res/xml-sw600dp/rows_number_normal.xml +++ b/java/res/xml-sw600dp/rows_number_normal.xml @@ -70,7 +70,7 @@ <Key latin:keyLabel="," latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!label/more_keys_for_am_pm" + latin:moreKeys="!text/more_keys_for_am_pm" latin:keyStyle="numKeyStyle" latin:keyWidth="9.25%p" /> </case> diff --git a/java/res/xml-sw600dp/rows_symbols4.xml b/java/res/xml-sw600dp/rows_symbols4.xml index afa2652ea..baa090c24 100644 --- a/java/res/xml-sw600dp/rows_symbols4.xml +++ b/java/res/xml-sw600dp/rows_symbols4.xml @@ -37,7 +37,7 @@ latin:keyWidth="39.750%p" /> <Key latin:keyLabel=""" - latin:moreKeys="!label/more_keys_for_tablet_double_quote" /> + latin:moreKeys="!text/more_keys_for_tablet_double_quote" /> <Key latin:keyLabel="_" /> <Spacer diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml index f4cca30d9..6cb160b6a 100644 --- a/java/res/xml-sw768dp/key_styles_common.xml +++ b/java/res/xml-sw768dp/key_styles_common.xml @@ -91,7 +91,7 @@ latin:keyLabel=":-)" latin:keyOutputText=":-) " latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!label/more_keys_for_smiley" /> + latin:moreKeys="!text/more_keys_for_smiley" /> <key-style latin:styleName="shortcutKeyStyle" latin:code="!code/key_shortcut" @@ -113,7 +113,7 @@ <key-style latin:styleName="tabKeyStyle" latin:code="!code/key_action_previous" - latin:keyLabel="!label/label_tab_key" + latin:keyLabel="!text/label_tab_key" latin:keyLabelFlags="fontNormal|preserveCase" latin:backgroundType="functional" /> </case> @@ -121,7 +121,7 @@ <key-style latin:styleName="tabKeyStyle" latin:code="!code/key_tab" - latin:keyLabel="!label/label_tab_key" + latin:keyLabel="!text/label_tab_key" latin:keyLabelFlags="fontNormal|preserveCase" latin:backgroundType="functional" /> </default> @@ -129,35 +129,35 @@ <key-style latin:styleName="toSymbolKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!label/label_to_symbol_key" + latin:keyLabel="!text/label_to_symbol_key" latin:keyLabelFlags="fontNormal" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="toAlphaKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!label/label_to_alpha_key" + latin:keyLabel="!text/label_to_alpha_key" latin:keyLabelFlags="fontNormal|preserveCase" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="toMoreSymbolKeyStyle" latin:code="!code/key_shift" - latin:keyLabel="!label/label_to_more_symbol_for_tablet_key" + latin:keyLabel="!text/label_to_more_symbol_for_tablet_key" latin:keyLabelFlags="fontNormal" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="backFromMoreSymbolKeyStyle" latin:code="!code/key_shift" - latin:keyLabel="!label/label_to_symbol_key" + latin:keyLabel="!text/label_to_symbol_key" latin:keyLabelFlags="fontNormal" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="comKeyStyle" - latin:keyLabel="!label/keylabel_for_popular_domain" + latin:keyLabel="!text/keylabel_for_popular_domain" latin:keyLabelFlags="fontNormal|hasPopupHint|preserveCase" - latin:keyOutputText="!label/keylabel_for_popular_domain" - latin:moreKeys="!label/more_keys_for_popular_domain" /> + latin:keyOutputText="!text/keylabel_for_popular_domain" + latin:moreKeys="!text/more_keys_for_popular_domain" /> </merge> diff --git a/java/res/xml-sw768dp/keys_apostrophe_dash.xml b/java/res/xml-sw768dp/keys_apostrophe_dash.xml index faaae50c9..badc6e516 100644 --- a/java/res/xml-sw768dp/keys_apostrophe_dash.xml +++ b/java/res/xml-sw768dp/keys_apostrophe_dash.xml @@ -39,9 +39,9 @@ </case> <default> <Key - latin:keyLabel="!label/keylabel_for_apostrophe" - latin:keyHintLabel="!label/keyhintlabel_for_apostrophe" - latin:moreKeys="!label/more_keys_for_apostrophe" + latin:keyLabel="!text/keylabel_for_apostrophe" + latin:keyHintLabel="!text/keyhintlabel_for_apostrophe" + latin:moreKeys="!text/more_keys_for_apostrophe" latin:keyStyle="hasShiftedLetterHintStyle" /> </default> </switch> @@ -54,9 +54,9 @@ </case> <default> <Key - latin:keyLabel="!label/keylabel_for_dash" - latin:keyHintLabel="!label/keyhintlabel_for_dash" - latin:moreKeys="!label/more_keys_for_dash" + latin:keyLabel="!text/keylabel_for_dash" + latin:keyHintLabel="!text/keyhintlabel_for_dash" + latin:moreKeys="!text/more_keys_for_dash" latin:keyStyle="hasShiftedLetterHintStyle" /> </default> </switch> diff --git a/java/res/xml-sw768dp/rows_number_normal.xml b/java/res/xml-sw768dp/rows_number_normal.xml index f868cbb8b..0d75a37d2 100644 --- a/java/res/xml-sw768dp/rows_number_normal.xml +++ b/java/res/xml-sw768dp/rows_number_normal.xml @@ -72,7 +72,7 @@ <Key latin:keyLabel="," latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!label/more_keys_for_am_pm" + latin:moreKeys="!text/more_keys_for_am_pm" latin:keyStyle="numKeyStyle" latin:keyWidth="8.047%p" /> </case> diff --git a/java/res/xml-sw768dp/rows_symbols4.xml b/java/res/xml-sw768dp/rows_symbols4.xml index dd1647b95..ecb1259d1 100644 --- a/java/res/xml-sw768dp/rows_symbols4.xml +++ b/java/res/xml-sw768dp/rows_symbols4.xml @@ -37,7 +37,7 @@ latin:keyWidth="37.500%p" /> <Key latin:keyLabel=""" - latin:moreKeys="!label/more_keys_for_tablet_double_quote" /> + latin:moreKeys="!text/more_keys_for_tablet_double_quote" /> <Key latin:keyLabel="_" /> <switch> diff --git a/java/res/xml/key_azerty_quote.xml b/java/res/xml/key_azerty_quote.xml index b8c51d30f..65789ea69 100644 --- a/java/res/xml/key_azerty_quote.xml +++ b/java/res/xml/key_azerty_quote.xml @@ -31,7 +31,7 @@ <default> <Key latin:keyLabel="\'" - latin:moreKeys="!label/more_keys_for_single_quote" /> + latin:moreKeys="!text/more_keys_for_single_quote" /> </default> </switch> </merge> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 35abb4fba..4341b7903 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -35,7 +35,7 @@ <key-style latin:styleName="f1MoreKeysStyle" latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!label/settings_as_more_key" + latin:moreKeys="!text/settings_as_more_key" latin:backgroundType="functional" /> </default> </switch> @@ -98,7 +98,7 @@ latin:keyLabel=":-)" latin:keyOutputText=":-) " latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!label/more_keys_for_smiley" + latin:moreKeys="!text/more_keys_for_smiley" latin:backgroundType="functional" /> </case> </switch> @@ -157,7 +157,7 @@ latin:styleName="toSymbolKeyStyle" latin:code="!code/key_switch_alpha_symbol" latin:keyIcon="!icon/shortcut_for_label" - latin:keyLabel="!label/label_to_symbol_with_microphone_key" + latin:keyLabel="!text/label_to_symbol_with_microphone_key" latin:keyLabelFlags="withIconRight" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> @@ -166,7 +166,7 @@ <key-style latin:styleName="toSymbolKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!label/label_to_symbol_key" + latin:keyLabel="!text/label_to_symbol_key" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> </default> @@ -174,27 +174,27 @@ <key-style latin:styleName="toAlphaKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!label/label_to_alpha_key" + latin:keyLabel="!text/label_to_alpha_key" latin:keyLabelFlags="preserveCase" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="toMoreSymbolKeyStyle" latin:code="!code/key_shift" - latin:keyLabel="!label/label_to_more_symbol_key" + latin:keyLabel="!text/label_to_more_symbol_key" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="backFromMoreSymbolKeyStyle" latin:code="!code/key_shift" - latin:keyLabel="!label/label_to_symbol_key" + latin:keyLabel="!text/label_to_symbol_key" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="punctuationKeyStyle" latin:keyLabel="." - latin:keyHintLabel="!label/keyhintlabel_for_punctuation" + latin:keyHintLabel="!text/keyhintlabel_for_punctuation" latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!label/more_keys_for_punctuation" + latin:moreKeys="!text/more_keys_for_punctuation" latin:backgroundType="functional" /> </merge> diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_styles_currency.xml index 6057d5bd7..d5c6a87b9 100644 --- a/java/res/xml/key_styles_currency.xml +++ b/java/res/xml/key_styles_currency.xml @@ -86,7 +86,7 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="₪" - latin:moreKeys="!label/more_keys_for_currency_general" /> + latin:moreKeys="!text/more_keys_for_currency_general" /> <key-style latin:styleName="moreCurrency1KeyStyle" latin:keyLabel="£" /> @@ -112,7 +112,7 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="﷼" - latin:moreKeys="!label/more_keys_for_currency_general" /> + latin:moreKeys="!text/more_keys_for_currency_general" /> <key-style latin:styleName="moreCurrency1KeyStyle" latin:keyLabel="£" /> @@ -138,7 +138,7 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="£" - latin:moreKeys="!label/more_keys_for_currency_pound" /> + latin:moreKeys="!text/more_keys_for_currency_pound" /> <key-style latin:styleName="moreCurrency1KeyStyle" latin:keyLabel="€" /> diff --git a/java/res/xml/key_styles_currency_dollar.xml b/java/res/xml/key_styles_currency_dollar.xml index 704970a56..674a3966d 100644 --- a/java/res/xml/key_styles_currency_dollar.xml +++ b/java/res/xml/key_styles_currency_dollar.xml @@ -26,7 +26,7 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="$" - latin:moreKeys="!label/more_keys_for_currency_dollar" /> + latin:moreKeys="!text/more_keys_for_currency_dollar" /> <key-style latin:styleName="moreCurrency1KeyStyle" latin:keyLabel="£" /> diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index 88777dca3..be5be1bf9 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml @@ -30,7 +30,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!label/action_previous_as_more_key" /> + latin:moreKeys="!text/action_previous_as_more_key" /> </case> <case latin:imeAction="actionNext" @@ -46,7 +46,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!label/action_next_as_more_key" /> + latin:moreKeys="!text/action_next_as_more_key" /> </case> <case latin:imeAction="actionPrevious" @@ -63,7 +63,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!label/action_previous_as_more_key,!label/action_next_as_more_key" /> + latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" /> </case> <case latin:navigateNext="true" @@ -72,7 +72,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!label/action_next_as_more_key" /> + latin:moreKeys="!text/action_next_as_more_key" /> </case> <case latin:navigateNext="false" @@ -81,7 +81,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!label/action_previous_as_more_key" /> + latin:moreKeys="!text/action_previous_as_more_key" /> </case> <!-- naviagteNext="false" and navigatePrevious="false" --> <default> @@ -119,7 +119,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="!label/label_go_key" + latin:keyLabel="!text/label_go_key" latin:parentStyle="defaultActionKeyStyle" /> </case> <case @@ -127,7 +127,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="!label/label_next_key" + latin:keyLabel="!text/label_next_key" latin:parentStyle="defaultActionKeyStyle" /> </case> <case @@ -135,7 +135,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="!label/label_previous_key" + latin:keyLabel="!text/label_previous_key" latin:parentStyle="defaultActionKeyStyle" /> </case> <case @@ -143,7 +143,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="!label/label_done_key" + latin:keyLabel="!text/label_done_key" latin:parentStyle="defaultActionKeyStyle" /> </case> <case @@ -151,7 +151,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="!label/label_send_key" + latin:keyLabel="!text/label_send_key" latin:parentStyle="defaultActionKeyStyle" /> </case> <case diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml index 1b029216d..b8301bc49 100644 --- a/java/res/xml/key_styles_number.xml +++ b/java/res/xml/key_styles_number.xml @@ -100,25 +100,25 @@ <key-style latin:styleName="numPhoneToSymbolKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!label/label_to_phone_symbols_key" + latin:keyLabel="!text/label_to_phone_symbols_key" latin:parentStyle="numModeKeyStyle" /> <key-style latin:styleName="numPhoneToNumericKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!label/label_to_phone_numeric_key" + latin:keyLabel="!text/label_to_phone_numeric_key" latin:parentStyle="numModeKeyStyle" /> <!-- U+002C: "," COMMA --> <key-style latin:styleName="numPauseKeyStyle" latin:code="0x002C" - latin:keyLabel="!label/label_pause_key" + latin:keyLabel="!text/label_pause_key" latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale" latin:parentStyle="numKeyBaseStyle" /> <!-- U+003B: ";" SEMICOLON --> <key-style latin:styleName="numWaitKeyStyle" latin:code="0x003B" - latin:keyLabel="!label/label_wait_key" + latin:keyLabel="!text/label_wait_key" latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale" latin:parentStyle="numKeyBaseStyle" /> <key-style diff --git a/java/res/xml/keys_less_greater.xml b/java/res/xml/keys_less_greater.xml index 7c154cb0d..4584e5c96 100644 --- a/java/res/xml/keys_less_greater.xml +++ b/java/res/xml/keys_less_greater.xml @@ -24,9 +24,9 @@ <Key latin:keyLabel="<" latin:code="!code/key_less_than" - latin:moreKeys="!label/more_keys_for_less_than" /> + latin:moreKeys="!text/more_keys_for_less_than" /> <Key latin:keyLabel=">" latin:code="!code/key_greater_than" - latin:moreKeys="!label/more_keys_for_greater_than" /> + latin:moreKeys="!text/more_keys_for_greater_than" /> </merge> diff --git a/java/res/xml/keys_parentheses.xml b/java/res/xml/keys_parentheses.xml index 17d72859c..25e89c930 100644 --- a/java/res/xml/keys_parentheses.xml +++ b/java/res/xml/keys_parentheses.xml @@ -24,9 +24,9 @@ <Key latin:keyLabel="(" latin:code="!code/key_left_parenthesis" - latin:moreKeys="!label/more_keys_for_left_parenthesis" /> + latin:moreKeys="!text/more_keys_for_left_parenthesis" /> <Key latin:keyLabel=")" latin:code="!code/key_right_parenthesis" - latin:moreKeys="!label/more_keys_for_right_parenthesis" /> + latin:moreKeys="!text/more_keys_for_right_parenthesis" /> </merge> diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml index c08518079..343e3eec9 100644 --- a/java/res/xml/row_qwerty4.xml +++ b/java/res/xml/row_qwerty4.xml @@ -51,9 +51,9 @@ <!-- latin:hasShortcutKey="false" --> <default> <Key - latin:keyLabel="!label/keylabel_for_comma" + latin:keyLabel="!text/keylabel_for_comma" latin:keyLabelFlags="hasPopupHint" - latin:additionalMoreKeys="!label/more_keys_for_comma" + latin:additionalMoreKeys="!text/more_keys_for_comma" latin:keyStyle="f1MoreKeysStyle" /> </default> </switch> diff --git a/java/res/xml/rowkeys_azerty1.xml b/java/res/xml/rowkeys_azerty1.xml index 50a0162de..42b27463f 100644 --- a/java/res/xml/rowkeys_azerty1.xml +++ b/java/res/xml/rowkeys_azerty1.xml @@ -25,47 +25,47 @@ latin:keyLabel="a" latin:keyHintLabel="1" latin:additionalMoreKeys="1" - latin:moreKeys="!label/more_keys_for_a" /> + latin:moreKeys="!text/more_keys_for_a" /> <Key latin:keyLabel="z" latin:keyHintLabel="2" latin:additionalMoreKeys="2" - latin:moreKeys="!label/more_keys_for_z" /> + latin:moreKeys="!text/more_keys_for_z" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!label/more_keys_for_e" /> + latin:moreKeys="!text/more_keys_for_e" /> <Key latin:keyLabel="r" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="!label/more_keys_for_r" /> + latin:moreKeys="!text/more_keys_for_r" /> <Key latin:keyLabel="t" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!label/more_keys_for_t" /> + latin:moreKeys="!text/more_keys_for_t" /> <Key latin:keyLabel="y" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="!label/more_keys_for_y" /> + latin:moreKeys="!text/more_keys_for_y" /> <Key latin:keyLabel="u" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="!label/more_keys_for_u" /> + latin:moreKeys="!text/more_keys_for_u" /> <Key latin:keyLabel="i" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="!label/more_keys_for_i" /> + latin:moreKeys="!text/more_keys_for_i" /> <Key latin:keyLabel="o" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="!label/more_keys_for_o" /> + latin:moreKeys="!text/more_keys_for_o" /> <Key latin:keyLabel="p" latin:keyHintLabel="0" diff --git a/java/res/xml/rowkeys_azerty2.xml b/java/res/xml/rowkeys_azerty2.xml index f453c2432..2eee214e5 100644 --- a/java/res/xml/rowkeys_azerty2.xml +++ b/java/res/xml/rowkeys_azerty2.xml @@ -25,27 +25,27 @@ latin:keyLabel="q" /> <Key latin:keyLabel="s" - latin:moreKeys="!label/more_keys_for_s" /> + latin:moreKeys="!text/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:moreKeys="!label/more_keys_for_d" /> + latin:moreKeys="!text/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:moreKeys="!label/more_keys_for_g" /> + latin:moreKeys="!text/more_keys_for_g" /> <Key latin:keyLabel="h" - latin:moreKeys="!label/more_keys_for_h" /> + latin:moreKeys="!text/more_keys_for_h" /> <Key latin:keyLabel="j" - latin:moreKeys="!label/more_keys_for_j" /> + latin:moreKeys="!text/more_keys_for_j" /> <Key latin:keyLabel="k" - latin:moreKeys="!label/more_keys_for_k" /> + latin:moreKeys="!text/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:moreKeys="!label/more_keys_for_l" /> + latin:moreKeys="!text/more_keys_for_l" /> <Key latin:keyLabel="m" /> </merge> diff --git a/java/res/xml/rowkeys_azerty3.xml b/java/res/xml/rowkeys_azerty3.xml index 35e9b195f..9f4c608f8 100644 --- a/java/res/xml/rowkeys_azerty3.xml +++ b/java/res/xml/rowkeys_azerty3.xml @@ -23,20 +23,20 @@ > <Key latin:keyLabel="w" - latin:moreKeys="!label/more_keys_for_w" /> + latin:moreKeys="!text/more_keys_for_w" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:moreKeys="!label/more_keys_for_c" /> + latin:moreKeys="!text/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:moreKeys="!label/more_keys_for_v" /> + latin:moreKeys="!text/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:moreKeys="!label/more_keys_for_n" /> + latin:moreKeys="!text/more_keys_for_n" /> <include latin:keyboardLayout="@xml/key_azerty_quote" /> </merge> diff --git a/java/res/xml/rowkeys_east_slavic1.xml b/java/res/xml/rowkeys_east_slavic1.xml index dd83c0250..00cb6a973 100644 --- a/java/res/xml/rowkeys_east_slavic1.xml +++ b/java/res/xml/rowkeys_east_slavic1.xml @@ -36,7 +36,7 @@ latin:keyLabel="у" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!label/more_keys_for_cyrillic_u" /> + latin:moreKeys="!text/more_keys_for_cyrillic_u" /> <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> <Key latin:keyLabel="к" @@ -47,13 +47,13 @@ latin:keyLabel="е" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!label/more_keys_for_cyrillic_ye" /> + latin:moreKeys="!text/more_keys_for_cyrillic_ye" /> <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> <Key latin:keyLabel="н" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="!label/more_keys_for_cyrillic_en" /> + latin:moreKeys="!text/more_keys_for_cyrillic_en" /> <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> <Key latin:keyLabel="г" @@ -65,7 +65,7 @@ latin:keyHintLabel="8" latin:additionalMoreKeys="8" /> <Key - latin:keyLabel="!label/keylabel_for_east_slavic_row1_9" + latin:keyLabel="!text/keylabel_for_east_slavic_row1_9" latin:keyHintLabel="9" latin:additionalMoreKeys="9" /> <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> @@ -76,5 +76,5 @@ <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> <Key latin:keyLabel="х" - latin:moreKeys="!label/more_keys_for_cyrillic_ha" /> + latin:moreKeys="!text/more_keys_for_cyrillic_ha" /> </merge> diff --git a/java/res/xml/rowkeys_east_slavic2.xml b/java/res/xml/rowkeys_east_slavic2.xml index 75d7d939d..c635af2d9 100644 --- a/java/res/xml/rowkeys_east_slavic2.xml +++ b/java/res/xml/rowkeys_east_slavic2.xml @@ -25,8 +25,8 @@ <Key latin:keyLabel="ф" /> <Key - latin:keyLabel="!label/keylabel_for_east_slavic_row2_1" - latin:moreKeys="!label/more_keys_for_east_slavic_row2_1" /> + latin:keyLabel="!text/keylabel_for_east_slavic_row2_1" + latin:moreKeys="!text/more_keys_for_east_slavic_row2_1" /> <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> <Key latin:keyLabel="в" /> @@ -42,7 +42,7 @@ <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> <Key latin:keyLabel="о" - latin:moreKeys="!label/more_keys_for_cyrillic_o" /> + latin:moreKeys="!text/more_keys_for_cyrillic_o" /> <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> <Key latin:keyLabel="л" /> diff --git a/java/res/xml/rowkeys_east_slavic3.xml b/java/res/xml/rowkeys_east_slavic3.xml index a05e92d44..c3a171b49 100644 --- a/java/res/xml/rowkeys_east_slavic3.xml +++ b/java/res/xml/rowkeys_east_slavic3.xml @@ -34,14 +34,14 @@ <Key latin:keyLabel="м" /> <Key - latin:keyLabel="!label/keylabel_for_east_slavic_row3_5" /> + latin:keyLabel="!text/keylabel_for_east_slavic_row3_5" /> <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> <Key latin:keyLabel="т" /> <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> <Key latin:keyLabel="ь" - latin:moreKeys="!label/more_keys_for_cyrillic_soft_sign" /> + latin:moreKeys="!text/more_keys_for_cyrillic_soft_sign" /> <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> <Key latin:keyLabel="б" /> diff --git a/java/res/xml/rowkeys_nordic1.xml b/java/res/xml/rowkeys_nordic1.xml index ff29369d7..72ac86b2e 100644 --- a/java/res/xml/rowkeys_nordic1.xml +++ b/java/res/xml/rowkeys_nordic1.xml @@ -24,5 +24,5 @@ <include latin:keyboardLayout="@xml/rowkeys_qwerty1" /> <Key - latin:keyLabel="!label/keylabel_for_nordic_row1_11" /> + latin:keyLabel="!text/keylabel_for_nordic_row1_11" /> </merge> diff --git a/java/res/xml/rowkeys_nordic2.xml b/java/res/xml/rowkeys_nordic2.xml index 52bb2f18f..836214abf 100644 --- a/java/res/xml/rowkeys_nordic2.xml +++ b/java/res/xml/rowkeys_nordic2.xml @@ -24,9 +24,9 @@ <include latin:keyboardLayout="@xml/rowkeys_qwerty2" /> <Key - latin:keyLabel="!label/keylabel_for_nordic_row2_10" - latin:moreKeys="!label/more_keys_for_nordic_row2_10" /> + latin:keyLabel="!text/keylabel_for_nordic_row2_10" + latin:moreKeys="!text/more_keys_for_nordic_row2_10" /> <Key - latin:keyLabel="!label/keylabel_for_nordic_row2_11" - latin:moreKeys="!label/more_keys_for_nordic_row2_11" /> + latin:keyLabel="!text/keylabel_for_nordic_row2_11" + latin:moreKeys="!text/more_keys_for_nordic_row2_11" /> </merge> diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml index 8fb60db74..84d613460 100644 --- a/java/res/xml/rowkeys_qwerty1.xml +++ b/java/res/xml/rowkeys_qwerty1.xml @@ -29,42 +29,42 @@ latin:keyLabel="w" latin:keyHintLabel="2" latin:additionalMoreKeys="2" - latin:moreKeys="!label/more_keys_for_w" /> + latin:moreKeys="!text/more_keys_for_w" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!label/more_keys_for_e" /> + latin:moreKeys="!text/more_keys_for_e" /> <Key latin:keyLabel="r" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="!label/more_keys_for_r" /> + latin:moreKeys="!text/more_keys_for_r" /> <Key latin:keyLabel="t" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!label/more_keys_for_t" /> + latin:moreKeys="!text/more_keys_for_t" /> <Key latin:keyLabel="y" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="!label/more_keys_for_y" /> + latin:moreKeys="!text/more_keys_for_y" /> <Key latin:keyLabel="u" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="!label/more_keys_for_u" /> + latin:moreKeys="!text/more_keys_for_u" /> <Key latin:keyLabel="i" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="!label/more_keys_for_i" /> + latin:moreKeys="!text/more_keys_for_i" /> <Key latin:keyLabel="o" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="!label/more_keys_for_o" /> + latin:moreKeys="!text/more_keys_for_o" /> <Key latin:keyLabel="p" latin:keyHintLabel="0" diff --git a/java/res/xml/rowkeys_qwerty2.xml b/java/res/xml/rowkeys_qwerty2.xml index a29f331bc..d9777d920 100644 --- a/java/res/xml/rowkeys_qwerty2.xml +++ b/java/res/xml/rowkeys_qwerty2.xml @@ -23,28 +23,28 @@ > <Key latin:keyLabel="a" - latin:moreKeys="!label/more_keys_for_a" /> + latin:moreKeys="!text/more_keys_for_a" /> <Key latin:keyLabel="s" - latin:moreKeys="!label/more_keys_for_s" /> + latin:moreKeys="!text/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:moreKeys="!label/more_keys_for_d" /> + latin:moreKeys="!text/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:moreKeys="!label/more_keys_for_g" /> + latin:moreKeys="!text/more_keys_for_g" /> <Key latin:keyLabel="h" - latin:moreKeys="!label/more_keys_for_h" /> + latin:moreKeys="!text/more_keys_for_h" /> <Key latin:keyLabel="j" - latin:moreKeys="!label/more_keys_for_j" /> + latin:moreKeys="!text/more_keys_for_j" /> <Key latin:keyLabel="k" - latin:moreKeys="!label/more_keys_for_k" /> + latin:moreKeys="!text/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:moreKeys="!label/more_keys_for_l" /> + latin:moreKeys="!text/more_keys_for_l" /> </merge> diff --git a/java/res/xml/rowkeys_qwerty3.xml b/java/res/xml/rowkeys_qwerty3.xml index afe43f6e4..a74aeb842 100644 --- a/java/res/xml/rowkeys_qwerty3.xml +++ b/java/res/xml/rowkeys_qwerty3.xml @@ -23,20 +23,20 @@ > <Key latin:keyLabel="z" - latin:moreKeys="!label/more_keys_for_z" /> + latin:moreKeys="!text/more_keys_for_z" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:moreKeys="!label/more_keys_for_c" /> + latin:moreKeys="!text/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:moreKeys="!label/more_keys_for_v" /> + latin:moreKeys="!text/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:moreKeys="!label/more_keys_for_n" /> + latin:moreKeys="!text/more_keys_for_n" /> <Key latin:keyLabel="m" /> </merge> diff --git a/java/res/xml/rowkeys_qwertz1.xml b/java/res/xml/rowkeys_qwertz1.xml index 12788968a..d87f03ddc 100644 --- a/java/res/xml/rowkeys_qwertz1.xml +++ b/java/res/xml/rowkeys_qwertz1.xml @@ -29,42 +29,42 @@ latin:keyLabel="w" latin:keyHintLabel="2" latin:additionalMoreKeys="2" - latin:moreKeys="!label/more_keys_for_w" /> + latin:moreKeys="!text/more_keys_for_w" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!label/more_keys_for_e" /> + latin:moreKeys="!text/more_keys_for_e" /> <Key latin:keyLabel="r" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="!label/more_keys_for_r" /> + latin:moreKeys="!text/more_keys_for_r" /> <Key latin:keyLabel="t" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!label/more_keys_for_t" /> + latin:moreKeys="!text/more_keys_for_t" /> <Key latin:keyLabel="z" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="!label/more_keys_for_z" /> + latin:moreKeys="!text/more_keys_for_z" /> <Key latin:keyLabel="u" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="!label/more_keys_for_u" /> + latin:moreKeys="!text/more_keys_for_u" /> <Key latin:keyLabel="i" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="!label/more_keys_for_i" /> + latin:moreKeys="!text/more_keys_for_i" /> <Key latin:keyLabel="o" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="!label/more_keys_for_o" /> + latin:moreKeys="!text/more_keys_for_o" /> <Key latin:keyLabel="p" latin:keyHintLabel="0" diff --git a/java/res/xml/rowkeys_qwertz3.xml b/java/res/xml/rowkeys_qwertz3.xml index e969665a5..9e39fe08e 100644 --- a/java/res/xml/rowkeys_qwertz3.xml +++ b/java/res/xml/rowkeys_qwertz3.xml @@ -23,20 +23,20 @@ > <Key latin:keyLabel="y" - latin:moreKeys="!label/more_keys_for_y" /> + latin:moreKeys="!text/more_keys_for_y" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:moreKeys="!label/more_keys_for_c" /> + latin:moreKeys="!text/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:moreKeys="!label/more_keys_for_v" /> + latin:moreKeys="!text/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:moreKeys="!label/more_keys_for_n" /> + latin:moreKeys="!text/more_keys_for_n" /> <Key latin:keyLabel="m" /> </merge> diff --git a/java/res/xml/rowkeys_south_slavic1.xml b/java/res/xml/rowkeys_south_slavic1.xml index 7c9a3bc92..6117d46f1 100644 --- a/java/res/xml/rowkeys_south_slavic1.xml +++ b/java/res/xml/rowkeys_south_slavic1.xml @@ -36,7 +36,7 @@ latin:keyLabel="е" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!label/more_keys_for_cyrillic_ie" /> + latin:moreKeys="!text/more_keys_for_cyrillic_ie" /> <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> <Key latin:keyLabel="р" @@ -48,7 +48,7 @@ latin:keyHintLabel="5" latin:additionalMoreKeys="5" /> <Key - latin:keyLabel="!label/keylabel_for_south_slavic_row1_6" + latin:keyLabel="!text/keylabel_for_south_slavic_row1_6" latin:keyHintLabel="6" latin:additionalMoreKeys="6" /> <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> @@ -61,7 +61,7 @@ latin:keyLabel="и" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="!label/more_keys_for_cyrillic_i" /> + latin:moreKeys="!text/more_keys_for_cyrillic_i" /> <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> <Key latin:keyLabel="о" diff --git a/java/res/xml/rowkeys_south_slavic2.xml b/java/res/xml/rowkeys_south_slavic2.xml index e4892085d..88e894053 100644 --- a/java/res/xml/rowkeys_south_slavic2.xml +++ b/java/res/xml/rowkeys_south_slavic2.xml @@ -52,5 +52,5 @@ <Key latin:keyLabel="ч" /> <Key - latin:keyLabel="!label/keylabel_for_south_slavic_row2_11" /> + latin:keyLabel="!text/keylabel_for_south_slavic_row2_11" /> </merge> diff --git a/java/res/xml/rowkeys_south_slavic3.xml b/java/res/xml/rowkeys_south_slavic3.xml index d668ddf39..b01550911 100644 --- a/java/res/xml/rowkeys_south_slavic3.xml +++ b/java/res/xml/rowkeys_south_slavic3.xml @@ -22,7 +22,7 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="!label/keylabel_for_south_slavic_row3_1" /> + latin:keyLabel="!text/keylabel_for_south_slavic_row3_1" /> <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE --> <Key latin:keyLabel="џ" /> @@ -42,7 +42,7 @@ <Key latin:keyLabel="м" /> <Key - latin:keyLabel="!label/keylabel_for_south_slavic_row3_8" /> + latin:keyLabel="!text/keylabel_for_south_slavic_row3_8" /> <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> <Key latin:keyLabel="ж" /> diff --git a/java/res/xml/rowkeys_symbols1.xml b/java/res/xml/rowkeys_symbols1.xml index f9f8bb16c..6e2f92dd9 100644 --- a/java/res/xml/rowkeys_symbols1.xml +++ b/java/res/xml/rowkeys_symbols1.xml @@ -22,43 +22,43 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="!label/keylabel_for_symbols_1" - latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_1" - latin:moreKeys="!label/more_keys_for_symbols_1" /> + latin:keyLabel="!text/keylabel_for_symbols_1" + latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_1" + latin:moreKeys="!text/more_keys_for_symbols_1" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_2" - latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_2" - latin:moreKeys="!label/more_keys_for_symbols_2" /> + latin:keyLabel="!text/keylabel_for_symbols_2" + latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_2" + latin:moreKeys="!text/more_keys_for_symbols_2" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_3" - latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_3" - latin:moreKeys="!label/more_keys_for_symbols_3" /> + latin:keyLabel="!text/keylabel_for_symbols_3" + latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_3" + latin:moreKeys="!text/more_keys_for_symbols_3" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_4" - latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_4" - latin:moreKeys="!label/more_keys_for_symbols_4" /> + latin:keyLabel="!text/keylabel_for_symbols_4" + latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_4" + latin:moreKeys="!text/more_keys_for_symbols_4" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_5" - latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_5" - latin:moreKeys="!label/more_keys_for_symbols_5" /> + latin:keyLabel="!text/keylabel_for_symbols_5" + latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_5" + latin:moreKeys="!text/more_keys_for_symbols_5" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_6" - latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_6" - latin:moreKeys="!label/more_keys_for_symbols_6" /> + latin:keyLabel="!text/keylabel_for_symbols_6" + latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_6" + latin:moreKeys="!text/more_keys_for_symbols_6" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_7" - latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_7" - latin:moreKeys="!label/more_keys_for_symbols_7" /> + latin:keyLabel="!text/keylabel_for_symbols_7" + latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_7" + latin:moreKeys="!text/more_keys_for_symbols_7" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_8" - latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_8" - latin:moreKeys="!label/more_keys_for_symbols_8" /> + latin:keyLabel="!text/keylabel_for_symbols_8" + latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_8" + latin:moreKeys="!text/more_keys_for_symbols_8" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_9" - latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_9" - latin:moreKeys="!label/more_keys_for_symbols_9" /> + latin:keyLabel="!text/keylabel_for_symbols_9" + latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_9" + latin:moreKeys="!text/more_keys_for_symbols_9" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_0" - latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_0" - latin:moreKeys="!label/more_keys_for_symbols_0" /> + latin:keyLabel="!text/keylabel_for_symbols_0" + latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_0" + latin:moreKeys="!text/more_keys_for_symbols_0" /> </merge> diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml index 47865a989..34b9aa2ee 100644 --- a/java/res/xml/rowkeys_symbols2.xml +++ b/java/res/xml/rowkeys_symbols2.xml @@ -28,13 +28,13 @@ <Key latin:keyStyle="currencyKeyStyle" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_percent" - latin:moreKeys="!label/more_keys_for_symbols_percent" /> + latin:keyLabel="!text/keylabel_for_symbols_percent" + latin:moreKeys="!text/more_keys_for_symbols_percent" /> <Key latin:keyLabel="&" /> <Key latin:keyLabel="*" - latin:moreKeys="!label/more_keys_for_star" /> + latin:moreKeys="!text/more_keys_for_star" /> <!-- U+2013: "–" EN DASH U+2014: "—" EM DASH --> <Key @@ -42,7 +42,7 @@ latin:moreKeys="_,–,—" /> <Key latin:keyLabel="+" - latin:moreKeys="!label/more_keys_for_plus" /> + latin:moreKeys="!text/more_keys_for_plus" /> <include latin:keyboardLayout="@xml/keys_parentheses" /> </merge> diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml index 4cef6b255..294e94d31 100644 --- a/java/res/xml/rowkeys_symbols3.xml +++ b/java/res/xml/rowkeys_symbols3.xml @@ -31,20 +31,20 @@ latin:moreKeys="¡" /> <Key latin:keyLabel=""" - latin:moreKeys="!label/more_keys_for_double_quote" /> + latin:moreKeys="!text/more_keys_for_double_quote" /> <Key latin:keyLabel="\'" - latin:moreKeys="!label/more_keys_for_single_quote" /> + latin:moreKeys="!text/more_keys_for_single_quote" /> <Key latin:keyLabel=":" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_semicolon" - latin:moreKeys="!label/more_keys_for_symbols_semicolon" /> + latin:keyLabel="!text/keylabel_for_symbols_semicolon" + latin:moreKeys="!text/more_keys_for_symbols_semicolon" /> <Key latin:keyLabel="/" /> <Key - latin:keyLabel="!label/keylabel_for_symbols_question" - latin:moreKeys="!label/more_keys_for_symbols_question" /> + latin:keyLabel="!text/keylabel_for_symbols_question" + latin:moreKeys="!text/more_keys_for_symbols_question" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" diff --git a/java/res/xml/rowkeys_symbols_shift1.xml b/java/res/xml/rowkeys_symbols_shift1.xml index af3e87e88..199e4494f 100644 --- a/java/res/xml/rowkeys_symbols_shift1.xml +++ b/java/res/xml/rowkeys_symbols_shift1.xml @@ -30,7 +30,7 @@ <!-- U+2022: "•" BULLET --> <Key latin:keyLabel="•" - latin:moreKeys="!label/more_keys_for_bullet" /> + latin:moreKeys="!text/more_keys_for_bullet" /> <!-- U+221A: "√" SQUARE ROOT --> <Key latin:keyLabel="√" /> diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml index 7015bb2d6..28bd7a1d2 100644 --- a/java/res/xml/rows_number_normal.xml +++ b/java/res/xml/rows_number_normal.xml @@ -61,7 +61,7 @@ <Key latin:keyLabel="." latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!label/more_keys_for_am_pm" + latin:moreKeys="!text/more_keys_for_am_pm" latin:keyStyle="numFunctionalKeyStyle" latin:keyWidth="fillRight" /> </case> diff --git a/java/res/xml/rows_symbols4.xml b/java/res/xml/rows_symbols4.xml index de7e043e8..3ff884607 100644 --- a/java/res/xml/rows_symbols4.xml +++ b/java/res/xml/rows_symbols4.xml @@ -37,9 +37,9 @@ <!-- latin:hasShortcutKey="false" --> <default> <Key - latin:keyLabel="!label/keylabel_for_comma" + latin:keyLabel="!text/keylabel_for_comma" latin:keyLabelFlags="hasPopupHint" - latin:additionalMoreKeys="!label/more_keys_for_comma" + latin:additionalMoreKeys="!text/more_keys_for_comma" latin:keyStyle="f1MoreKeysStyle" /> </default> </switch> |