diff options
Diffstat (limited to 'java/res/xml')
32 files changed, 153 insertions, 153 deletions
diff --git a/java/res/xml/key_azerty_quote.xml b/java/res/xml/key_azerty_quote.xml index 966ae6f21..b8c51d30f 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="\@string/more_keys_for_single_quote" /> + latin:moreKeys="!label/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 b0b87a810..ec011d08b 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|preserveCase" - latin:moreKeys="@string/settings_as_more_key" + latin:moreKeys="!label/settings_as_more_key" latin:backgroundType="functional" /> </default> </switch> @@ -98,7 +98,7 @@ latin:keyLabel=":-)" latin:keyOutputText=":-) " latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="@string/more_keys_for_smiley" + latin:moreKeys="!label/more_keys_for_smiley" latin:backgroundType="functional" /> </case> </switch> @@ -158,7 +158,7 @@ latin:styleName="toSymbolKeyStyle" latin:code="!code/key_switch_alpha_symbol" latin:keyIcon="iconShortcutForLabel" - latin:keyLabel="@string/label_to_symbol_with_microphone_key" + latin:keyLabel="!label/label_to_symbol_with_microphone_key" latin:keyLabelFlags="withIconRight|preserveCase" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> @@ -167,7 +167,7 @@ <key-style latin:styleName="toSymbolKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="@string/label_to_symbol_key" + latin:keyLabel="!label/label_to_symbol_key" latin:keyLabelFlags="preserveCase" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> @@ -176,29 +176,29 @@ <key-style latin:styleName="toAlphaKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="@string/label_to_alpha_key" + latin:keyLabel="!label/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="@string/label_to_more_symbol_key" + latin:keyLabel="!label/label_to_more_symbol_key" latin:keyLabelFlags="preserveCase" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="backFromMoreSymbolKeyStyle" latin:code="!code/key_shift" - latin:keyLabel="@string/label_to_symbol_key" + latin:keyLabel="!label/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:keyHintLabel="!label/keyhintlabel_for_punctuation" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="@string/more_keys_for_punctuation" + latin:moreKeys="!label/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 bd1d959e4..6057d5bd7 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="@string/more_keys_for_currency_general" /> + latin:moreKeys="!label/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="@string/more_keys_for_currency_general" /> + latin:moreKeys="!label/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="@string/more_keys_for_currency_pound" /> + latin:moreKeys="!label/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 8dd849879..704970a56 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="@string/more_keys_for_currency_dollar" /> + latin:moreKeys="!label/more_keys_for_currency_dollar" /> <key-style latin:styleName="moreCurrency1KeyStyle" latin:keyLabel="£" /> diff --git a/java/res/xml/key_styles_currency_euro.xml b/java/res/xml/key_styles_currency_euro.xml index 0573e0991..074d4c0c2 100644 --- a/java/res/xml/key_styles_currency_euro.xml +++ b/java/res/xml/key_styles_currency_euro.xml @@ -26,7 +26,7 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="€" - latin:moreKeys="@string/more_keys_for_currency_euro" /> + latin:moreKeys="!abel/more_keys_for_currency_euro" /> <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 49759c470..04bd80d9e 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="@string/action_previous_as_more_key" /> + latin:moreKeys="!label/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="@string/action_next_as_more_key" /> + latin:moreKeys="!label/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!,@string/action_previous_as_more_key,@string/action_next_as_more_key" /> + latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!label/action_previous_as_more_key,!label/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="@string/action_next_as_more_key" /> + latin:moreKeys="!label/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="@string/action_previous_as_more_key" /> + latin:moreKeys="!label/action_previous_as_more_key" /> </case> <!-- naviagteNext="false" and navigatePrevious="false" --> <default> @@ -119,7 +119,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="@string/label_go_key" + latin:keyLabel="!label/label_go_key" latin:parentStyle="defaultActionKeyStyle" /> </case> <case @@ -127,7 +127,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="@string/label_next_key" + latin:keyLabel="!label/label_next_key" latin:parentStyle="defaultActionKeyStyle" /> </case> <case @@ -135,7 +135,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="@string/label_previous_key" + latin:keyLabel="!label/label_previous_key" latin:parentStyle="defaultActionKeyStyle" /> </case> <case @@ -143,7 +143,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="@string/label_done_key" + latin:keyLabel="!label/label_done_key" latin:parentStyle="defaultActionKeyStyle" /> </case> <case @@ -151,7 +151,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="@string/label_send_key" + latin:keyLabel="!label/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 e1c5e5bca..d796b92c1 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="@string/label_to_phone_symbols_key" + latin:keyLabel="!label/label_to_phone_symbols_key" latin:parentStyle="numModeKeyStyle" /> <key-style latin:styleName="numPhoneToNumericKeyStyle" latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="@string/label_to_phone_numeric_key" + latin:keyLabel="!label/label_to_phone_numeric_key" latin:parentStyle="numModeKeyStyle" /> <!-- U+002C: "," COMMA --> <key-style latin:styleName="numPauseKeyStyle" latin:code="0x002C" - latin:keyLabel="@string/label_pause_key" + latin:keyLabel="!label/label_pause_key" latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale" latin:parentStyle="numKeyBaseStyle" /> <!-- U+003B: ";" SEMICOLON --> <key-style latin:styleName="numWaitKeyStyle" latin:code="0x003B" - latin:keyLabel="@string/label_wait_key" + latin:keyLabel="!label/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 831f2dd86..7c154cb0d 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="@string/more_keys_for_less_than" /> + latin:moreKeys="!label/more_keys_for_less_than" /> <Key latin:keyLabel=">" latin:code="!code/key_greater_than" - latin:moreKeys="@string/more_keys_for_greater_than" /> + latin:moreKeys="!label/more_keys_for_greater_than" /> </merge> diff --git a/java/res/xml/keys_parentheses.xml b/java/res/xml/keys_parentheses.xml index 502a84ede..17d72859c 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="@string/more_keys_for_left_parenthesis" /> + latin:moreKeys="!label/more_keys_for_left_parenthesis" /> <Key latin:keyLabel=")" latin:code="!code/key_right_parenthesis" - latin:moreKeys="@string/more_keys_for_right_parenthesis" /> + latin:moreKeys="!label/more_keys_for_right_parenthesis" /> </merge> diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml index b2b47e9b5..c08518079 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="@string/keylabel_for_comma" + latin:keyLabel="!label/keylabel_for_comma" latin:keyLabelFlags="hasPopupHint" - latin:additionalMoreKeys="@string/more_keys_for_comma" + latin:additionalMoreKeys="!label/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 99834321f..50a0162de 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="@string/more_keys_for_a" /> + latin:moreKeys="!label/more_keys_for_a" /> <Key latin:keyLabel="z" latin:keyHintLabel="2" latin:additionalMoreKeys="2" - latin:moreKeys="@string/more_keys_for_z" /> + latin:moreKeys="!label/more_keys_for_z" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="@string/more_keys_for_e" /> + latin:moreKeys="!label/more_keys_for_e" /> <Key latin:keyLabel="r" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="@string/more_keys_for_r" /> + latin:moreKeys="!label/more_keys_for_r" /> <Key latin:keyLabel="t" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="@string/more_keys_for_t" /> + latin:moreKeys="!label/more_keys_for_t" /> <Key latin:keyLabel="y" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="@string/more_keys_for_y" /> + latin:moreKeys="!label/more_keys_for_y" /> <Key latin:keyLabel="u" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="@string/more_keys_for_u" /> + latin:moreKeys="!label/more_keys_for_u" /> <Key latin:keyLabel="i" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="@string/more_keys_for_i" /> + latin:moreKeys="!label/more_keys_for_i" /> <Key latin:keyLabel="o" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="@string/more_keys_for_o" /> + latin:moreKeys="!label/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 ff0b06240..f453c2432 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="@string/more_keys_for_s" /> + latin:moreKeys="!label/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:moreKeys="@string/more_keys_for_d" /> + latin:moreKeys="!label/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:moreKeys="@string/more_keys_for_g" /> + latin:moreKeys="!label/more_keys_for_g" /> <Key latin:keyLabel="h" - latin:moreKeys="@string/more_keys_for_h" /> + latin:moreKeys="!label/more_keys_for_h" /> <Key latin:keyLabel="j" - latin:moreKeys="@string/more_keys_for_j" /> + latin:moreKeys="!label/more_keys_for_j" /> <Key latin:keyLabel="k" - latin:moreKeys="@string/more_keys_for_k" /> + latin:moreKeys="!label/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:moreKeys="@string/more_keys_for_l" /> + latin:moreKeys="!label/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 b81c3c5a1..35e9b195f 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="@string/more_keys_for_w" /> + latin:moreKeys="!label/more_keys_for_w" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:moreKeys="@string/more_keys_for_c" /> + latin:moreKeys="!label/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:moreKeys="@string/more_keys_for_v" /> + latin:moreKeys="!label/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:moreKeys="@string/more_keys_for_n" /> + latin:moreKeys="!label/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 04c6ef6ab..dd83c0250 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="@string/more_keys_for_cyrillic_u" /> + latin:moreKeys="!label/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="@string/more_keys_for_cyrillic_ye" /> + latin:moreKeys="!label/more_keys_for_cyrillic_ye" /> <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> <Key latin:keyLabel="н" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="@string/more_keys_for_cyrillic_en" /> + latin:moreKeys="!label/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="@string/keylabel_for_east_slavic_row1_9" + latin:keyLabel="!label/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="@string/more_keys_for_cyrillic_ha" /> + latin:moreKeys="!label/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 57b037367..75d7d939d 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="@string/keylabel_for_east_slavic_row2_1" - latin:moreKeys="@string/more_keys_for_east_slavic_row2_1" /> + latin:keyLabel="!label/keylabel_for_east_slavic_row2_1" + latin:moreKeys="!label/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="@string/more_keys_for_cyrillic_o" /> + latin:moreKeys="!label/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 b0f7aed7b..a05e92d44 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="@string/keylabel_for_east_slavic_row3_5" /> + latin:keyLabel="!label/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="@string/more_keys_for_cyrillic_soft_sign" /> + latin:moreKeys="!label/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 056895f1f..ff29369d7 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="@string/keylabel_for_nordic_row1_11" /> + latin:keyLabel="!label/keylabel_for_nordic_row1_11" /> </merge> diff --git a/java/res/xml/rowkeys_nordic2.xml b/java/res/xml/rowkeys_nordic2.xml index 0033ea1bb..52bb2f18f 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="@string/keylabel_for_nordic_row2_10" - latin:moreKeys="@string/more_keys_for_nordic_row2_10" /> + latin:keyLabel="!label/keylabel_for_nordic_row2_10" + latin:moreKeys="!label/more_keys_for_nordic_row2_10" /> <Key - latin:keyLabel="@string/keylabel_for_nordic_row2_11" - latin:moreKeys="@string/more_keys_for_nordic_row2_11" /> + latin:keyLabel="!label/keylabel_for_nordic_row2_11" + latin:moreKeys="!label/more_keys_for_nordic_row2_11" /> </merge> diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml index 19067a70c..8fb60db74 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="@string/more_keys_for_w" /> + latin:moreKeys="!label/more_keys_for_w" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="@string/more_keys_for_e" /> + latin:moreKeys="!label/more_keys_for_e" /> <Key latin:keyLabel="r" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="@string/more_keys_for_r" /> + latin:moreKeys="!label/more_keys_for_r" /> <Key latin:keyLabel="t" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="@string/more_keys_for_t" /> + latin:moreKeys="!label/more_keys_for_t" /> <Key latin:keyLabel="y" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="@string/more_keys_for_y" /> + latin:moreKeys="!label/more_keys_for_y" /> <Key latin:keyLabel="u" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="@string/more_keys_for_u" /> + latin:moreKeys="!label/more_keys_for_u" /> <Key latin:keyLabel="i" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="@string/more_keys_for_i" /> + latin:moreKeys="!label/more_keys_for_i" /> <Key latin:keyLabel="o" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="@string/more_keys_for_o" /> + latin:moreKeys="!label/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 2fa8214a8..a29f331bc 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="@string/more_keys_for_a" /> + latin:moreKeys="!label/more_keys_for_a" /> <Key latin:keyLabel="s" - latin:moreKeys="@string/more_keys_for_s" /> + latin:moreKeys="!label/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:moreKeys="@string/more_keys_for_d" /> + latin:moreKeys="!label/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:moreKeys="@string/more_keys_for_g" /> + latin:moreKeys="!label/more_keys_for_g" /> <Key latin:keyLabel="h" - latin:moreKeys="@string/more_keys_for_h" /> + latin:moreKeys="!label/more_keys_for_h" /> <Key latin:keyLabel="j" - latin:moreKeys="@string/more_keys_for_j" /> + latin:moreKeys="!label/more_keys_for_j" /> <Key latin:keyLabel="k" - latin:moreKeys="@string/more_keys_for_k" /> + latin:moreKeys="!label/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:moreKeys="@string/more_keys_for_l" /> + latin:moreKeys="!label/more_keys_for_l" /> </merge> diff --git a/java/res/xml/rowkeys_qwerty3.xml b/java/res/xml/rowkeys_qwerty3.xml index 932ea6f65..afe43f6e4 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="@string/more_keys_for_z" /> + latin:moreKeys="!label/more_keys_for_z" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:moreKeys="@string/more_keys_for_c" /> + latin:moreKeys="!label/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:moreKeys="@string/more_keys_for_v" /> + latin:moreKeys="!label/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:moreKeys="@string/more_keys_for_n" /> + latin:moreKeys="!label/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 3e11a7ab4..12788968a 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="@string/more_keys_for_w" /> + latin:moreKeys="!label/more_keys_for_w" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="@string/more_keys_for_e" /> + latin:moreKeys="!label/more_keys_for_e" /> <Key latin:keyLabel="r" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="@string/more_keys_for_r" /> + latin:moreKeys="!label/more_keys_for_r" /> <Key latin:keyLabel="t" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="@string/more_keys_for_t" /> + latin:moreKeys="!label/more_keys_for_t" /> <Key latin:keyLabel="z" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="@string/more_keys_for_z" /> + latin:moreKeys="!label/more_keys_for_z" /> <Key latin:keyLabel="u" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="@string/more_keys_for_u" /> + latin:moreKeys="!label/more_keys_for_u" /> <Key latin:keyLabel="i" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="@string/more_keys_for_i" /> + latin:moreKeys="!label/more_keys_for_i" /> <Key latin:keyLabel="o" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="@string/more_keys_for_o" /> + latin:moreKeys="!label/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 d37cee67f..e969665a5 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="@string/more_keys_for_y" /> + latin:moreKeys="!label/more_keys_for_y" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:moreKeys="@string/more_keys_for_c" /> + latin:moreKeys="!label/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:moreKeys="@string/more_keys_for_v" /> + latin:moreKeys="!label/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:moreKeys="@string/more_keys_for_n" /> + latin:moreKeys="!label/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 e3cb89c67..7c9a3bc92 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="@string/more_keys_for_cyrillic_ie" /> + latin:moreKeys="!label/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="@string/keylabel_for_south_slavic_row1_6" + latin:keyLabel="!label/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="@string/more_keys_for_cyrillic_i" /> + latin:moreKeys="!label/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 5a7ecd46e..e4892085d 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="@string/keylabel_for_south_slavic_row2_11" /> + latin:keyLabel="!label/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 97ff51ee1..d668ddf39 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="@string/keylabel_for_south_slavic_row3_1" /> + latin:keyLabel="!label/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="@string/keylabel_for_south_slavic_row3_8" /> + latin:keyLabel="!label/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 f6d6243d1..f9f8bb16c 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="@string/keylabel_for_symbols_1" - latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_1" - latin:moreKeys="@string/more_keys_for_symbols_1" /> + latin:keyLabel="!label/keylabel_for_symbols_1" + latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_1" + latin:moreKeys="!label/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" /> + latin:keyLabel="!label/keylabel_for_symbols_2" + latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_2" + latin:moreKeys="!label/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" /> + latin:keyLabel="!label/keylabel_for_symbols_3" + latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_3" + latin:moreKeys="!label/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" /> + latin:keyLabel="!label/keylabel_for_symbols_4" + latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_4" + latin:moreKeys="!label/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" /> + latin:keyLabel="!label/keylabel_for_symbols_5" + latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_5" + latin:moreKeys="!label/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" /> + latin:keyLabel="!label/keylabel_for_symbols_6" + latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_6" + latin:moreKeys="!label/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" /> + latin:keyLabel="!label/keylabel_for_symbols_7" + latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_7" + latin:moreKeys="!label/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" /> + latin:keyLabel="!label/keylabel_for_symbols_8" + latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_8" + latin:moreKeys="!label/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" /> + latin:keyLabel="!label/keylabel_for_symbols_9" + latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_9" + latin:moreKeys="!label/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:keyLabel="!label/keylabel_for_symbols_0" + latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_0" + latin:moreKeys="!label/more_keys_for_symbols_0" /> </merge> diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml index 1092421d8..47865a989 100644 --- a/java/res/xml/rowkeys_symbols2.xml +++ b/java/res/xml/rowkeys_symbols2.xml @@ -28,21 +28,21 @@ <Key latin:keyStyle="currencyKeyStyle" /> <Key - latin:keyLabel="@string/keylabel_for_symbols_percent" - latin:moreKeys="@string/more_keys_for_symbols_percent" /> + latin:keyLabel="!label/keylabel_for_symbols_percent" + latin:moreKeys="!label/more_keys_for_symbols_percent" /> <Key latin:keyLabel="&" /> <Key latin:keyLabel="*" - latin:moreKeys="@string/more_keys_for_star" /> + latin:moreKeys="!label/more_keys_for_star" /> <!-- U+2013: "–" EN DASH - U+2014: "—" EM DASH --> + U+2014: "—" EM DASH --> <Key latin:keyLabel="-" latin:moreKeys="_,–,—" /> <Key latin:keyLabel="+" - latin:moreKeys="@string/more_keys_for_plus" /> + latin:moreKeys="!label/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 1a484d416..4cef6b255 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="@string/more_keys_for_double_quote" /> + latin:moreKeys="!label/more_keys_for_double_quote" /> <Key latin:keyLabel="\'" - latin:moreKeys="@string/more_keys_for_single_quote" /> + latin:moreKeys="!label/more_keys_for_single_quote" /> <Key latin:keyLabel=":" /> <Key - latin:keyLabel="@string/keylabel_for_symbols_semicolon" - latin:moreKeys="@string/more_keys_for_symbols_semicolon" /> + latin:keyLabel="!label/keylabel_for_symbols_semicolon" + latin:moreKeys="!label/more_keys_for_symbols_semicolon" /> <Key latin:keyLabel="/" /> <Key - latin:keyLabel="@string/keylabel_for_symbols_question" - latin:moreKeys="@string/more_keys_for_symbols_question" /> + latin:keyLabel="!label/keylabel_for_symbols_question" + latin:moreKeys="!label/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 cc00aebcd..af3e87e88 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="@string/more_keys_for_bullet" /> + latin:moreKeys="!label/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 6f9429cd8..7015bb2d6 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="@string/more_keys_for_am_pm" + latin:moreKeys="!label/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 3e26650e8..de7e043e8 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="@string/keylabel_for_comma" + latin:keyLabel="!label/keylabel_for_comma" latin:keyLabelFlags="hasPopupHint" - latin:additionalMoreKeys="@string/more_keys_for_comma" + latin:additionalMoreKeys="!label/more_keys_for_comma" latin:keyStyle="f1MoreKeysStyle" /> </default> </switch> |