Merge "Rename text resources consistently"

java/res/xml-sw600dp/key_shortcut.xml

@@ -29,7 +29,7 @@
             <Key
                 latin:keyStyle="shortcutKeyStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/settings_as_more_key" />
+                latin:moreKeys="!text/keyspec_settings" />
         </case>
         <case
             latin:supportsSwitchingToShortcutIme="true"

java/res/xml-sw600dp/key_styles_common.xml

@@ -145,23 +145,23 @@
         latin:backgroundType="functional" />
     <key-style
         latin:styleName="toSymbolKeyStyle"
-        latin:keySpec="!text/label_to_symbol_key|!code/key_switch_alpha_symbol"
+        latin:keySpec="!text/keylabel_to_symbol|!code/key_switch_alpha_symbol"
         latin:parentStyle="baseForLayoutSwitchKeyStyle" />
     <key-style
         latin:styleName="toAlphaKeyStyle"
-        latin:keySpec="!text/label_to_alpha_key|!code/key_switch_alpha_symbol"
+        latin:keySpec="!text/keylabel_to_alpha|!code/key_switch_alpha_symbol"
         latin:parentStyle="baseForLayoutSwitchKeyStyle" />
     <key-style
         latin:styleName="toMoreSymbolKeyStyle"
-        latin:keySpec="!text/label_to_more_symbol_for_tablet_key|!code/key_shift"
+        latin:keySpec="!text/keylabel_tablet_to_more_symbol|!code/key_shift"
         latin:parentStyle="baseForLayoutSwitchKeyStyle" />
     <key-style
         latin:styleName="backFromMoreSymbolKeyStyle"
-        latin:keySpec="!text/label_to_symbol_key|!code/key_shift"
+        latin:keySpec="!text/keylabel_to_symbol|!code/key_shift"
         latin:parentStyle="baseForLayoutSwitchKeyStyle" />
     <key-style
         latin:styleName="comKeyStyle"
-        latin:keySpec="!text/keylabel_for_popular_domain"
+        latin:keySpec="!text/keyspec_popular_domain"
         latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
-        latin:moreKeys="!text/more_keys_for_popular_domain" />
+        latin:moreKeys="!text/morekeys_popular_domain" />
 </merge>

java/res/xml-sw600dp/key_styles_enter.xml

@@ -21,7 +21,7 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
-    <!-- TODO: Stop using many conditional cases for emoji_key_as_more_key. There are way too many to maintain. -->
+    <!-- TODO: Stop using many conditional cases for keyspec_emoji_key. There are way too many to maintain. -->
     <!-- Navigate more keys style -->
     <switch>
         <!-- latin:passwordInput="true" -->
@@ -32,7 +32,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_previous_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_previous" />
         </case>
         <case
             latin:imeAction="actionNext"
@@ -48,7 +48,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_next_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_next" />
         </case>
         <case
             latin:imeAction="actionPrevious"
@@ -64,7 +64,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" />
+                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" />
         </case>
         <case
             latin:navigateNext="true"
@@ -73,7 +73,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_next_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_next" />
         </case>
         <case
             latin:navigateNext="false"
@@ -82,7 +82,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_previous_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_previous" />
         </case>
         <case
             latin:navigateNext="false"

java/res/xml-sw600dp/keys_comma_period.xml

@@ -22,17 +22,17 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <Key
-        latin:keySpec="!text/keylabel_for_tablet_comma"
+        latin:keySpec="!text/keyspec_tablet_comma"
-        latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
+        latin:keyHintLabel="!text/keyhintlabel_tablet_comma"
         latin:keyLabelFlags="hasPopupHint"
-        latin:moreKeys="!text/more_keys_for_tablet_comma"
+        latin:moreKeys="!text/morekeys_tablet_comma"
         latin:backgroundType="functional"
         latin:keyStyle="hasShiftedLetterHintStyle" />
     <Key
-        latin:keySpec="!text/keylabel_for_tablet_period"
+        latin:keySpec="!text/keyspec_tablet_period"
-        latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
+        latin:keyHintLabel="!text/keyhintlabel_tablet_period"
         latin:keyLabelFlags="hasPopupHint"
-        latin:moreKeys="!text/more_keys_for_tablet_period"
+        latin:moreKeys="!text/morekeys_tablet_period"
         latin:backgroundType="functional"
         latin:keyStyle="hasShiftedLetterHintStyle" />
 </merge>

java/res/xml-sw600dp/keys_exclamation_question.xml

@@ -23,8 +23,8 @@
 >
     <Key
         latin:keySpec="!"
-        latin:moreKeys="!text/more_keys_for_exclamation" />
+        latin:moreKeys="!text/morekeys_exclamation" />
     <Key
         latin:keySpec="\?"
-        latin:moreKeys="!text/more_keys_for_question" />
+        latin:moreKeys="!text/morekeys_question" />
 </merge>

java/res/xml-sw600dp/keys_pcqwerty4_right3.xml

@@ -40,7 +40,7 @@
                 latin:keyHintLabel="\?"
                 latin:additionalMoreKeys="\?"
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_question" />
+                latin:moreKeys="!text/morekeys_question" />
         </case>
         <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
         <default>
@@ -58,7 +58,7 @@
                 latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
             <Key
                 latin:keySpec="\?"
-                latin:moreKeys="!text/more_keys_for_question" />
+                latin:moreKeys="!text/morekeys_question" />
         </default>
     </switch>
 </merge>

java/res/xml-sw600dp/rowkeys_dvorak3.xml

@@ -25,10 +25,10 @@
         latin:keySpec="q" />
     <Key
         latin:keySpec="j"
-        latin:moreKeys="!text/more_keys_for_j" />
+        latin:moreKeys="!text/morekeys_j" />
     <Key
         latin:keySpec="k"
-        latin:moreKeys="!text/more_keys_for_k" />
+        latin:moreKeys="!text/morekeys_k" />
     <Key
         latin:keySpec="x" />
     <Key
@@ -37,11 +37,11 @@
         latin:keySpec="m" />
     <Key
         latin:keySpec="w"
-        latin:moreKeys="!text/more_keys_for_w" />
+        latin:moreKeys="!text/morekeys_w" />
     <Key
         latin:keySpec="v"
-        latin:moreKeys="!text/more_keys_for_v" />
+        latin:moreKeys="!text/morekeys_v" />
     <Key
         latin:keySpec="z"
-        latin:moreKeys="!text/more_keys_for_z" />
+        latin:moreKeys="!text/morekeys_z" />
 </merge>

java/res/xml-sw600dp/rowkeys_pcqwerty1.xml

@@ -35,61 +35,61 @@
                 latin:keyHintLabel="!"
                 latin:additionalMoreKeys="!"
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_exclamation,!text/more_keys_for_symbols_1" />
+                latin:moreKeys="!text/morekeys_exclamation,!text/morekeys_symbols_1" />
             <Key
                 latin:keySpec="2"
                 latin:keyHintLabel="\@"
                 latin:additionalMoreKeys="\@"
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_symbols_2" />
+                latin:moreKeys="!text/morekeys_symbols_2" />
             <Key
                 latin:keySpec="3"
                 latin:keyHintLabel="\#"
                 latin:additionalMoreKeys="\#"
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_symbols_3" />
+                latin:moreKeys="!text/morekeys_symbols_3" />
             <Key
                 latin:keySpec="4"
                 latin:keyHintLabel="$"
                 latin:additionalMoreKeys="$"
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_symbols_4" />
+                latin:moreKeys="!text/morekeys_symbols_4" />
             <Key
                 latin:keySpec="5"
                 latin:keyHintLabel="%"
                 latin:additionalMoreKeys="\\%"
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_symbols_5" />
+                latin:moreKeys="!text/morekeys_symbols_5" />
             <Key
                 latin:keySpec="6"
                 latin:keyHintLabel="^"
                 latin:additionalMoreKeys="^"
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_symbols_6" />
+                latin:moreKeys="!text/morekeys_symbols_6" />
             <Key
                 latin:keySpec="7"
                 latin:keyHintLabel="&amp;"
                 latin:additionalMoreKeys="&amp;"
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_symbols_7" />
+                latin:moreKeys="!text/morekeys_symbols_7" />
             <Key
                 latin:keySpec="8"
                 latin:keyHintLabel="*"
                 latin:additionalMoreKeys="*"
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_symbols_8" />
+                latin:moreKeys="!text/morekeys_symbols_8" />
             <Key
                 latin:keySpec="9"
                 latin:keyHintLabel="("
                 latin:additionalMoreKeys="("
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_symbols_9" />
+                latin:moreKeys="!text/morekeys_symbols_9" />
             <Key
                 latin:keySpec="0"
                 latin:keyHintLabel=")"
                 latin:additionalMoreKeys=")"
                 latin:keyStyle="hasShiftedLetterHintStyle"
-                latin:moreKeys="!text/more_keys_for_symbols_0" />
+                latin:moreKeys="!text/morekeys_symbols_0" />
             <!-- U+2013: "–" EN DASH
                  U+2014: "—" EM DASH
                  U+00B7: "·" MIDDLE DOT -->

java/res/xml-sw600dp/rows_number_normal.xml

@@ -69,7 +69,7 @@
                 <Key
                     latin:keySpec=","
                     latin:keyLabelFlags="hasPopupHint"
-                    latin:moreKeys="!text/more_keys_for_am_pm"
+                    latin:moreKeys="!text/morekeys_am_pm"
                     latin:keyStyle="numKeyStyle"
                     latin:keyWidth="10%p"
                     latin:backgroundType="functional" />

java/res/xml/key_f1.xml

@@ -40,7 +40,7 @@
             latin:supportsSwitchingToShortcutIme="false"
         >
             <Key
-                latin:keySpec="!text/keylabel_for_comma"
+                latin:keySpec="!text/keyspec_comma"
                 latin:keyLabelFlags="hasPopupHint"
                 latin:keyStyle="f1MoreKeysStyle" />
         </case>
@@ -54,9 +54,9 @@
         <!-- latin:hasShortcutKey="false" -->
         <default>
             <Key
-                latin:keySpec="!text/keylabel_for_comma"
+                latin:keySpec="!text/keyspec_comma"
                 latin:keyLabelFlags="hasPopupHint"
-                latin:additionalMoreKeys="!text/shortcut_as_more_key"
+                latin:additionalMoreKeys="!text/keyspec_shortcut"
                 latin:keyStyle="f1MoreKeysStyle" />
         </default>
     </switch>

java/res/xml/key_period.xml

@@ -34,15 +34,15 @@
             <Key
                 latin:keyStyle="baseKeyDevanagariSignVirama"
                 latin:keyLabelFlags="hasPopupHint"
-                latin:moreKeys="!text/more_keys_for_punctuation"
+                latin:moreKeys="!text/morekeys_punctuation"
                 latin:backgroundType="functional" />
         </case>
         <default>
             <Key
-                latin:keySpec="!text/keylabel_for_period"
+                latin:keySpec="!text/keyspec_period"
-                latin:keyHintLabel="!text/keyhintlabel_for_period"
+                latin:keyHintLabel="!text/keyhintlabel_period"
                 latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
-                latin:moreKeys="!text/more_keys_for_period"
+                latin:moreKeys="!text/morekeys_period"
                 latin:backgroundType="functional" />
         </default>
     </switch>

java/res/xml/key_styles_common.xml

@@ -133,24 +133,24 @@
         latin:backgroundType="functional" />
     <key-style
         latin:styleName="toSymbolKeyStyle"
-        latin:keySpec="!text/label_to_symbol_key|!code/key_switch_alpha_symbol"
+        latin:keySpec="!text/keylabel_to_symbol|!code/key_switch_alpha_symbol"
         latin:parentStyle="baseForLayoutSwitchKeyStyle" />
     <key-style
         latin:styleName="toAlphaKeyStyle"
-        latin:keySpec="!text/label_to_alpha_key|!code/key_switch_alpha_symbol"
+        latin:keySpec="!text/keylabel_to_alpha|!code/key_switch_alpha_symbol"
         latin:parentStyle="baseForLayoutSwitchKeyStyle" />
     <key-style
         latin:styleName="toMoreSymbolKeyStyle"
-        latin:keySpec="!text/label_to_more_symbol_key|!code/key_shift"
+        latin:keySpec="!text/keylabel_to_more_symbol|!code/key_shift"
         latin:parentStyle="baseForLayoutSwitchKeyStyle" />
     <key-style
         latin:styleName="backFromMoreSymbolKeyStyle"
-        latin:keySpec="!text/label_to_symbol_key|!code/key_shift"
+        latin:keySpec="!text/keylabel_to_symbol|!code/key_shift"
         latin:parentStyle="baseForLayoutSwitchKeyStyle" />
     <key-style
         latin:styleName="comKeyStyle"
-        latin:keySpec="!text/keylabel_for_popular_domain"
+        latin:keySpec="!text/keyspec_popular_domain"
         latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
-        latin:moreKeys="!text/more_keys_for_popular_domain"
+        latin:moreKeys="!text/morekeys_popular_domain"
         latin:backgroundType="functional" />
 </merge>

java/res/xml/key_styles_currency.xml

@@ -113,8 +113,8 @@
                  U+00A2: "¢" CENT SIGN -->
             <key-style
                 latin:styleName="currencyKeyStyle"
-                latin:keySpec="!text/keylabel_for_currency"
+                latin:keySpec="!text/keyspec_currency"
-                latin:moreKeys="!text/more_keys_for_currency" />
+                latin:moreKeys="!text/morekeys_currency" />
             <key-style
                 latin:styleName="moreCurrency1KeyStyle"
                 latin:keySpec="&#x00A3;" />

java/res/xml/key_styles_currency_dollar.xml

@@ -26,7 +26,7 @@
     <key-style
         latin:styleName="currencyKeyStyle"
         latin:keySpec="$"
-        latin:moreKeys="!text/more_keys_for_currency_dollar" />
+        latin:moreKeys="!text/morekeys_currency_dollar" />
     <key-style
         latin:styleName="moreCurrency1KeyStyle"
         latin:keySpec="&#x00A3;" />

java/res/xml/key_styles_enter.xml

@@ -21,7 +21,7 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
-    <!-- TODO: Stop using many conditional cases for emoji_key_as_more_key. There are way too many to maintain. -->
+    <!-- TODO: Stop using many conditional cases for keyspec_emoji_key. There are way too many to maintain. -->
     <!-- Navigate more keys style -->
     <switch>
         <!-- latin:passwordInput="true" -->
@@ -33,7 +33,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_previous_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_previous" />
         </case>
         <case
             latin:imeAction="actionNext"
@@ -51,7 +51,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_next_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_next" />
         </case>
         <case
             latin:imeAction="actionPrevious"
@@ -69,7 +69,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" />
+                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" />
         </case>
         <case
             latin:navigateNext="true"
@@ -79,7 +79,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_next_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_next" />
         </case>
         <case
             latin:navigateNext="false"
@@ -89,7 +89,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_previous_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_previous" />
         </case>
         <case
             latin:navigateNext="false"
@@ -108,7 +108,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_previous_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_previous" />
         </case>
         <case
             latin:imeAction="actionNext"
@@ -126,7 +126,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_next_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_next" />
         </case>
         <case
             latin:imeAction="actionPrevious"
@@ -144,7 +144,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" />
+                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" />
         </case>
         <case
             latin:navigateNext="true"
@@ -154,7 +154,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_next_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_next" />
         </case>
         <case
             latin:navigateNext="false"
@@ -164,7 +164,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/action_previous_as_more_key" />
+                latin:moreKeys="!text/keyspec_action_previous" />
         </case>
         <case
             latin:navigateNext="false"
@@ -182,7 +182,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_previous_as_more_key" />
+                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_previous" />
         </case>
         <case
             latin:imeAction="actionNext"
@@ -191,7 +191,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/emoji_key_as_more_key" />
+                latin:moreKeys="!text/keyspec_emoji_key" />
         </case>
         <case
             latin:imeAction="actionPrevious"
@@ -200,7 +200,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_next_as_more_key" />
+                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_next" />
         </case>
         <case
             latin:imeAction="actionPrevious"
@@ -209,7 +209,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/emoji_key_as_more_key" />
+                latin:moreKeys="!text/keyspec_emoji_key" />
         </case>
         <case
             latin:navigateNext="true"
@@ -218,7 +218,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!text/emoji_key_as_more_key,!text/action_previous_as_more_key,!text/action_next_as_more_key" />
+                latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_previous,!text/keyspec_action_next" />
         </case>
         <case
             latin:navigateNext="true"
@@ -227,7 +227,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_next_as_more_key" />
+                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_next" />
         </case>
         <case
             latin:navigateNext="false"
@@ -236,7 +236,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_previous_as_more_key" />
+                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_previous" />
         </case>
         <case
             latin:navigateNext="false"
@@ -245,7 +245,7 @@
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/emoji_key_as_more_key" />
+                latin:moreKeys="!text/keyspec_emoji_key" />
         </case>
         <default>
             <key-style

java/res/xml/key_styles_f1.xml

@@ -36,7 +36,7 @@
             <key-style
                 latin:styleName="f1MoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint"
-                latin:moreKeys="!text/settings_as_more_key"
+                latin:moreKeys="!text/keyspec_settings"
                 latin:backgroundType="functional" />
         </default>
     </switch>

java/res/xml/key_styles_number.xml

@@ -97,11 +97,11 @@
     <!-- Only for non-tablet device -->
     <key-style
         latin:styleName="numPhoneToSymbolKeyStyle"
-        latin:keySpec="!text/label_to_phone_symbols_key|!code/key_switch_alpha_symbol"
+        latin:keySpec="!text/keylabel_to_phone_symbols|!code/key_switch_alpha_symbol"
         latin:parentStyle="numModeKeyStyle" />
     <key-style
         latin:styleName="numPhoneToNumericKeyStyle"
-        latin:keySpec="!text/label_to_phone_numeric_key|!code/key_switch_alpha_symbol"
+        latin:keySpec="!text/keylabel_to_phone_numeric|!code/key_switch_alpha_symbol"
         latin:parentStyle="numModeKeyStyle" />
     <key-style
         latin:styleName="numPauseKeyStyle"

java/res/xml/keys_comma_period_symbols.xml

@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <Key
-        latin:keySpec="!text/keylabel_for_comma" />
+        latin:keySpec="!text/keyspec_comma" />
     <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
     <Key
         latin:keySpec="."

java/res/xml/keys_less_greater.xml

@@ -28,21 +28,21 @@
             <Key
                 latin:keySpec="!text/keyspec_left_double_angle_quote"
                 latin:backgroundType="functional"
-                latin:moreKeys="!text/more_keys_for_less_than" />
+                latin:moreKeys="!text/morekeys_less_than" />
             <Key
                 latin:keySpec="!text/keyspec_right_double_angle_quote"
                 latin:backgroundType="functional"
-                latin:moreKeys="!text/more_keys_for_greater_than" />
+                latin:moreKeys="!text/morekeys_greater_than" />
         </case>
         <default>
             <Key
                 latin:keySpec="!text/keyspec_less_than"
                 latin:backgroundType="functional"
-                latin:moreKeys="!text/more_keys_for_less_than" />
+                latin:moreKeys="!text/morekeys_less_than" />
             <Key
                 latin:keySpec="!text/keyspec_greater_than"
                 latin:backgroundType="functional"
-                latin:moreKeys="!text/more_keys_for_greater_than" />
+                latin:moreKeys="!text/morekeys_greater_than" />
         </default>
     </switch>
 </merge>

java/res/xml/keys_parentheses.xml

@@ -23,8 +23,8 @@
 >
     <Key
         latin:keySpec="!text/keyspec_left_parenthesis"
-        latin:moreKeys="!text/more_keys_for_left_parenthesis" />
+        latin:moreKeys="!text/morekeys_left_parenthesis" />
     <Key
         latin:keySpec="!text/keyspec_right_parenthesis"
-        latin:moreKeys="!text/more_keys_for_right_parenthesis" />
+        latin:moreKeys="!text/morekeys_right_parenthesis" />
 </merge>

java/res/xml/keys_pcqwerty4_right3.xml

@@ -34,7 +34,7 @@
             <Key
                 latin:keySpec="/"
                 latin:additionalMoreKeys="\?"
-                latin:moreKeys="!text/more_keys_for_question" />
+                latin:moreKeys="!text/morekeys_question" />
         </case>
         <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
         <default>
@@ -52,7 +52,7 @@
                 latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
             <Key
                 latin:keySpec="\?"
-                latin:moreKeys="!text/more_keys_for_question" />
+                latin:moreKeys="!text/morekeys_question" />
         </default>
     </switch>
 </merge>

java/res/xml/row_dvorak4.xml

@@ -30,7 +30,7 @@
         <Key
             latin:keySpec="q"
             latin:backgroundType="normal"
-            latin:additionalMoreKeys="!text/shortcut_as_more_key"
+            latin:additionalMoreKeys="!text/keyspec_shortcut"
             latin:keyStyle="f1MoreKeysStyle" />
         <include
             latin:keyXPos="25%p"
@@ -38,7 +38,7 @@
         <Key
             latin:keySpec="z"
             latin:keyLabelFlags="hasPopupHint"
-            latin:moreKeys="!text/more_keys_for_punctuation,!text/more_keys_for_z" />
+            latin:moreKeys="!text/morekeys_punctuation,!text/morekeys_z" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />

java/res/xml/rowkeys_azerty1.xml

@@ -25,47 +25,47 @@
         latin:keySpec="a"
         latin:keyHintLabel="1"
         latin:additionalMoreKeys="1"
-        latin:moreKeys="!text/more_keys_for_a" />
+        latin:moreKeys="!text/morekeys_a" />
     <Key
         latin:keySpec="z"
         latin:keyHintLabel="2"
         latin:additionalMoreKeys="2"
-        latin:moreKeys="!text/more_keys_for_z" />
+        latin:moreKeys="!text/morekeys_z" />
     <Key
         latin:keySpec="e"
         latin:keyHintLabel="3"
         latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/more_keys_for_e" />
+        latin:moreKeys="!text/morekeys_e" />
     <Key
         latin:keySpec="r"
         latin:keyHintLabel="4"
         latin:additionalMoreKeys="4"
-        latin:moreKeys="!text/more_keys_for_r" />
+        latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="t"
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/more_keys_for_t" />
+        latin:moreKeys="!text/morekeys_t" />
     <Key
         latin:keySpec="y"
         latin:keyHintLabel="6"
         latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/more_keys_for_y" />
+        latin:moreKeys="!text/morekeys_y" />
     <Key
         latin:keySpec="u"
         latin:keyHintLabel="7"
         latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/more_keys_for_u" />
+        latin:moreKeys="!text/morekeys_u" />
     <Key
         latin:keySpec="i"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/more_keys_for_i" />
+        latin:moreKeys="!text/morekeys_i" />
     <Key
         latin:keySpec="o"
         latin:keyHintLabel="9"
         latin:additionalMoreKeys="9"
-        latin:moreKeys="!text/more_keys_for_o" />
+        latin:moreKeys="!text/morekeys_o" />
     <Key
         latin:keySpec="p"
         latin:keyHintLabel="0"

java/res/xml/rowkeys_azerty2.xml

@@ -25,27 +25,27 @@
         latin:keySpec="q" />
     <Key
         latin:keySpec="s"
-        latin:moreKeys="!text/more_keys_for_s" />
+        latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="d"
-        latin:moreKeys="!text/more_keys_for_d" />
+        latin:moreKeys="!text/morekeys_d" />
     <Key
         latin:keySpec="f" />
     <Key
         latin:keySpec="g"
-        latin:moreKeys="!text/more_keys_for_g" />
+        latin:moreKeys="!text/morekeys_g" />
     <Key
         latin:keySpec="h"
-        latin:moreKeys="!text/more_keys_for_h" />
+        latin:moreKeys="!text/morekeys_h" />
     <Key
         latin:keySpec="j"
-        latin:moreKeys="!text/more_keys_for_j" />
+        latin:moreKeys="!text/morekeys_j" />
     <Key
         latin:keySpec="k"
-        latin:moreKeys="!text/more_keys_for_k" />
+        latin:moreKeys="!text/morekeys_k" />
     <Key
         latin:keySpec="l"
-        latin:moreKeys="!text/more_keys_for_l" />
+        latin:moreKeys="!text/morekeys_l" />
     <Key
         latin:keySpec="m" />
 </merge>

java/res/xml/rowkeys_azerty3.xml

@@ -23,20 +23,20 @@
 >
     <Key
         latin:keySpec="w"
-        latin:moreKeys="!text/more_keys_for_w" />
+        latin:moreKeys="!text/morekeys_w" />
     <Key
         latin:keySpec="x" />
     <Key
         latin:keySpec="c"
-        latin:moreKeys="!text/more_keys_for_c" />
+        latin:moreKeys="!text/morekeys_c" />
     <Key
         latin:keySpec="v"
-        latin:moreKeys="!text/more_keys_for_v" />
+        latin:moreKeys="!text/morekeys_v" />
     <Key
         latin:keySpec="b" />
     <Key
         latin:keySpec="n"
-        latin:moreKeys="!text/more_keys_for_n" />
+        latin:moreKeys="!text/morekeys_n" />
     <switch>
         <case
             latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
@@ -47,7 +47,7 @@
         <default>
             <Key
                 latin:keySpec="\'"
-                latin:moreKeys="!text/more_keys_for_single_quote" />
+                latin:moreKeys="!text/morekeys_single_quote" />
         </default>
     </switch>
 </merge>

java/res/xml/rowkeys_colemak1.xml

@@ -29,7 +29,7 @@
         latin:keySpec="w"
         latin:keyHintLabel="2"
         latin:additionalMoreKeys="2"
-        latin:moreKeys="!text/more_keys_for_w" />
+        latin:moreKeys="!text/morekeys_w" />
     <Key
         latin:keySpec="f"
         latin:keyHintLabel="3"
@@ -42,27 +42,27 @@
         latin:keySpec="g"
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/more_keys_for_g" />
+        latin:moreKeys="!text/morekeys_g" />
     <Key
         latin:keySpec="j"
         latin:keyHintLabel="6"
         latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/more_keys_for_j" />
+        latin:moreKeys="!text/morekeys_j" />
     <Key
         latin:keySpec="l"
         latin:keyHintLabel="7"
         latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/more_keys_for_l" />
+        latin:moreKeys="!text/morekeys_l" />
     <Key
         latin:keySpec="u"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/more_keys_for_u" />
+        latin:moreKeys="!text/morekeys_u" />
     <Key
         latin:keySpec="y"
         latin:keyHintLabel="9"
         latin:additionalMoreKeys="9"
-        latin:moreKeys="!text/more_keys_for_y" />
+        latin:moreKeys="!text/morekeys_y" />
     <switch>
         <case
             latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"

java/res/xml/rowkeys_colemak2.xml

@@ -23,32 +23,32 @@
 >
     <Key
         latin:keySpec="a"
-        latin:moreKeys="!text/more_keys_for_a" />
+        latin:moreKeys="!text/morekeys_a" />
     <Key
         latin:keySpec="r"
-        latin:moreKeys="!text/more_keys_for_r" />
+        latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="s"
-        latin:moreKeys="!text/more_keys_for_s" />
+        latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="t"
-        latin:moreKeys="!text/more_keys_for_t" />
+        latin:moreKeys="!text/morekeys_t" />
     <Key
         latin:keySpec="d"
-        latin:moreKeys="!text/more_keys_for_d" />
+        latin:moreKeys="!text/morekeys_d" />
     <Key
         latin:keySpec="h"
-        latin:moreKeys="!text/more_keys_for_h" />
+        latin:moreKeys="!text/morekeys_h" />
     <Key
         latin:keySpec="n"
-        latin:moreKeys="!text/more_keys_for_n" />
+        latin:moreKeys="!text/morekeys_n" />
     <Key
         latin:keySpec="e"
-        latin:moreKeys="!text/more_keys_for_e" />
+        latin:moreKeys="!text/morekeys_e" />
     <Key
         latin:keySpec="i"
-        latin:moreKeys="!text/more_keys_for_i" />
+        latin:moreKeys="!text/morekeys_i" />
     <Key
         latin:keySpec="o"
-        latin:moreKeys="!text/more_keys_for_o" />
+        latin:moreKeys="!text/morekeys_o" />
 </merge>

java/res/xml/rowkeys_colemak3.xml

@@ -23,20 +23,20 @@
 >
     <Key
         latin:keySpec="z"
-        latin:moreKeys="!text/more_keys_for_z" />
+        latin:moreKeys="!text/morekeys_z" />
     <Key
         latin:keySpec="x" />
     <Key
         latin:keySpec="c"
-        latin:moreKeys="!text/more_keys_for_c" />
+        latin:moreKeys="!text/morekeys_c" />
     <Key
         latin:keySpec="v"
-        latin:moreKeys="!text/more_keys_for_v" />
+        latin:moreKeys="!text/morekeys_v" />
     <Key
         latin:keySpec="b" />
     <Key
         latin:keySpec="k"
-        latin:moreKeys="!text/more_keys_for_k" />
+        latin:moreKeys="!text/morekeys_k" />
     <Key
         latin:keySpec="m" />
 </merge>

java/res/xml/rowkeys_dvorak1.xml

@@ -31,7 +31,7 @@
         latin:keySpec="y"
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/more_keys_for_y" />
+        latin:moreKeys="!text/morekeys_y" />
     <Key
         latin:keySpec="f"
         latin:keyHintLabel="6"
@@ -40,20 +40,20 @@
         latin:keySpec="g"
         latin:keyHintLabel="7"
         latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/more_keys_for_g" />
+        latin:moreKeys="!text/morekeys_g" />
     <Key
         latin:keySpec="c"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/more_keys_for_c" />
+        latin:moreKeys="!text/morekeys_c" />
     <Key
         latin:keySpec="r"
         latin:keyHintLabel="9"
         latin:additionalMoreKeys="9"
-        latin:moreKeys="!text/more_keys_for_r" />
+        latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="l"
         latin:keyHintLabel="0"
         latin:additionalMoreKeys="0"
-        latin:moreKeys="!text/more_keys_for_l" />
+        latin:moreKeys="!text/morekeys_l" />
 </merge>

java/res/xml/rowkeys_dvorak2.xml

@@ -23,32 +23,32 @@
 >
     <Key
         latin:keySpec="a"
-        latin:moreKeys="!text/more_keys_for_a" />
+        latin:moreKeys="!text/morekeys_a" />
     <Key
         latin:keySpec="o"
-        latin:moreKeys="!text/more_keys_for_o" />
+        latin:moreKeys="!text/morekeys_o" />
     <Key
         latin:keySpec="e"
-        latin:moreKeys="!text/more_keys_for_e" />
+        latin:moreKeys="!text/morekeys_e" />
     <Key
         latin:keySpec="u"
-        latin:moreKeys="!text/more_keys_for_u" />
+        latin:moreKeys="!text/morekeys_u" />
     <Key
         latin:keySpec="i"
-        latin:moreKeys="!text/more_keys_for_i" />
+        latin:moreKeys="!text/morekeys_i" />
     <Key
         latin:keySpec="d"
-        latin:moreKeys="!text/more_keys_for_d" />
+        latin:moreKeys="!text/morekeys_d" />
     <Key
         latin:keySpec="h"
-        latin:moreKeys="!text/more_keys_for_h" />
+        latin:moreKeys="!text/morekeys_h" />
     <Key
         latin:keySpec="t"
-        latin:moreKeys="!text/more_keys_for_t" />
+        latin:moreKeys="!text/morekeys_t" />
     <Key
         latin:keySpec="n"
-        latin:moreKeys="!text/more_keys_for_n" />
+        latin:moreKeys="!text/morekeys_n" />
     <Key
         latin:keySpec="s"
-        latin:moreKeys="!text/more_keys_for_s" />
+        latin:moreKeys="!text/morekeys_s" />
 </merge>

java/res/xml/rowkeys_dvorak3.xml

@@ -23,10 +23,10 @@
 >
     <Key
         latin:keySpec="j"
-        latin:moreKeys="!text/more_keys_for_j" />
+        latin:moreKeys="!text/morekeys_j" />
     <Key
         latin:keySpec="k"
-        latin:moreKeys="!text/more_keys_for_k" />
+        latin:moreKeys="!text/morekeys_k" />
     <Key
         latin:keySpec="x" />
     <Key
@@ -35,8 +35,8 @@
         latin:keySpec="m" />
     <Key
         latin:keySpec="w"
-        latin:moreKeys="!text/more_keys_for_w" />
+        latin:moreKeys="!text/morekeys_w" />
     <Key
         latin:keySpec="v"
-        latin:moreKeys="!text/more_keys_for_v" />
+        latin:moreKeys="!text/morekeys_v" />
 </merge>

java/res/xml/rowkeys_east_slavic1.xml

@@ -36,38 +36,38 @@
         latin:keySpec="у"
         latin:keyHintLabel="3"
         latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/more_keys_for_cyrillic_u" />
+        latin:moreKeys="!text/morekeys_cyrillic_u" />
     <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
     <Key
         latin:keySpec="&#x043A;"
         latin:keyHintLabel="4"
         latin:additionalMoreKeys="4"
-        latin:moreKeys="!text/more_keys_for_cyrillic_ka" />
+        latin:moreKeys="!text/morekeys_cyrillic_ka" />
     <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
     <Key
         latin:keySpec="&#x0435;"
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/more_keys_for_cyrillic_ie" />
+        latin:moreKeys="!text/morekeys_cyrillic_ie" />
     <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
     <Key
         latin:keySpec="&#x043D;"
         latin:keyHintLabel="6"
         latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/more_keys_for_cyrillic_en" />
+        latin:moreKeys="!text/morekeys_cyrillic_en" />
     <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
     <Key
         latin:keySpec="&#x0433;"
         latin:keyHintLabel="7"
         latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/more_keys_for_cyrillic_ghe" />
+        latin:moreKeys="!text/morekeys_cyrillic_ghe" />
     <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
     <Key
         latin:keySpec="&#x0448;"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8" />
     <Key
-        latin:keySpec="!text/keylabel_for_east_slavic_row1_9"
+        latin:keySpec="!text/keyspec_east_slavic_row1_9"
         latin:keyHintLabel="9"
         latin:additionalMoreKeys="9" />
     <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->

java/res/xml/rowkeys_east_slavic2.xml

@@ -25,15 +25,15 @@
     <Key
         latin:keySpec="&#x0444;" />
     <Key
-        latin:keySpec="!text/keylabel_for_east_slavic_row2_2"
+        latin:keySpec="!text/keyspec_east_slavic_row2_2"
-        latin:moreKeys="!text/more_keys_for_east_slavic_row2_2" />
+        latin:moreKeys="!text/morekeys_east_slavic_row2_2" />
     <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
     <Key
         latin:keySpec="&#x0432;" />
     <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
     <Key
         latin:keySpec="&#x0430;"
-        latin:moreKeys="!text/more_keys_for_cyrillic_a" />
+        latin:moreKeys="!text/morekeys_cyrillic_a" />
     <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
     <Key
         latin:keySpec="&#x043F;" />
@@ -43,7 +43,7 @@
     <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
     <Key
         latin:keySpec="&#x043E;"
-        latin:moreKeys="!text/more_keys_for_cyrillic_o" />
+        latin:moreKeys="!text/morekeys_cyrillic_o" />
     <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
     <Key
         latin:keySpec="&#x043B;" />
@@ -54,6 +54,6 @@
     <Key
         latin:keySpec="&#x0436;" />
     <Key
-        latin:keySpec="!text/keylabel_for_east_slavic_row2_11"
+        latin:keySpec="!text/keyspec_east_slavic_row2_11"
-        latin:moreKeys="!text/more_keys_for_east_slavic_row2_11" />
+        latin:moreKeys="!text/morekeys_east_slavic_row2_11" />
 </merge>

java/res/xml/rowkeys_east_slavic3.xml

@@ -34,14 +34,14 @@
     <Key
         latin:keySpec="&#x043C;" />
     <Key
-        latin:keySpec="!text/keylabel_for_east_slavic_row3_5" />
+        latin:keySpec="!text/keyspec_east_slavic_row3_5" />
     <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
     <Key
         latin:keySpec="&#x0442;" />
     <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
     <Key
         latin:keySpec="&#x044C;"
-        latin:moreKeys="!text/more_keys_for_cyrillic_soft_sign" />
+        latin:moreKeys="!text/morekeys_cyrillic_soft_sign" />
     <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
     <Key
         latin:keySpec="&#x0431;" />

java/res/xml/rowkeys_mongolian1.xml

@@ -36,7 +36,7 @@
         latin:keySpec="у"
         latin:keyHintLabel="3"
         latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/more_keys_for_cyrillic_u" />
+        latin:moreKeys="!text/morekeys_cyrillic_u" />
     <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
     <Key
         latin:keySpec="&#x0436;"
@@ -47,19 +47,19 @@
         latin:keySpec="&#x044D;"
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/more_keys_for_cyrillic_ie" />
+        latin:moreKeys="!text/morekeys_cyrillic_ie" />
     <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
     <Key
         latin:keySpec="&#x043D;"
         latin:keyHintLabel="6"
         latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/more_keys_for_cyrillic_en" />
+        latin:moreKeys="!text/morekeys_cyrillic_en" />
     <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
     <Key
         latin:keySpec="&#x0433;"
         latin:keyHintLabel="7"
         latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/more_keys_for_cyrillic_ghe" />
+        latin:moreKeys="!text/morekeys_cyrillic_ghe" />
     <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA
          U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
     <Key

java/res/xml/rowkeys_nordic1.xml

@@ -24,5 +24,5 @@
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty1" />
     <Key
-        latin:keySpec="!text/keylabel_for_nordic_row1_11" />
+        latin:keySpec="!text/keyspec_nordic_row1_11" />
 </merge>

java/res/xml/rowkeys_nordic2.xml

@@ -24,9 +24,9 @@
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty2" />
     <Key
-        latin:keySpec="!text/keylabel_for_nordic_row2_10"
+        latin:keySpec="!text/keyspec_nordic_row2_10"
-        latin:moreKeys="!text/more_keys_for_nordic_row2_10" />
+        latin:moreKeys="!text/morekeys_nordic_row2_10" />
     <Key
-        latin:keySpec="!text/keylabel_for_nordic_row2_11"
+        latin:keySpec="!text/keyspec_nordic_row2_11"
-        latin:moreKeys="!text/more_keys_for_nordic_row2_11" />
+        latin:moreKeys="!text/morekeys_nordic_row2_11" />
 </merge>

java/res/xml/rowkeys_pcqwerty1.xml

@@ -30,44 +30,44 @@
                 latin:additionalMoreKeys="~" />
             <Key
                 latin:keySpec="1"
-                latin:additionalMoreKeys="!,!text/more_keys_for_exclamation"
+                latin:additionalMoreKeys="!,!text/morekeys_exclamation"
-                latin:moreKeys="!text/more_keys_for_symbols_1" />
+                latin:moreKeys="!text/morekeys_symbols_1" />
             <Key
                 latin:keySpec="2"
                 latin:additionalMoreKeys="\@"
-                latin:moreKeys="!text/more_keys_for_symbols_2" />
+                latin:moreKeys="!text/morekeys_symbols_2" />
             <Key
                 latin:keySpec="3"
                 latin:additionalMoreKeys="\#"
-                latin:moreKeys="!text/more_keys_for_symbols_3" />
+                latin:moreKeys="!text/morekeys_symbols_3" />
             <Key
                 latin:keySpec="4"
                 latin:additionalMoreKeys="$"
-                latin:moreKeys="!text/more_keys_for_symbols_4" />
+                latin:moreKeys="!text/morekeys_symbols_4" />
             <Key
                 latin:keySpec="5"
                 latin:additionalMoreKeys="\\%"
-                latin:moreKeys="!text/more_keys_for_symbols_5" />
+                latin:moreKeys="!text/morekeys_symbols_5" />
             <Key
                 latin:keySpec="6"
                 latin:additionalMoreKeys="^"
-                latin:moreKeys="!text/more_keys_for_symbols_6" />
+                latin:moreKeys="!text/morekeys_symbols_6" />
             <Key
                 latin:keySpec="7"
                 latin:additionalMoreKeys="&amp;"
-                latin:moreKeys="!text/more_keys_for_symbols_7" />
+                latin:moreKeys="!text/morekeys_symbols_7" />
             <Key
                 latin:keySpec="8"
                 latin:additionalMoreKeys="*"
-                latin:moreKeys="!text/more_keys_for_symbols_8" />
+                latin:moreKeys="!text/morekeys_symbols_8" />
             <Key
                 latin:keySpec="9"
                 latin:additionalMoreKeys="("
-                latin:moreKeys="!text/more_keys_for_symbols_9" />
+                latin:moreKeys="!text/morekeys_symbols_9" />
             <Key
                 latin:keySpec="0"
                 latin:additionalMoreKeys=")"
-                latin:moreKeys="!text/more_keys_for_symbols_0" />
+                latin:moreKeys="!text/morekeys_symbols_0" />
             <!-- U+2013: "–" EN DASH
                  U+2014: "—" EM DASH
                  U+00B7: "·" MIDDLE DOT -->

java/res/xml/rowkeys_pcqwerty1_shift.xml

@@ -25,24 +25,24 @@
         latin:keySpec="~" />
     <Key
         latin:keySpec="!"
-        latin:additionalMoreKeys="!text/more_keys_for_exclamation" />
+        latin:additionalMoreKeys="!text/morekeys_exclamation" />
     <Key
         latin:keySpec="\@" />
     <Key
         latin:keySpec="\#" />
     <Key
         latin:keySpec="$"
-        latin:additionalMoreKeys="!text/more_keys_for_currency_dollar" />
+        latin:additionalMoreKeys="!text/morekeys_currency_dollar" />
     <Key
         latin:keySpec="%"
-        latin:additionalMoreKeys="!text/more_keys_for_symbols_percent" />
+        latin:additionalMoreKeys="!text/morekeys_symbols_percent" />
     <Key
         latin:keySpec="^" />
     <Key
         latin:keySpec="&amp;" />
     <Key
         latin:keySpec="*"
-        latin:additionalMoreKeys="!text/more_keys_for_star" />
+        latin:additionalMoreKeys="!text/morekeys_star" />
     <Key
         latin:keySpec="(" />
     <Key
@@ -54,6 +54,6 @@
          U+221A: "√" SQUARE ROOT -->
     <Key
         latin:keySpec="+"
-        latin:additionalMoreKeys="!text/more_keys_for_plus"
+        latin:additionalMoreKeys="!text/morekeys_plus"
         latin:moreKeys="&#x00D7;,&#x00F7;,&#x221A;" />
 </merge>

java/res/xml/rowkeys_qwerty1.xml

@@ -22,50 +22,50 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <Key
-        latin:keySpec="!text/keylabel_for_q"
+        latin:keySpec="!text/keyspec_q"
         latin:keyHintLabel="1"
         latin:additionalMoreKeys="1"
-        latin:moreKeys="!text/more_keys_for_q" />
+        latin:moreKeys="!text/morekeys_q" />
     <Key
-        latin:keySpec="!text/keylabel_for_w"
+        latin:keySpec="!text/keyspec_w"
         latin:keyHintLabel="2"
         latin:additionalMoreKeys="2"
-        latin:moreKeys="!text/more_keys_for_w" />
+        latin:moreKeys="!text/morekeys_w" />
     <Key
         latin:keySpec="e"
         latin:keyHintLabel="3"
         latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/more_keys_for_e" />
+        latin:moreKeys="!text/morekeys_e" />
     <Key
         latin:keySpec="r"
         latin:keyHintLabel="4"
         latin:additionalMoreKeys="4"
-        latin:moreKeys="!text/more_keys_for_r" />
+        latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="t"
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/more_keys_for_t" />
+        latin:moreKeys="!text/morekeys_t" />
     <Key
-        latin:keySpec="!text/keylabel_for_y"
+        latin:keySpec="!text/keyspec_y"
         latin:keyHintLabel="6"
         latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/more_keys_for_y" />
+        latin:moreKeys="!text/morekeys_y" />
     <Key
         latin:keySpec="u"
         latin:keyHintLabel="7"
         latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/more_keys_for_u" />
+        latin:moreKeys="!text/morekeys_u" />
     <Key
         latin:keySpec="i"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/more_keys_for_i" />
+        latin:moreKeys="!text/morekeys_i" />
     <Key
         latin:keySpec="o"
         latin:keyHintLabel="9"
         latin:additionalMoreKeys="9"
-        latin:moreKeys="!text/more_keys_for_o" />
+        latin:moreKeys="!text/morekeys_o" />
     <Key
         latin:keySpec="p"
         latin:keyHintLabel="0"

java/res/xml/rowkeys_qwerty2.xml

@@ -23,28 +23,28 @@
 >
     <Key
         latin:keySpec="a"
-        latin:moreKeys="!text/more_keys_for_a" />
+        latin:moreKeys="!text/morekeys_a" />
     <Key
         latin:keySpec="s"
-        latin:moreKeys="!text/more_keys_for_s" />
+        latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="d"
-        latin:moreKeys="!text/more_keys_for_d" />
+        latin:moreKeys="!text/morekeys_d" />
     <Key
         latin:keySpec="f" />
     <Key
         latin:keySpec="g"
-        latin:moreKeys="!text/more_keys_for_g" />
+        latin:moreKeys="!text/morekeys_g" />
     <Key
         latin:keySpec="h"
-        latin:moreKeys="!text/more_keys_for_h" />
+        latin:moreKeys="!text/morekeys_h" />
     <Key
         latin:keySpec="j"
-        latin:moreKeys="!text/more_keys_for_j" />
+        latin:moreKeys="!text/morekeys_j" />
     <Key
         latin:keySpec="k"
-        latin:moreKeys="!text/more_keys_for_k" />
+        latin:moreKeys="!text/morekeys_k" />
     <Key
         latin:keySpec="l"
-        latin:moreKeys="!text/more_keys_for_l" />
+        latin:moreKeys="!text/morekeys_l" />
 </merge>

java/res/xml/rowkeys_qwerty3.xml

@@ -23,21 +23,21 @@
 >
     <Key
         latin:keySpec="z"
-        latin:moreKeys="!text/more_keys_for_z" />
+        latin:moreKeys="!text/morekeys_z" />
     <Key
-        latin:keySpec="!text/keylabel_for_x"
+        latin:keySpec="!text/keyspec_x"
-        latin:moreKeys="!text/more_keys_for_x" />
+        latin:moreKeys="!text/morekeys_x" />
     <Key
         latin:keySpec="c"
-        latin:moreKeys="!text/more_keys_for_c" />
+        latin:moreKeys="!text/morekeys_c" />
     <Key
         latin:keySpec="v"
-        latin:moreKeys="!text/more_keys_for_v" />
+        latin:moreKeys="!text/morekeys_v" />
     <Key
         latin:keySpec="b" />
     <Key
         latin:keySpec="n"
-        latin:moreKeys="!text/more_keys_for_n" />
+        latin:moreKeys="!text/morekeys_n" />
     <Key
         latin:keySpec="m" />
 </merge>

java/res/xml/rowkeys_qwertz1.xml

@@ -29,42 +29,42 @@
         latin:keySpec="w"
         latin:keyHintLabel="2"
         latin:additionalMoreKeys="2"
-        latin:moreKeys="!text/more_keys_for_w" />
+        latin:moreKeys="!text/morekeys_w" />
     <Key
         latin:keySpec="e"
         latin:keyHintLabel="3"
         latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/more_keys_for_e" />
+        latin:moreKeys="!text/morekeys_e" />
     <Key
         latin:keySpec="r"
         latin:keyHintLabel="4"
         latin:additionalMoreKeys="4"
-        latin:moreKeys="!text/more_keys_for_r" />
+        latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="t"
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/more_keys_for_t" />
+        latin:moreKeys="!text/morekeys_t" />
     <Key
         latin:keySpec="z"
         latin:keyHintLabel="6"
         latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/more_keys_for_z" />
+        latin:moreKeys="!text/morekeys_z" />
      <Key
         latin:keySpec="u"
         latin:keyHintLabel="7"
         latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/more_keys_for_u" />
+        latin:moreKeys="!text/morekeys_u" />
     <Key
         latin:keySpec="i"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/more_keys_for_i" />
+        latin:moreKeys="!text/morekeys_i" />
     <Key
         latin:keySpec="o"
         latin:keyHintLabel="9"
         latin:additionalMoreKeys="9"
-        latin:moreKeys="!text/more_keys_for_o" />
+        latin:moreKeys="!text/morekeys_o" />
     <Key
         latin:keySpec="p"
         latin:keyHintLabel="0"

java/res/xml/rowkeys_qwertz3.xml

@@ -23,20 +23,20 @@
 >
     <Key
         latin:keySpec="y"
-        latin:moreKeys="!text/more_keys_for_y" />
+        latin:moreKeys="!text/morekeys_y" />
     <Key
         latin:keySpec="x" />
     <Key
         latin:keySpec="c"
-        latin:moreKeys="!text/more_keys_for_c" />
+        latin:moreKeys="!text/morekeys_c" />
     <Key
         latin:keySpec="v"
-        latin:moreKeys="!text/more_keys_for_v" />
+        latin:moreKeys="!text/morekeys_v" />
     <Key
         latin:keySpec="b" />
     <Key
         latin:keySpec="n"
-        latin:moreKeys="!text/more_keys_for_n" />
+        latin:moreKeys="!text/morekeys_n" />
     <Key
         latin:keySpec="m" />
 </merge>

java/res/xml/rowkeys_south_slavic1.xml

@@ -36,7 +36,7 @@
         latin:keySpec="е"
         latin:keyHintLabel="3"
         latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/more_keys_for_cyrillic_ie" />
+        latin:moreKeys="!text/morekeys_cyrillic_ie" />
     <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
     <Key
         latin:keySpec="&#x0440;"
@@ -48,7 +48,7 @@
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5" />
     <Key
-        latin:keySpec="!text/keylabel_for_south_slavic_row1_6"
+        latin:keySpec="!text/keyspec_south_slavic_row1_6"
         latin:keyHintLabel="6"
         latin:additionalMoreKeys="6" />
     <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
@@ -61,7 +61,7 @@
         latin:keySpec="&#x0438;"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/more_keys_for_cyrillic_i" />
+        latin:moreKeys="!text/morekeys_cyrillic_i" />
     <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
     <Key
         latin:keySpec="&#x043E;"

java/res/xml/rowkeys_south_slavic2.xml

@@ -52,5 +52,5 @@
     <Key
         latin:keySpec="&#x0447;" />
     <Key
-        latin:keySpec="!text/keylabel_for_south_slavic_row2_11" />
+        latin:keySpec="!text/keyspec_south_slavic_row2_11" />
 </merge>

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:keySpec="!text/keylabel_for_south_slavic_row3_1" />
+        latin:keySpec="!text/keyspec_south_slavic_row3_1" />
     <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
     <Key
         latin:keySpec="&#x045F;" />
@@ -42,7 +42,7 @@
     <Key
         latin:keySpec="&#x043C;" />
     <Key
-        latin:keySpec="!text/keylabel_for_south_slavic_row3_8" />
+        latin:keySpec="!text/keyspec_south_slavic_row3_8" />
     <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
     <Key
         latin:keySpec="&#x0436;" />

java/res/xml/rowkeys_spanish2.xml

@@ -25,5 +25,5 @@
         latin:keyboardLayout="@xml/rowkeys_qwerty2" />
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
     <Key
-        latin:keySpec="!text/keylabel_for_spanish_row2_10" />
+        latin:keySpec="!text/keyspec_spanish_row2_10" />
  </merge>

java/res/xml/rowkeys_swiss1.xml

@@ -24,6 +24,6 @@
     <include
         latin:keyboardLayout="@xml/rowkeys_qwertz1" />
     <Key
-        latin:keySpec="!text/keylabel_for_swiss_row1_11"
+        latin:keySpec="!text/keyspec_swiss_row1_11"
-        latin:moreKeys="!text/more_keys_for_swiss_row1_11" />
+        latin:moreKeys="!text/morekeys_swiss_row1_11" />
 </merge>

java/res/xml/rowkeys_swiss2.xml

@@ -24,9 +24,9 @@
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty2" />
     <Key
-        latin:keySpec="!text/keylabel_for_swiss_row2_10"
+        latin:keySpec="!text/keyspec_swiss_row2_10"
-        latin:moreKeys="!text/more_keys_for_swiss_row2_10" />
+        latin:moreKeys="!text/morekeys_swiss_row2_10" />
     <Key
-        latin:keySpec="!text/keylabel_for_swiss_row2_11"
+        latin:keySpec="!text/keyspec_swiss_row2_11"
-        latin:moreKeys="!text/more_keys_for_swiss_row2_11" />
+        latin:moreKeys="!text/morekeys_swiss_row2_11" />
 </merge>

java/res/xml/rowkeys_symbols1.xml

@@ -22,43 +22,43 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_1"
+        latin:keySpec="!text/keyspec_symbols_1"
-        latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_1"
+        latin:additionalMoreKeys="!text/additional_morekeys_symbols_1"
-        latin:moreKeys="!text/more_keys_for_symbols_1" />
+        latin:moreKeys="!text/morekeys_symbols_1" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_2"
+        latin:keySpec="!text/keyspec_symbols_2"
-        latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_2"
+        latin:additionalMoreKeys="!text/additional_morekeys_symbols_2"
-        latin:moreKeys="!text/more_keys_for_symbols_2" />
+        latin:moreKeys="!text/morekeys_symbols_2" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_3"
+        latin:keySpec="!text/keyspec_symbols_3"
-        latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_3"
+        latin:additionalMoreKeys="!text/additional_morekeys_symbols_3"
-        latin:moreKeys="!text/more_keys_for_symbols_3" />
+        latin:moreKeys="!text/morekeys_symbols_3" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_4"
+        latin:keySpec="!text/keyspec_symbols_4"
-        latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_4"
+        latin:additionalMoreKeys="!text/additional_morekeys_symbols_4"
-        latin:moreKeys="!text/more_keys_for_symbols_4" />
+        latin:moreKeys="!text/morekeys_symbols_4" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_5"
+        latin:keySpec="!text/keyspec_symbols_5"
-        latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_5"
+        latin:additionalMoreKeys="!text/additional_morekeys_symbols_5"
-        latin:moreKeys="!text/more_keys_for_symbols_5" />
+        latin:moreKeys="!text/morekeys_symbols_5" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_6"
+        latin:keySpec="!text/keyspec_symbols_6"
-        latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_6"
+        latin:additionalMoreKeys="!text/additional_morekeys_symbols_6"
-        latin:moreKeys="!text/more_keys_for_symbols_6" />
+        latin:moreKeys="!text/morekeys_symbols_6" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_7"
+        latin:keySpec="!text/keyspec_symbols_7"
-        latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_7"
+        latin:additionalMoreKeys="!text/additional_morekeys_symbols_7"
-        latin:moreKeys="!text/more_keys_for_symbols_7" />
+        latin:moreKeys="!text/morekeys_symbols_7" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_8"
+        latin:keySpec="!text/keyspec_symbols_8"
-        latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_8"
+        latin:additionalMoreKeys="!text/additional_morekeys_symbols_8"
-        latin:moreKeys="!text/more_keys_for_symbols_8" />
+        latin:moreKeys="!text/morekeys_symbols_8" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_9"
+        latin:keySpec="!text/keyspec_symbols_9"
-        latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_9"
+        latin:additionalMoreKeys="!text/additional_morekeys_symbols_9"
-        latin:moreKeys="!text/more_keys_for_symbols_9" />
+        latin:moreKeys="!text/morekeys_symbols_9" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_0"
+        latin:keySpec="!text/keyspec_symbols_0"
-        latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_0"
+        latin:additionalMoreKeys="!text/additional_morekeys_symbols_0"
-        latin:moreKeys="!text/more_keys_for_symbols_0" />
+        latin:moreKeys="!text/morekeys_symbols_0" />
 </merge>

java/res/xml/rowkeys_symbols2.xml

@@ -46,8 +46,8 @@
     <Key
         latin:keyStyle="currencyKeyStyle" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_percent"
+        latin:keySpec="!text/keyspec_symbols_percent"
-        latin:moreKeys="!text/more_keys_for_symbols_percent" />
+        latin:moreKeys="!text/morekeys_symbols_percent" />
     <Key
         latin:keySpec="&amp;" />
     <!-- U+2013: "–" EN DASH
@@ -58,7 +58,7 @@
         latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />
     <Key
         latin:keySpec="+"
-        latin:moreKeys="!text/more_keys_for_plus" />
+        latin:moreKeys="!text/morekeys_plus" />
     <include
         latin:keyboardLayout="@xml/keys_parentheses" />
 </merge>

java/res/xml/rowkeys_symbols3.xml

@@ -23,36 +23,36 @@
 >
     <Key
         latin:keySpec="*"
-        latin:moreKeys="!text/more_keys_for_star" />
+        latin:moreKeys="!text/morekeys_star" />
     <switch>
         <case
             latin:languageCode="fa"
         >
             <Key
                 latin:keySpec="!text/keyspec_left_double_angle_quote"
-                latin:moreKeys="!text/more_keys_for_double_quote" />
+                latin:moreKeys="!text/morekeys_double_quote" />
             <Key
                 latin:keySpec="!text/keyspec_right_double_angle_quote"
-                latin:moreKeys="!text/more_keys_for_single_quote" />
+                latin:moreKeys="!text/morekeys_single_quote" />
         </case>
         <default>
             <Key
                 latin:keySpec="&quot;"
-                latin:moreKeys="!text/more_keys_for_double_quote" />
+                latin:moreKeys="!text/morekeys_double_quote" />
             <Key
                 latin:keySpec="\'"
-                latin:moreKeys="!text/more_keys_for_single_quote" />
+                latin:moreKeys="!text/morekeys_single_quote" />
         </default>
     </switch>
     <Key
         latin:keySpec=":" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_semicolon"
+        latin:keySpec="!text/keyspec_symbols_semicolon"
-        latin:moreKeys="!text/more_keys_for_symbols_semicolon" />
+        latin:moreKeys="!text/morekeys_symbols_semicolon" />
     <Key
         latin:keySpec="!"
-        latin:moreKeys="!text/more_keys_for_exclamation" />
+        latin:moreKeys="!text/morekeys_exclamation" />
     <Key
-        latin:keySpec="!text/keylabel_for_symbols_question"
+        latin:keySpec="!text/keyspec_symbols_question"
-        latin:moreKeys="!text/more_keys_for_question" />
+        latin:moreKeys="!text/morekeys_question" />
 </merge>

java/res/xml/rowkeys_symbols_shift1.xml

@@ -30,7 +30,7 @@
     <!-- U+2022: "•" BULLET -->
     <Key
         latin:keySpec="&#x2022;"
-        latin:moreKeys="!text/more_keys_for_bullet" />
+        latin:moreKeys="!text/morekeys_bullet" />
     <!-- U+221A: "√" SQUARE ROOT -->
     <Key
         latin:keySpec="&#x221A;" />

java/res/xml/rows_number_normal.xml

@@ -63,7 +63,7 @@
                 <Key
                     latin:keySpec="."
                     latin:keyLabelFlags="hasPopupHint"
-                    latin:moreKeys="!text/more_keys_for_am_pm"
+                    latin:moreKeys="!text/morekeys_am_pm"
                     latin:keyStyle="numFunctionalKeyStyle"
                     latin:keyWidth="fillRight" />
             </case>

tests/res/values/donottranslate.xml

@@ -58,5 +58,5 @@
     <string name="upper_indirect_string_with_literal">x,!TEXT/MULTIPLE_CHARS,y</string>
     <string name="upper_indirect2_string">!TEXT/UPPER_INDIRECT_STRING</string>
     <string name="upper_infinite_indirection">infinite,!TEXT/INFINITE_INDIRECTION,loop</string>
-    <string name="indirect_navigate_actions_as_more_key">!fixedColumnOrder!2,!text/action_previous_as_more_key,!text/action_next_as_more_key</string>
+    <string name="keyspec_indirect_navigate_actions">!fixedColumnOrder!2,!text/keyspec_action_previous,!text/keyspec_action_next</string>
 </resources>

tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java

@@ -251,14 +251,14 @@ abstract class KeySpecParserTestsBase extends AndroidTestCase {
     }
 
     public void testResourceReference() {
-        assertParser("Settings as more key", "!text/settings_as_more_key",
+        assertParser("Settings as more key", "!text/keyspec_settings",
                 null, null, mSettingsIconId, mCodeSettings);
 
         assertParser("Action next as more key", "!text/label_next_key|!code/key_action_next",
                 "Next", null, ICON_UNDEFINED, mCodeActionNext);
 
         assertParser("Popular domain",
-                "!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain ",
+                "!text/keyspec_popular_domain|!text/keyspec_popular_domain ",
                 ".com", ".com ", ICON_UNDEFINED, CODE_OUTPUT_TEXT);
     }
 

tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java

@@ -355,16 +355,16 @@ public class MoreKeySpecSplitTests extends InstrumentationTestCase {
     }
 
     public void testLabelReferece() {
-        assertTextArray("Label time am", "!text/label_time_am", "AM");
+        assertTextArray("Label time am", "!text/keylabel_time_am", "AM");
 
-        assertTextArray("More keys for am pm", "!text/more_keys_for_am_pm",
+        assertTextArray("More keys for am pm", "!text/morekeys_am_pm",
                 "!fixedColumnOrder!2", "!hasLabels!", "AM", "PM");
 
-        assertTextArray("Settings as more key", "!text/settings_as_more_key",
+        assertTextArray("Settings as more key", "!text/keyspec_settings",
                 "!icon/settings_key|!code/key_settings");
 
         assertTextArray("Indirect naviagte actions as more key",
-                "!text/indirect_navigate_actions_as_more_key",
+                "!text/keyspec_indirect_navigate_actions",
                 "!fixedColumnOrder!2",
                 "!hasLabels!", "Prev|!code/key_action_previous",
                 "!hasLabels!", "Next|!code/key_action_next");

tools/make-keyboard-text/res/values-af/donottranslate-more-keys.xml

@@ -27,7 +27,7 @@
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E2;,&#x00E4;,&#x00E0;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E2;,&#x00E4;,&#x00E0;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
@@ -35,7 +35,7 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
@@ -43,7 +43,7 @@
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
          U+0133: "ij" LATIN SMALL LIGATURE IJ -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EC;,&#x00EF;,&#x00EE;,&#x012F;,&#x012B;,&#x0133;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EC;,&#x00EF;,&#x00EE;,&#x012F;,&#x012B;,&#x0133;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
@@ -52,17 +52,17 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F4;,&#x00F6;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F4;,&#x00F6;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x00FB;,&#x00FC;,&#x00F9;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x00FB;,&#x00FC;,&#x00F9;,&#x016B;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x00F1;,&#x0144;</string>
     <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
          U+0133: "ij" LATIN SMALL LIGATURE IJ -->
-    <string name="more_keys_for_y">&#x00FD;,&#x0133;</string>
+    <string name="morekeys_y">&#x00FD;,&#x0133;</string>
 </resources>

tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml

@@ -23,78 +23,75 @@
          U+200C: ZERO WIDTH NON-JOINER
          U+0628: "ب" ARABIC LETTER BEH
          U+062C: "ج" ARABIC LETTER JEEM -->
-    <string name="label_to_alpha_key">&#x0623;&#x200C;&#x0628;&#x200C;&#x062C;</string>
+    <string name="keylabel_to_alpha">&#x0623;&#x200C;&#x0628;&#x200C;&#x062C;</string>
     <!-- U+0661: "١" ARABIC-INDIC DIGIT ONE -->
-    <string name="keylabel_for_symbols_1">&#x0661;</string>
+    <string name="keyspec_symbols_1">&#x0661;</string>
     <!-- U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
-    <string name="keylabel_for_symbols_2">&#x0662;</string>
+    <string name="keyspec_symbols_2">&#x0662;</string>
     <!-- U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
-    <string name="keylabel_for_symbols_3">&#x0663;</string>
+    <string name="keyspec_symbols_3">&#x0663;</string>
     <!-- U+0664: "٤" ARABIC-INDIC DIGIT FOUR -->
-    <string name="keylabel_for_symbols_4">&#x0664;</string>
+    <string name="keyspec_symbols_4">&#x0664;</string>
     <!-- U+0665: "٥" ARABIC-INDIC DIGIT FIVE -->
-    <string name="keylabel_for_symbols_5">&#x0665;</string>
+    <string name="keyspec_symbols_5">&#x0665;</string>
     <!-- U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
-    <string name="keylabel_for_symbols_6">&#x0666;</string>
+    <string name="keyspec_symbols_6">&#x0666;</string>
     <!-- U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
-    <string name="keylabel_for_symbols_7">&#x0667;</string>
+    <string name="keyspec_symbols_7">&#x0667;</string>
     <!-- U+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
-    <string name="keylabel_for_symbols_8">&#x0668;</string>
+    <string name="keyspec_symbols_8">&#x0668;</string>
     <!-- U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
-    <string name="keylabel_for_symbols_9">&#x0669;</string>
+    <string name="keyspec_symbols_9">&#x0669;</string>
     <!-- U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
-    <string name="keylabel_for_symbols_0">&#x0660;</string>
+    <string name="keyspec_symbols_0">&#x0660;</string>
     <!-- Label for "switch to symbols" key.
          U+061F: "؟" ARABIC QUESTION MARK -->
-    <string name="label_to_symbol_key">&#x0663;&#x0662;&#x0661;&#x061F;</string>
+    <string name="keylabel_to_symbol">&#x0663;&#x0662;&#x0661;&#x061F;</string>
-    <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
+    <string name="additional_morekeys_symbols_1">1</string>
-         part because it'll be appended by the code. -->
+    <string name="additional_morekeys_symbols_2">2</string>
-    <string name="label_to_symbol_with_microphone_key">&#x0663;&#x0662;&#x0661;</string>
+    <string name="additional_morekeys_symbols_3">3</string>
-    <string name="additional_more_keys_for_symbols_1">1</string>
+    <string name="additional_morekeys_symbols_4">4</string>
-    <string name="additional_more_keys_for_symbols_2">2</string>
+    <string name="additional_morekeys_symbols_5">5</string>
-    <string name="additional_more_keys_for_symbols_3">3</string>
+    <string name="additional_morekeys_symbols_6">6</string>
-    <string name="additional_more_keys_for_symbols_4">4</string>
+    <string name="additional_morekeys_symbols_7">7</string>
-    <string name="additional_more_keys_for_symbols_5">5</string>
+    <string name="additional_morekeys_symbols_8">8</string>
-    <string name="additional_more_keys_for_symbols_6">6</string>
+    <string name="additional_morekeys_symbols_9">9</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>
     <!-- U+066B: "٫" ARABIC DECIMAL SEPARATOR
          U+066C: "٬" ARABIC THOUSANDS SEPARATOR -->
-    <string name="additional_more_keys_for_symbols_0">0,&#x066B;,&#x066C;</string>
+    <string name="additional_morekeys_symbols_0">0,&#x066B;,&#x066C;</string>
     <!-- U+060C: "،" ARABIC COMMA -->
-    <string name="keylabel_for_comma">&#x060C;</string>
+    <string name="keyspec_comma">&#x060C;</string>
     <!-- U+0651: "ّ" ARABIC SHADDA -->
-    <string name="keyhintlabel_for_period">&#x0651;</string>
+    <string name="keyhintlabel_period">&#x0651;</string>
-    <string name="more_keys_for_period">!text/more_keys_for_arabic_diacritics</string>
+    <string name="morekeys_period">!text/morekeys_arabic_diacritics</string>
-    <string name="keyhintlabel_for_tablet_period">&#x0651;</string>
+    <string name="keyhintlabel_tablet_period">&#x0651;</string>
-    <string name="more_keys_for_tablet_period">!text/more_keys_for_arabic_diacritics</string>
+    <string name="morekeys_tablet_period">!text/morekeys_arabic_diacritics</string>
-    <string name="keylabel_for_symbols_question">&#x061F;</string>
+    <string name="keyspec_symbols_question">&#x061F;</string>
-    <string name="keylabel_for_symbols_semicolon">&#x061B;</string>
+    <string name="keyspec_symbols_semicolon">&#x061B;</string>
     <!-- U+066A: "٪" ARABIC PERCENT SIGN -->
-    <string name="keylabel_for_symbols_percent">&#x066A;</string>
+    <string name="keyspec_symbols_percent">&#x066A;</string>
     <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
-    <string name="more_keys_for_question">?,&#x00BF;</string>
+    <string name="morekeys_question">?,&#x00BF;</string>
-    <string name="more_keys_for_symbols_semicolon">;</string>
+    <string name="morekeys_symbols_semicolon">;</string>
     <!-- U+2030: "‰" PER MILLE SIGN -->
-    <string name="more_keys_for_symbols_percent">\\%,&#x2030;</string>
+    <string name="morekeys_symbols_percent">\\%,&#x2030;</string>
     <!-- U+061F: "؟" ARABIC QUESTION MARK
          U+060C: "،" ARABIC COMMA
          U+061B: "؛" ARABIC SEMICOLON -->
-    <string name="keylabel_for_tablet_comma">"&#x060C;"</string>
+    <string name="keyspec_tablet_comma">"&#x060C;"</string>
-    <string name="keyhintlabel_for_tablet_comma">"&#x061F;"</string>
+    <string name="keyhintlabel_tablet_comma">"&#x061F;"</string>
-    <string name="more_keys_for_tablet_comma">"!fixedColumnOrder!4,:,!,&#x061F;,&#x061B;,-,/,\",\'"</string>
+    <string name="morekeys_tablet_comma">"!fixedColumnOrder!4,:,!,&#x061F;,&#x061B;,-,/,\",\'"</string>
     <!-- U+266A: "♪" EIGHTH NOTE -->
-    <string name="more_keys_for_bullet">&#x266A;</string>
+    <string name="morekeys_bullet">&#x266A;</string>
     <!-- U+2605: "★" BLACK STAR
          U+066D: "٭" ARABIC FIVE POINTED STAR -->
-    <string name="more_keys_for_star">&#x2605;,&#x066D;</string>
+    <string name="morekeys_star">&#x2605;,&#x066D;</string>
     <!-- The all letters need to be mirrored are found at
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
     <!-- U+FD3E: "﴾" ORNATE LEFT PARENTHESIS
          U+FD3F: "﴿" ORNATE RIGHT PARENTHESIS -->
-    <string name="more_keys_for_left_parenthesis">!fixedColumnOrder!4,&#xFD3E;|&#xFD3F;,!text/keyspecs_for_left_parenthesis_more_keys</string>
+    <string name="morekeys_left_parenthesis">!fixedColumnOrder!4,&#xFD3E;|&#xFD3F;,!text/keyspecs_left_parenthesis_more_keys</string>
-    <string name="more_keys_for_right_parenthesis">!fixedColumnOrder!4,&#xFD3F;|&#xFD3E;,!text/keyspecs_for_right_parenthesis_more_keys</string>
+    <string name="morekeys_right_parenthesis">!fixedColumnOrder!4,&#xFD3F;|&#xFD3E;,!text/keyspecs_right_parenthesis_more_keys</string>
     <!-- U+2264: "≤" LESS-THAN OR EQUAL TO
          U+2265: "≥" GREATER-THAN EQUAL TO
          U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
@@ -131,5 +128,5 @@
          U+0640: "ـ" ARABIC TATWEEL -->
     <!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
     <!-- Note: The space character is needed as a preceding letter to draw Arabic diacritics characters correctly. -->
-    <string name="more_keys_for_arabic_diacritics">"!fixedColumnOrder!7,&#x20;&#x0655;|&#x0655;,&#x20;&#x0654;|&#x0654;,&#x20;&#x0652;|&#x0652;,&#x20;&#x064D;|&#x064D;,&#x20;&#x064C;|&#x064C;,&#x20;&#x064B;|&#x064B;,&#x20;&#x0651;|&#x0651;,&#x20;&#x0656;|&#x0656;,&#x20;&#x0670;|&#x0670;,&#x20;&#x0653;|&#x0653;,&#x20;&#x0650;|&#x0650;,&#x20;&#x064F;|&#x064F;,&#x20;&#x064E;|&#x064E;,&#x0640;&#x0640;&#x0640;|&#x0640;"</string>
+    <string name="morekeys_arabic_diacritics">"!fixedColumnOrder!7,&#x20;&#x0655;|&#x0655;,&#x20;&#x0654;|&#x0654;,&#x20;&#x0652;|&#x0652;,&#x20;&#x064D;|&#x064D;,&#x20;&#x064C;|&#x064C;,&#x20;&#x064B;|&#x064B;,&#x20;&#x0651;|&#x0651;,&#x20;&#x0656;|&#x0656;,&#x20;&#x0670;|&#x0670;,&#x20;&#x0653;|&#x0653;,&#x20;&#x0650;|&#x0650;,&#x20;&#x064F;|&#x064F;,&#x20;&#x064E;|&#x064E;,&#x0640;&#x0640;&#x0640;|&#x0640;"</string>
 </resources>

tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml

@@ -19,9 +19,9 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX -->
-    <string name="more_keys_for_a">&#x00E2;</string>
+    <string name="morekeys_a">&#x00E2;</string>
     <!-- U+0259: "ə" LATIN SMALL LETTER SCHWA -->
-    <string name="more_keys_for_e">&#x0259;</string>
+    <string name="morekeys_e">&#x0259;</string>
     <!-- U+0131: "ı" LATIN SMALL LETTER DOTLESS I
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
@@ -29,7 +29,7 @@
          U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x0131;,&#x00EE;,&#x00EF;,&#x00EC;,&#x00ED;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x0131;,&#x00EE;,&#x00EF;,&#x00EC;,&#x00ED;,&#x012F;,&#x012B;</string>
     <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
          U+0153: "œ" LATIN SMALL LIGATURE OE
@@ -38,22 +38,22 @@
          U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F6;,&#x00F4;,&#x0153;,&#x00F2;,&#x00F3;,&#x00F5;,&#x00F8;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F6;,&#x00F4;,&#x0153;,&#x00F2;,&#x00F3;,&#x00F5;,&#x00F8;,&#x014D;</string>
     <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
     <!-- U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
          U+00DF: "ß" LATIN SMALL LETTER SHARP S
          U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
          U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
-    <string name="more_keys_for_s">&#x015F;,&#x00DF;,&#x015B;,&#x0161;</string>
+    <string name="morekeys_s">&#x015F;,&#x00DF;,&#x015B;,&#x0161;</string>
     <!-- U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE -->
-    <string name="more_keys_for_g">&#x011F;</string>
+    <string name="morekeys_g">&#x011F;</string>
     <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
          U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
-    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
+    <string name="morekeys_c">&#x00E7;,&#x0107;,&#x010D;</string>
 </resources>

tools/make-keyboard-text/res/values-be-rBY/donottranslate-more-keys.xml

@@ -19,22 +19,22 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- U+045E: "ў" CYRILLIC SMALL LETTER SHORT U -->
-    <string name="keylabel_for_east_slavic_row1_9">&#x045E;</string>
+    <string name="keyspec_east_slavic_row1_9">&#x045E;</string>
     <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
-    <string name="keylabel_for_east_slavic_row2_2">&#x044B;</string>
+    <string name="keyspec_east_slavic_row2_2">&#x044B;</string>
     <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
-    <string name="keylabel_for_east_slavic_row2_11">&#x044D;</string>
+    <string name="keyspec_east_slavic_row2_11">&#x044D;</string>
     <!-- U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
-    <string name="keylabel_for_east_slavic_row3_5">&#x0456;</string>
+    <string name="keyspec_east_slavic_row3_5">&#x0456;</string>
     <!-- U+0451: "ё" CYRILLIC SMALL LETTER IO -->
-    <string name="more_keys_for_cyrillic_ie">&#x0451;</string>
+    <string name="morekeys_cyrillic_ie">&#x0451;</string>
     <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-    <string name="more_keys_for_cyrillic_soft_sign">&#x044A;</string>
+    <string name="morekeys_cyrillic_soft_sign">&#x044A;</string>
     <!-- Label for "switch to alphabetic" key.
          U+0410: "А" CYRILLIC CAPITAL LETTER A
          U+0411: "Б" CYRILLIC CAPITAL LETTER BE
          U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
-    <string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
+    <string name="keylabel_to_alpha">&#x0410;&#x0411;&#x0412;</string>
     <string name="single_quotes">!text/single_9qm_lqm</string>
     <string name="double_quotes">!text/double_9qm_lqm</string>
 </resources>

tools/make-keyboard-text/res/values-bg/donottranslate-more-keys.xml

@@ -22,7 +22,7 @@
          U+0410: "А" CYRILLIC CAPITAL LETTER A
          U+0411: "Б" CYRILLIC CAPITAL LETTER BE
          U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
-    <string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
+    <string name="keylabel_to_alpha">&#x0410;&#x0411;&#x0412;</string>
     <!-- single_quotes of Bulgarian is default single_quotes_right_left. -->
     <string name="double_quotes">!text/double_9qm_lqm</string>
 </resources>

tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml

@@ -28,7 +28,7 @@
          U+00E6: "æ" LATIN SMALL LETTER AE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
          U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
-    <string name="more_keys_for_a">&#x00E0;,&#x00E1;,&#x00E4;,&#x00E2;,&#x00E3;,&#x00E5;,&#x0105;,&#x00E6;,&#x0101;,&#x00AA;</string>
+    <string name="morekeys_a">&#x00E0;,&#x00E1;,&#x00E4;,&#x00E2;,&#x00E3;,&#x00E5;,&#x0105;,&#x00E6;,&#x0101;,&#x00AA;</string>
     <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
@@ -36,14 +36,14 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E8;,&#x00E9;,&#x00EB;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E8;,&#x00E9;,&#x00EB;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
     <!-- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
          U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
@@ -53,26 +53,26 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
          U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
-    <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x00F6;,&#x00F4;,&#x00F5;,&#x00F8;,&#x0153;,&#x014D;,&#x00BA;</string>
+    <string name="morekeys_o">&#x00F2;,&#x00F3;,&#x00F6;,&#x00F4;,&#x00F5;,&#x00F8;,&#x0153;,&#x014D;,&#x00BA;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x00F1;,&#x0144;</string>
     <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
          U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
-    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
+    <string name="morekeys_c">&#x00E7;,&#x0107;,&#x010D;</string>
     <!-- U+00B7: "·" MIDDLE DOT
          U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
-    <string name="more_keys_for_l">l&#x00B7;l,&#x0142;</string>
+    <string name="morekeys_l">l&#x00B7;l,&#x0142;</string>
     <!-- U+00B7: "·" MIDDLE DOT -->
-    <string name="more_keys_for_punctuation">"!autoColumnOrder!9,\\,,?,!,&#x00B7;,#,),(,/,;,',@,:,-,\",+,\\%,&amp;"</string>
+    <string name="morekeys_punctuation">"!autoColumnOrder!9,\\,,?,!,&#x00B7;,#,),(,/,;,',@,:,-,\",+,\\%,&amp;"</string>
-    <string name="more_keys_for_tablet_punctuation">"!autoColumnOrder!8,\\,,',&#x00B7;,#,),(,/,;,@,:,-,\",+,\\%,&amp;"</string>
+    <string name="morekeys_tablet_punctuation">"!autoColumnOrder!8,\\,,',&#x00B7;,#,),(,/,;,@,:,-,\",+,\\%,&amp;"</string>
     <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
-    <string name="keylabel_for_spanish_row2_10">&#x00E7;</string>
+    <string name="keyspec_spanish_row2_10">&#x00E7;</string>
 </resources>

tools/make-keyboard-text/res/values-cs/donottranslate-more-keys.xml

@@ -26,7 +26,7 @@
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+011B: "ě" LATIN SMALL LETTER E WITH CARON
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
@@ -35,14 +35,14 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x011B;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x011B;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EE;,&#x00EF;,&#x00EC;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EE;,&#x00EF;,&#x00EC;,&#x012F;,&#x012B;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -51,39 +51,39 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x016F;,&#x00FB;,&#x00FC;,&#x00F9;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x016F;,&#x00FB;,&#x00FC;,&#x00F9;,&#x016B;</string>
     <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
          U+00DF: "ß" LATIN SMALL LETTER SHARP S
          U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE -->
-    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;</string>
+    <string name="morekeys_s">&#x0161;,&#x00DF;,&#x015B;</string>
     <!-- U+0148: "ň" LATIN SMALL LETTER N WITH CARON
          U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x0148;,&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x0148;,&#x00F1;,&#x0144;</string>
     <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
          U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
-    <string name="more_keys_for_c">&#x010D;,&#x00E7;,&#x0107;</string>
+    <string name="morekeys_c">&#x010D;,&#x00E7;,&#x0107;</string>
     <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
          U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
-    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <string name="morekeys_y">&#x00FD;,&#x00FF;</string>
     <!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON -->
-    <string name="more_keys_for_d">&#x010F;</string>
+    <string name="morekeys_d">&#x010F;</string>
     <!-- U+0159: "ř" LATIN SMALL LETTER R WITH CARON -->
-    <string name="more_keys_for_r">&#x0159;</string>
+    <string name="morekeys_r">&#x0159;</string>
     <!-- U+0165: "ť" LATIN SMALL LETTER T WITH CARON -->
-    <string name="more_keys_for_t">&#x0165;</string>
+    <string name="morekeys_t">&#x0165;</string>
     <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
          U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
          U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
-    <string name="more_keys_for_z">&#x017E;,&#x017A;,&#x017C;</string>
+    <string name="morekeys_z">&#x017E;,&#x017A;,&#x017C;</string>
     <string name="single_quotes">!text/single_9qm_lqm</string>
     <string name="double_quotes">!text/double_9qm_lqm</string>
     <string name="single_angle_quotes">!text/single_raqm_laqm</string>

tools/make-keyboard-text/res/values-da/donottranslate-more-keys.xml

@@ -24,50 +24,50 @@
          U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E4;,&#x00E0;,&#x00E2;,&#x00E3;,&#x0101;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E4;,&#x00E0;,&#x00E2;,&#x00E3;,&#x0101;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00EB;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00EB;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EF;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EF;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
          U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
          U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x014D;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00FB;,&#x00F9;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x00FC;,&#x00FB;,&#x00F9;,&#x016B;</string>
     <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
          U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
          U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
-    <string name="more_keys_for_s">&#x00DF;,&#x015B;,&#x0161;</string>
+    <string name="morekeys_s">&#x00DF;,&#x015B;,&#x0161;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x00F1;,&#x0144;</string>
     <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
          U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
-    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <string name="morekeys_y">&#x00FD;,&#x00FF;</string>
     <!-- U+00F0: "ð" LATIN SMALL LETTER ETH -->
-    <string name="more_keys_for_d">&#x00F0;</string>
+    <string name="morekeys_d">&#x00F0;</string>
     <!-- U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
-    <string name="more_keys_for_l">&#x0142;</string>
+    <string name="morekeys_l">&#x0142;</string>
     <!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
-    <string name="keylabel_for_nordic_row1_11">&#x00E5;</string>
+    <string name="keyspec_nordic_row1_11">&#x00E5;</string>
     <!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
-    <string name="keylabel_for_nordic_row2_10">&#x00E6;</string>
+    <string name="keyspec_nordic_row2_10">&#x00E6;</string>
     <!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
-    <string name="keylabel_for_nordic_row2_11">&#x00F8;</string>
+    <string name="keyspec_nordic_row2_11">&#x00F8;</string>
     <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
-    <string name="more_keys_for_nordic_row2_10">&#x00E4;</string>
+    <string name="morekeys_nordic_row2_10">&#x00E4;</string>
     <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
-    <string name="more_keys_for_nordic_row2_11">&#x00F6;</string>
+    <string name="morekeys_nordic_row2_11">&#x00F6;</string>
     <string name="single_quotes">!text/single_9qm_lqm</string>
     <string name="double_quotes">!text/double_9qm_lqm</string>
     <string name="single_angle_quotes">!text/single_raqm_laqm</string>

tools/make-keyboard-text/res/values-de/donottranslate-more-keys.xml

@@ -26,13 +26,13 @@
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x00E4;,&#x00E2;,&#x00E0;,&#x00E1;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <string name="morekeys_a">&#x00E4;,&#x00E2;,&#x00E0;,&#x00E1;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0117;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0117;</string>
     <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
          U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -41,32 +41,32 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F6;,&#x00F4;,&#x00F2;,&#x00F3;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F6;,&#x00F4;,&#x00F2;,&#x00F3;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
     <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
     <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
          U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
          U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
-    <string name="more_keys_for_s">&#x00DF;,&#x015B;,&#x0161;</string>
+    <string name="morekeys_s">&#x00DF;,&#x015B;,&#x0161;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x00F1;,&#x0144;</string>
     <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
-    <string name="keylabel_for_swiss_row1_11">&#x00FC;</string>
+    <string name="keyspec_swiss_row1_11">&#x00FC;</string>
     <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE -->
-    <string name="more_keys_for_swiss_row1_11">&#x00E8;</string>
+    <string name="morekeys_swiss_row1_11">&#x00E8;</string>
     <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
-    <string name="keylabel_for_swiss_row2_10">&#x00F6;</string>
+    <string name="keyspec_swiss_row2_10">&#x00F6;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE -->
-    <string name="more_keys_for_swiss_row2_10">&#x00E9;</string>
+    <string name="morekeys_swiss_row2_10">&#x00E9;</string>
     <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
-    <string name="keylabel_for_swiss_row2_11">&#x00E4;</string>
+    <string name="keyspec_swiss_row2_11">&#x00E4;</string>
     <!-- U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE -->
-    <string name="more_keys_for_swiss_row2_11">&#x00E0;</string>
+    <string name="morekeys_swiss_row2_11">&#x00E0;</string>
     <string name="single_quotes">!text/single_9qm_lqm</string>
     <string name="double_quotes">!text/double_9qm_lqm</string>
     <string name="single_angle_quotes">!text/single_raqm_laqm</string>

tools/make-keyboard-text/res/values-el/donottranslate-more-keys.xml

@@ -22,5 +22,5 @@
          U+0391: "Α" GREEK CAPITAL LETTER ALPHA
          U+0392: "Β" GREEK CAPITAL LETTER BETA
          U+0393: "Γ" GREEK CAPITAL LETTER GAMMA -->
-    <string name="label_to_alpha_key">&#x0391;&#x0392;&#x0393;</string>
+    <string name="keylabel_to_alpha">&#x0391;&#x0392;&#x0393;</string>
 </resources>

tools/make-keyboard-text/res/values-en/donottranslate-more-keys.xml

@@ -26,19 +26,19 @@
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x00E0;,&#x00E1;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <string name="morekeys_a">&#x00E0;,&#x00E1;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
     <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0113;</string>
     <!-- U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE -->
-    <string name="more_keys_for_i">&#x00EE;,&#x00EF;,&#x00ED;,&#x012B;,&#x00EC;</string>
+    <string name="morekeys_i">&#x00EE;,&#x00EF;,&#x00ED;,&#x012B;,&#x00EC;</string>
     <!-- U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -47,17 +47,17 @@
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
          U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE -->
-    <string name="more_keys_for_o">&#x00F4;,&#x00F6;,&#x00F2;,&#x00F3;,&#x0153;,&#x00F8;,&#x014D;,&#x00F5;</string>
+    <string name="morekeys_o">&#x00F4;,&#x00F6;,&#x00F2;,&#x00F3;,&#x0153;,&#x00F8;,&#x014D;,&#x00F5;</string>
     <!-- U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FB;,&#x00FC;,&#x00F9;,&#x00FA;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FB;,&#x00FC;,&#x00F9;,&#x00FA;,&#x016B;</string>
     <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S -->
-    <string name="more_keys_for_s">&#x00DF;</string>
+    <string name="morekeys_s">&#x00DF;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
-    <string name="more_keys_for_n">&#x00F1;</string>
+    <string name="morekeys_n">&#x00F1;</string>
     <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
-    <string name="more_keys_for_c">&#x00E7;</string>
+    <string name="morekeys_c">&#x00E7;</string>
 </resources>

tools/make-keyboard-text/res/values-eo/donottranslate-more-keys.xml

@@ -29,7 +29,7 @@
          U+0103: "ă" LATIN SMALL LETTER A WITH BREVE
          U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK
          U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;,&#x0103;,&#x0105;,&#x00AA;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;,&#x0103;,&#x0105;,&#x00AA;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+011B: "ě" LATIN SMALL LETTER E WITH CARON
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
@@ -38,7 +38,7 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x011B;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x011B;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
@@ -48,7 +48,7 @@
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
          U+0131: "ı" LATIN SMALL LETTER DOTLESS I
          U+0133: "ij" LATIN SMALL LIGATURE IJ -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EE;,&#x00EF;,&#x0129;,&#x00EC;,&#x012F;,&#x012B;,&#x0131;,&#x0133;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EE;,&#x00EF;,&#x0129;,&#x00EC;,&#x012F;,&#x012B;,&#x0131;,&#x0133;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -59,7 +59,7 @@
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
          U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
          U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;,&#x0151;,&#x00BA;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;,&#x0151;,&#x00BA;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
@@ -70,77 +70,77 @@
          U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
          U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
          U+00B5: "µ" MICRO SIGN -->
-    <string name="more_keys_for_u">&#x00FA;,&#x016F;,&#x00FB;,&#x00FC;,&#x00F9;,&#x016B;,&#x0169;,&#x0171;,&#x0173;,&#x00B5;</string>
+    <string name="morekeys_u">&#x00FA;,&#x016F;,&#x00FB;,&#x00FC;,&#x00F9;,&#x016B;,&#x0169;,&#x0171;,&#x0173;,&#x00B5;</string>
     <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
          U+0161: "š" LATIN SMALL LETTER S WITH CARON
          U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
          U+0219: "ș" LATIN SMALL LETTER S WITH COMMA BELOW
          U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
-    <string name="more_keys_for_s">&#x00DF;,&#x0161;,&#x015B;,&#x0219;,&#x015F;</string>
+    <string name="morekeys_s">&#x00DF;,&#x0161;,&#x015B;,&#x0219;,&#x015F;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
          U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
          U+0148: "ň" LATIN SMALL LETTER N WITH CARON
          U+0149: "ʼn" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
          U+014B: "ŋ" LATIN SMALL LETTER ENG -->
-    <string name="more_keys_for_n">&#x00F1;,&#x0144;,&#x0146;,&#x0148;,&#x0149;,&#x014B;</string>
+    <string name="morekeys_n">&#x00F1;,&#x0144;,&#x0146;,&#x0148;,&#x0149;,&#x014B;</string>
     <!-- U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
          U+010D: "č" LATIN SMALL LETTER C WITH CARON
          U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+010B: "ċ" LATIN SMALL LETTER C WITH DOT ABOVE -->
-    <string name="more_keys_for_c">&#x0107;,&#x010D;,&#x00E7;,&#x010B;</string>
+    <string name="morekeys_c">&#x0107;,&#x010D;,&#x00E7;,&#x010B;</string>
     <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
          U+0177: "ŷ" LATIN SMALL LETTER Y WITH CIRCUMFLEX
          U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
          U+00FE: "þ" LATIN SMALL LETTER THORN -->
-    <string name="more_keys_for_y">y,&#x00FD;,&#x0177;,&#x00FF;,&#x00FE;</string>
+    <string name="morekeys_y">y,&#x00FD;,&#x0177;,&#x00FF;,&#x00FE;</string>
     <!-- U+00F0: "ð" LATIN SMALL LETTER ETH
          U+010F: "ď" LATIN SMALL LETTER D WITH CARON
          U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
-    <string name="more_keys_for_d">&#x00F0;,&#x010F;,&#x0111;</string>
+    <string name="morekeys_d">&#x00F0;,&#x010F;,&#x0111;</string>
     <!-- U+0159: "ř" LATIN SMALL LETTER R WITH CARON
          U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
          U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA  -->
-    <string name="more_keys_for_r">&#x0159;,&#x0155;,&#x0157;</string>
+    <string name="morekeys_r">&#x0159;,&#x0155;,&#x0157;</string>
     <!-- U+0165: "ť" LATIN SMALL LETTER T WITH CARON
          U+021B: "ț" LATIN SMALL LETTER T WITH COMMA BELOW
          U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
          U+0167: "ŧ" LATIN SMALL LETTER T WITH STROKE -->
-    <string name="more_keys_for_t">&#x0165;,&#x021B;,&#x0163;,&#x0167;</string>
+    <string name="morekeys_t">&#x0165;,&#x021B;,&#x0163;,&#x0167;</string>
     <!-- U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
          U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
          U+017E: "ž" LATIN SMALL LETTER Z WITH CARON -->
-    <string name="more_keys_for_z">&#x017A;,&#x017C;,&#x017E;</string>
+    <string name="morekeys_z">&#x017A;,&#x017C;,&#x017E;</string>
     <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA
          U+0138: "ĸ" LATIN SMALL LETTER KRA  -->
-    <string name="more_keys_for_k">&#x0137;,&#x0138;</string>
+    <string name="morekeys_k">&#x0137;,&#x0138;</string>
     <!-- U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
          U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
          U+013E: "ľ" LATIN SMALL LETTER L WITH CARON
          U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT
          U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
-    <string name="more_keys_for_l">&#x013A;,&#x013C;,&#x013E;,&#x0140;,&#x0142;</string>
+    <string name="morekeys_l">&#x013A;,&#x013C;,&#x013E;,&#x0140;,&#x0142;</string>
     <!-- U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
          U+0121: "ġ" LATIN SMALL LETTER G WITH DOT ABOVE
          U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA -->
-    <string name="more_keys_for_g">&#x011F;,&#x0121;,&#x0123;</string>
+    <string name="morekeys_g">&#x011F;,&#x0121;,&#x0123;</string>
     <!-- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX -->
-    <string name="more_keys_for_v">w,&#x0175;</string>
+    <string name="morekeys_v">w,&#x0175;</string>
     <!-- U+0125: "ĥ" LATIN SMALL LETTER H WITH CIRCUMFLEX
          U+0127: "ħ" LATIN SMALL LETTER H WITH STROKE -->
-    <string name="more_keys_for_h">&#x0125;,&#x0127;</string>
+    <string name="morekeys_h">&#x0125;,&#x0127;</string>
     <!-- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX -->
-    <string name="more_keys_for_w">w,&#x0175;</string>
+    <string name="morekeys_w">w,&#x0175;</string>
-    <string name="more_keys_for_q">q</string>
+    <string name="morekeys_q">q</string>
-    <string name="more_keys_for_x">x</string>
+    <string name="morekeys_x">x</string>
     <!-- U+015D: "ŝ" LATIN SMALL LETTER S WITH CIRCUMFLEX -->
-    <string name="keylabel_for_q">&#x015D;</string>
+    <string name="keyspec_q">&#x015D;</string>
     <!-- U+011D: "ĝ" LATIN SMALL LETTER G WITH CIRCUMFLEX -->
-    <string name="keylabel_for_w">&#x011D;</string>
+    <string name="keyspec_w">&#x011D;</string>
     <!-- U+016D: "ŭ" LATIN SMALL LETTER U WITH BREVE -->
-    <string name="keylabel_for_y">&#x016D;</string>
+    <string name="keyspec_y">&#x016D;</string>
     <!-- U+0109: "ĉ" LATIN SMALL LETTER C WITH CIRCUMFLEX -->
-    <string name="keylabel_for_x">&#x0109;</string>
+    <string name="keyspec_x">&#x0109;</string>
     <!-- U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX -->
-    <string name="keylabel_for_spanish_row2_10">&#x0135;</string>
+    <string name="keyspec_spanish_row2_10">&#x0135;</string>
 </resources>

tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml

@@ -28,7 +28,7 @@
          U+00E6: "æ" LATIN SMALL LETTER AE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
          U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E0;,&#x00E4;,&#x00E2;,&#x00E3;,&#x00E5;,&#x0105;,&#x00E6;,&#x0101;,&#x00AA;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E0;,&#x00E4;,&#x00E2;,&#x00E3;,&#x00E5;,&#x0105;,&#x00E6;,&#x0101;,&#x00AA;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
@@ -36,14 +36,14 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EB;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00E8;,&#x00EB;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
@@ -53,21 +53,21 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
          U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F2;,&#x00F6;,&#x00F4;,&#x00F5;,&#x00F8;,&#x0153;,&#x014D;,&#x00BA;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F2;,&#x00F6;,&#x00F4;,&#x00F5;,&#x00F8;,&#x0153;,&#x014D;,&#x00BA;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x00F1;,&#x0144;</string>
     <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
          U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
-    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
+    <string name="morekeys_c">&#x00E7;,&#x0107;,&#x010D;</string>
     <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK
          U+00BF: "¿" INVERTED QUESTION MARK -->
-    <string name="more_keys_for_punctuation">"!autoColumnOrder!9,\\,,?,!,#,),(,/,;,&#x00A1;,',@,:,-,\",+,\\%,&amp;,&#x00BF;"</string>
+    <string name="morekeys_punctuation">"!autoColumnOrder!9,\\,,?,!,#,),(,/,;,&#x00A1;,',@,:,-,\",+,\\%,&amp;,&#x00BF;"</string>
- </resources>
+</resources>

tools/make-keyboard-text/res/values-et-rEE/donottranslate-more-keys.xml

@@ -27,7 +27,7 @@
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+00E6: "æ" LATIN SMALL LETTER AE
          U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK -->
-    <string name="more_keys_for_a">&#x00E4;,&#x0101;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E5;,&#x00E6;,&#x0105;</string>
+    <string name="morekeys_a">&#x00E4;,&#x0101;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E5;,&#x00E6;,&#x0105;</string>
     <!-- U+0113: "ē" LATIN SMALL LETTER E WITH MACRON
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
@@ -36,7 +36,7 @@
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+011B: "ě" LATIN SMALL LETTER E WITH CARON -->
-    <string name="more_keys_for_e">&#x0113;,&#x00E8;,&#x0117;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0119;,&#x011B;</string>
+    <string name="morekeys_e">&#x0113;,&#x00E8;,&#x0117;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0119;,&#x011B;</string>
     <!-- U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
@@ -44,7 +44,7 @@
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+0131: "ı" LATIN SMALL LETTER DOTLESS I -->
-    <string name="more_keys_for_i">&#x012B;,&#x00EC;,&#x012F;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0131;</string>
+    <string name="morekeys_i">&#x012B;,&#x00EC;,&#x012F;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0131;</string>
     <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
          U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -53,7 +53,7 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
-    <string name="more_keys_for_o">&#x00F6;,&#x00F5;,&#x00F2;,&#x00F3;,&#x00F4;,&#x0153;,&#x0151;,&#x00F8;</string>
+    <string name="morekeys_o">&#x00F6;,&#x00F5;,&#x00F2;,&#x00F3;,&#x00F4;,&#x0153;,&#x0151;,&#x00F8;</string>
     <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON
          U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
@@ -62,54 +62,55 @@
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
          U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
-    <string name="more_keys_for_u">&#x00FC;,&#x016B;,&#x0173;,&#x00F9;,&#x00FA;,&#x00FB;,&#x016F;,&#x0171;</string>
+    <string name="morekeys_u">&#x00FC;,&#x016B;,&#x0173;,&#x00F9;,&#x00FA;,&#x00FB;,&#x016F;,&#x0171;</string>
     <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
          U+00DF: "ß" LATIN SMALL LETTER SHARP S
          U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
          U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
-    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;,&#x015F;</string>
+    <string name="morekeys_s">&#x0161;,&#x00DF;,&#x015B;,&#x015F;</string>
     <!-- U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
          U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x0146;,&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x0146;,&#x00F1;,&#x0144;</string>
+
     <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
          U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
-    <string name="more_keys_for_c">&#x010D;,&#x00E7;,&#x0107;</string>
+    <string name="morekeys_c">&#x010D;,&#x00E7;,&#x0107;</string>
     <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
          U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
-    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <string name="morekeys_y">&#x00FD;,&#x00FF;</string>
     <!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON -->
-    <string name="more_keys_for_d">&#x010F;</string>
+    <string name="morekeys_d">&#x010F;</string>
     <!-- U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
          U+0159: "ř" LATIN SMALL LETTER R WITH CARON
          U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE -->
-    <string name="more_keys_for_r">&#x0157;,&#x0159;,&#x0155;</string>
+    <string name="morekeys_r">&#x0157;,&#x0159;,&#x0155;</string>
     <!-- U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
          U+0165: "ť" LATIN SMALL LETTER T WITH CARON -->
-    <string name="more_keys_for_t">&#x0163;,&#x0165;</string>
+    <string name="morekeys_t">&#x0163;,&#x0165;</string>
     <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
          U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
          U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
-    <string name="more_keys_for_z">&#x017E;,&#x017C;,&#x017A;</string>
+    <string name="morekeys_z">&#x017E;,&#x017C;,&#x017A;</string>
     <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
-    <string name="more_keys_for_k">&#x0137;</string>
+    <string name="morekeys_k">&#x0137;</string>
     <!-- U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
          U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
          U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
          U+013E: "ľ" LATIN SMALL LETTER L WITH CARON -->
-    <string name="more_keys_for_l">&#x013C;,&#x0142;,&#x013A;,&#x013E;</string>
+    <string name="morekeys_l">&#x013C;,&#x0142;,&#x013A;,&#x013E;</string>
     <!-- U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
          U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE -->
-    <string name="more_keys_for_g">&#x0123;,&#x011F;</string>
+    <string name="morekeys_g">&#x0123;,&#x011F;</string>
     <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
-    <string name="keylabel_for_nordic_row1_11">&#x00FC;</string>
+    <string name="keyspec_nordic_row1_11">&#x00FC;</string>
     <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
-    <string name="keylabel_for_nordic_row2_10">&#x00F6;</string>
+    <string name="keyspec_nordic_row2_10">&#x00F6;</string>
     <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
-    <string name="keylabel_for_nordic_row2_11">&#x00E4;</string>
+    <string name="keyspec_nordic_row2_11">&#x00E4;</string>
     <!-- U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE -->
-    <string name="more_keys_for_nordic_row2_10">&#x00F5;</string>
+    <string name="morekeys_nordic_row2_10">&#x00F5;</string>
     <string name="single_quotes">!text/single_9qm_lqm</string>
     <string name="double_quotes">!text/double_9qm_lqm</string>
 </resources>

tools/make-keyboard-text/res/values-eu-rES/donottranslate-more-keys.xml

@@ -28,7 +28,7 @@
          U+00E6: "æ" LATIN SMALL LETTER AE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
          U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E0;,&#x00E4;,&#x00E2;,&#x00E3;,&#x00E5;,&#x0105;,&#x00E6;,&#x0101;,&#x00AA;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E0;,&#x00E4;,&#x00E2;,&#x00E3;,&#x00E5;,&#x0105;,&#x00E6;,&#x0101;,&#x00AA;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
@@ -36,14 +36,14 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EB;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00E8;,&#x00EB;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
@@ -53,18 +53,18 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
          U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F2;,&#x00F6;,&#x00F4;,&#x00F5;,&#x00F8;,&#x0153;,&#x014D;,&#x00BA;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F2;,&#x00F6;,&#x00F4;,&#x00F5;,&#x00F8;,&#x0153;,&#x014D;,&#x00BA;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x00F1;,&#x0144;</string>
     <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
          U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
-    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
+    <string name="morekeys_c">&#x00E7;,&#x0107;,&#x010D;</string>
 </resources>

tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml

@@ -23,90 +23,87 @@
          U+200C: ZERO WIDTH NON-JOINER
          U+0628: "ب" ARABIC LETTER BEH
          U+067E: "پ" ARABIC LETTER PEH -->
-    <string name="label_to_alpha_key">&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;</string>
+    <string name="keylabel_to_alpha">&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;</string>
     <!-- U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
-    <string name="keylabel_for_symbols_1">&#x06F1;</string>
+    <string name="keyspec_symbols_1">&#x06F1;</string>
     <!-- U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->
-    <string name="keylabel_for_symbols_2">&#x06F2;</string>
+    <string name="keyspec_symbols_2">&#x06F2;</string>
     <!-- U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE -->
-    <string name="keylabel_for_symbols_3">&#x06F3;</string>
+    <string name="keyspec_symbols_3">&#x06F3;</string>
     <!-- U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR -->
-    <string name="keylabel_for_symbols_4">&#x06F4;</string>
+    <string name="keyspec_symbols_4">&#x06F4;</string>
     <!-- U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE -->
-    <string name="keylabel_for_symbols_5">&#x06F5;</string>
+    <string name="keyspec_symbols_5">&#x06F5;</string>
     <!-- U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->
-    <string name="keylabel_for_symbols_6">&#x06F6;</string>
+    <string name="keyspec_symbols_6">&#x06F6;</string>
     <!-- U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
-    <string name="keylabel_for_symbols_7">&#x06F7;</string>
+    <string name="keyspec_symbols_7">&#x06F7;</string>
     <!-- U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT -->
-    <string name="keylabel_for_symbols_8">&#x06F8;</string>
+    <string name="keyspec_symbols_8">&#x06F8;</string>
     <!-- U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE -->
-    <string name="keylabel_for_symbols_9">&#x06F9;</string>
+    <string name="keyspec_symbols_9">&#x06F9;</string>
     <!-- U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->
-    <string name="keylabel_for_symbols_0">&#x06F0;</string>
+    <string name="keyspec_symbols_0">&#x06F0;</string>
     <!-- Label for "switch to symbols" key.
          U+061F: "؟" ARABIC QUESTION MARK -->
-    <string name="label_to_symbol_key">&#x06F3;&#x06F2;&#x06F1;&#x061F;</string>
+    <string name="keylabel_to_symbol">&#x06F3;&#x06F2;&#x06F1;&#x061F;</string>
-    <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
+    <string name="additional_morekeys_symbols_1">1</string>
-         part because it'll be appended by the code. -->
+    <string name="additional_morekeys_symbols_2">2</string>
-    <string name="label_to_symbol_with_microphone_key">&#x06F3;&#x06F2;&#x06F1;</string>
+    <string name="additional_morekeys_symbols_3">3</string>
-    <string name="additional_more_keys_for_symbols_1">1</string>
+    <string name="additional_morekeys_symbols_4">4</string>
-    <string name="additional_more_keys_for_symbols_2">2</string>
+    <string name="additional_morekeys_symbols_5">5</string>
-    <string name="additional_more_keys_for_symbols_3">3</string>
+    <string name="additional_morekeys_symbols_6">6</string>
-    <string name="additional_more_keys_for_symbols_4">4</string>
+    <string name="additional_morekeys_symbols_7">7</string>
-    <string name="additional_more_keys_for_symbols_5">5</string>
+    <string name="additional_morekeys_symbols_8">8</string>
-    <string name="additional_more_keys_for_symbols_6">6</string>
+    <string name="additional_morekeys_symbols_9">9</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>
     <!-- U+066B: "٫" ARABIC DECIMAL SEPARATOR
          U+066C: "٬" ARABIC THOUSANDS SEPARATOR -->
-    <string name="additional_more_keys_for_symbols_0">0,&#x066B;,&#x066C;</string>
+    <string name="additional_morekeys_symbols_0">0,&#x066B;,&#x066C;</string>
     <!-- U+060C: "،" ARABIC COMMA -->
-    <string name="keylabel_for_comma">&#x060C;</string>
+    <string name="keyspec_comma">&#x060C;</string>
     <!-- U+064B: "ً" ARABIC FATHATAN -->
-    <string name="keyhintlabel_for_period">&#x064B;</string>
+    <string name="keyhintlabel_period">&#x064B;</string>
-    <string name="more_keys_for_period">!text/more_keys_for_arabic_diacritics</string>
+    <string name="morekeys_period">!text/morekeys_arabic_diacritics</string>
-    <string name="keyhintlabel_for_tablet_period">&#x064B;</string>
+    <string name="keyhintlabel_tablet_period">&#x064B;</string>
-    <string name="more_keys_for_tablet_period">!text/more_keys_for_arabic_diacritics</string>
+    <string name="morekeys_tablet_period">!text/morekeys_arabic_diacritics</string>
-    <string name="keylabel_for_symbols_question">&#x061F;</string>
+    <string name="keyspec_symbols_question">&#x061F;</string>
-    <string name="keylabel_for_symbols_semicolon">&#x061B;</string>
+    <string name="keyspec_symbols_semicolon">&#x061B;</string>
     <!-- U+066A: "٪" ARABIC PERCENT SIGN -->
-    <string name="keylabel_for_symbols_percent">&#x066A;</string>
+    <string name="keyspec_symbols_percent">&#x066A;</string>
     <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
-    <string name="more_keys_for_question">?,&#x00BF;</string>
+    <string name="morekeys_question">?,&#x00BF;</string>
-    <string name="more_keys_for_symbols_semicolon">;</string>
+    <string name="morekeys_symbols_semicolon">;</string>
     <!-- U+2030: "‰" PER MILLE SIGN -->
-    <string name="more_keys_for_symbols_percent">\\%,&#x2030;</string>
+    <string name="morekeys_symbols_percent">\\%,&#x2030;</string>
     <!-- U+060C: "،" ARABIC COMMA
          U+061B: "؛" ARABIC SEMICOLON
          U+061F: "؟" ARABIC QUESTION MARK
          U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
          U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
-    <string name="keylabel_for_tablet_comma">"&#x060C;"</string>
+    <string name="keyspec_tablet_comma">"&#x060C;"</string>
-    <string name="keyhintlabel_for_tablet_comma">"&#x061F;"</string>
+    <string name="keyhintlabel_tablet_comma">"&#x061F;"</string>
-    <string name="more_keys_for_tablet_comma">"!fixedColumnOrder!4,:,!,&#x061F;,&#x061B;,-,/,!text/keyspec_left_double_angle_quote,!text/keyspec_right_double_angle_quote"</string>
+    <string name="morekeys_tablet_comma">"!fixedColumnOrder!4,:,!,&#x061F;,&#x061B;,-,/,!text/keyspec_left_double_angle_quote,!text/keyspec_right_double_angle_quote"</string>
     <!-- U+FDFC: "﷼" RIAL SIGN -->
-    <string name="keylabel_for_currency">&#xFDFC;</string>
+    <string name="keyspec_currency">&#xFDFC;</string>
     <!-- U+266A: "♪" EIGHTH NOTE -->
-    <string name="more_keys_for_bullet">&#x266A;</string>
+    <string name="morekeys_bullet">&#x266A;</string>
     <!-- U+2605: "★" BLACK STAR
          U+066D: "٭" ARABIC FIVE POINTED STAR -->
-    <string name="more_keys_for_star">&#x2605;,&#x066D;</string>
+    <string name="morekeys_star">&#x2605;,&#x066D;</string>
     <!-- The all letters need to be mirrored are found at
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
     <!-- U+FD3E: "﴾" ORNATE LEFT PARENTHESIS
          U+FD3F: "﴿" ORNATE RIGHT PARENTHESIS -->
-    <string name="more_keys_for_left_parenthesis">!fixedColumnOrder!4,&#xFD3E;|&#xFD3F;,!text/keyspecs_for_left_parenthesis_more_keys</string>
+    <string name="morekeys_left_parenthesis">!fixedColumnOrder!4,&#xFD3E;|&#xFD3F;,!text/keyspecs_left_parenthesis_more_keys</string>
-    <string name="more_keys_for_right_parenthesis">!fixedColumnOrder!4,&#xFD3F;|&#xFD3E;,!text/keyspecs_for_right_parenthesis_more_keys</string>
+    <string name="morekeys_right_parenthesis">!fixedColumnOrder!4,&#xFD3F;|&#xFD3E;,!text/keyspecs_right_parenthesis_more_keys</string>
     <!-- U+2264: "≤" LESS-THAN OR EQUAL TO
          U+2265: "≥" GREATER-THAN EQUAL TO
          U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
          U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
          U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
          U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK -->
-    <string name="more_keys_for_less_than">!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_less_than</string>
+    <string name="morekeys_less_than">!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_less_than</string>
-    <string name="more_keys_for_greater_than">!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_greater_than</string>
+    <string name="morekeys_greater_than">!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_greater_than</string>
     <string name="keyspec_left_parenthesis">(|)</string>
     <string name="keyspec_right_parenthesis">)|(</string>
     <string name="keyspec_left_square_bracket">[|]</string>
@@ -137,5 +134,5 @@
          U+0640: "ـ" ARABIC TATWEEL -->
     <!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
     <!-- Note: The space character is needed as a preceding letter to draw Arabic diacritics characters correctly. -->
-    <string name="more_keys_for_arabic_diacritics">"!fixedColumnOrder!7,&#x20;&#x0655;|&#x0655;,&#x20;&#x0652;|&#x0652;,&#x20;&#x0651;|&#x0651;,&#x20;&#x064C;|&#x064C;,&#x20;&#x064D;|&#x064D;,&#x20;&#x064B;|&#x064B;,&#x20;&#x0654;|&#x0654;,&#x20;&#x0656;|&#x0656;,&#x20;&#x0670;|&#x0670;,&#x20;&#x0653;|&#x0653;,&#x20;&#x064F;|&#x064F;,&#x20;&#x0650;|&#x0650;,&#x20;&#x064E;|&#x064E;,&#x0640;&#x0640;&#x0640;|&#x0640;"</string>
+    <string name="morekeys_arabic_diacritics">"!fixedColumnOrder!7,&#x20;&#x0655;|&#x0655;,&#x20;&#x0652;|&#x0652;,&#x20;&#x0651;|&#x0651;,&#x20;&#x064C;|&#x064C;,&#x20;&#x064D;|&#x064D;,&#x20;&#x064B;|&#x064B;,&#x20;&#x0654;|&#x0654;,&#x20;&#x0656;|&#x0656;,&#x20;&#x0670;|&#x0670;,&#x20;&#x0653;|&#x0653;,&#x20;&#x064F;|&#x064F;,&#x20;&#x0650;|&#x0650;,&#x20;&#x064E;|&#x064E;,&#x0640;&#x0640;&#x0640;|&#x0640;"</string>
 </resources>

tools/make-keyboard-text/res/values-fi/donottranslate-more-keys.xml

@@ -24,7 +24,7 @@
          U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x00E6;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x0101;</string>
+    <string name="morekeys_a">&#x00E6;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x0101;</string>
     <!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
          U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -32,25 +32,25 @@
          U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F8;,&#x00F4;,&#x00F2;,&#x00F3;,&#x00F5;,&#x0153;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F8;,&#x00F4;,&#x00F2;,&#x00F3;,&#x00F5;,&#x0153;,&#x014D;</string>
     <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
-    <string name="more_keys_for_u">&#x00FC;</string>
+    <string name="morekeys_u">&#x00FC;</string>
     <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
          U+00DF: "ß" LATIN SMALL LETTER SHARP S
          U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE -->
-    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;</string>
+    <string name="morekeys_s">&#x0161;,&#x00DF;,&#x015B;</string>
     <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
          U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
          U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
-    <string name="more_keys_for_z">&#x017E;,&#x017A;,&#x017C;</string>
+    <string name="morekeys_z">&#x017E;,&#x017A;,&#x017C;</string>
     <!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
-    <string name="keylabel_for_nordic_row1_11">&#x00E5;</string>
+    <string name="keyspec_nordic_row1_11">&#x00E5;</string>
     <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
-    <string name="keylabel_for_nordic_row2_10">&#x00F6;</string>
+    <string name="keyspec_nordic_row2_10">&#x00F6;</string>
     <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
-    <string name="keylabel_for_nordic_row2_11">&#x00E4;</string>
+    <string name="keyspec_nordic_row2_11">&#x00E4;</string>
     <!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
-    <string name="more_keys_for_nordic_row2_10">&#x00F8;</string>
+    <string name="morekeys_nordic_row2_10">&#x00F8;</string>
     <!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
-    <string name="more_keys_for_nordic_row2_11">&#x00E6;</string>
+    <string name="morekeys_nordic_row2_11">&#x00E6;</string>
 </resources>

tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml

@@ -27,7 +27,7 @@
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
          U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
-    <string name="more_keys_for_a">&#x00E0;,&#x00E2;,%,&#x00E6;,&#x00E1;,&#x00E4;,&#x00E3;,&#x00E5;,&#x0101;,&#x00AA;</string>
+    <string name="morekeys_a">&#x00E0;,&#x00E2;,%,&#x00E6;,&#x00E1;,&#x00E4;,&#x00E3;,&#x00E5;,&#x0101;,&#x00AA;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
@@ -35,14 +35,14 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,%,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,%,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x00EE;,%,&#x00EF;,&#x00EC;,&#x00ED;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x00EE;,%,&#x00EF;,&#x00EC;,&#x00ED;,&#x012F;,&#x012B;</string>
     <!-- U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
@@ -52,29 +52,29 @@
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
          U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
-    <string name="more_keys_for_o">&#x00F4;,&#x0153;,%,&#x00F6;,&#x00F2;,&#x00F3;,&#x00F5;,&#x00F8;,&#x014D;,&#x00BA;</string>
+    <string name="morekeys_o">&#x00F4;,&#x0153;,%,&#x00F6;,&#x00F2;,&#x00F3;,&#x00F5;,&#x00F8;,&#x014D;,&#x00BA;</string>
     <!-- U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00F9;,&#x00FB;,%,&#x00FC;,&#x00FA;,&#x016B;</string>
+    <string name="morekeys_u">&#x00F9;,&#x00FB;,%,&#x00FC;,&#x00FA;,&#x016B;</string>
     <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
          U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
-    <string name="more_keys_for_c">&#x00E7;,%,&#x0107;,&#x010D;</string>
+    <string name="morekeys_c">&#x00E7;,%,&#x0107;,&#x010D;</string>
     <!-- U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
-    <string name="more_keys_for_y">%,&#x00FF;</string>
+    <string name="morekeys_y">%,&#x00FF;</string>
     <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE -->
-    <string name="keylabel_for_swiss_row1_11">&#x00E8;</string>
+    <string name="keyspec_swiss_row1_11">&#x00E8;</string>
     <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
-    <string name="more_keys_for_swiss_row1_11">&#x00FC;</string>
+    <string name="morekeys_swiss_row1_11">&#x00FC;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE -->
-    <string name="keylabel_for_swiss_row2_10">&#x00E9;</string>
+    <string name="keyspec_swiss_row2_10">&#x00E9;</string>
     <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
-    <string name="more_keys_for_swiss_row2_10">&#x00F6;</string>
+    <string name="morekeys_swiss_row2_10">&#x00F6;</string>
     <!-- U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE -->
-    <string name="keylabel_for_swiss_row2_11">&#x00E0;</string>
+    <string name="keyspec_swiss_row2_11">&#x00E0;</string>
     <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
-    <string name="more_keys_for_swiss_row2_11">&#x00E4;</string>
+    <string name="morekeys_swiss_row2_11">&#x00E4;</string>
 </resources>

tools/make-keyboard-text/res/values-gl-rES/donottranslate-more-keys.xml

@@ -28,7 +28,7 @@
          U+00E6: "æ" LATIN SMALL LETTER AE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
          U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E0;,&#x00E4;,&#x00E2;,&#x00E3;,&#x00E5;,&#x0105;,&#x00E6;,&#x0101;,&#x00AA;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E0;,&#x00E4;,&#x00E2;,&#x00E3;,&#x00E5;,&#x0105;,&#x00E6;,&#x0101;,&#x00AA;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
@@ -36,14 +36,14 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EB;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00E8;,&#x00EB;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
@@ -53,18 +53,18 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
          U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F2;,&#x00F6;,&#x00F4;,&#x00F5;,&#x00F8;,&#x0153;,&#x014D;,&#x00BA;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F2;,&#x00F6;,&#x00F4;,&#x00F5;,&#x00F8;,&#x0153;,&#x014D;,&#x00BA;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x00F1;,&#x0144;</string>
     <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
          U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
-    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
+    <string name="morekeys_c">&#x00E7;,&#x0107;,&#x010D;</string>
 </resources>

tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml

@@ -22,42 +22,39 @@
          U+0915: "क" DEVANAGARI LETTER KA
          U+0916: "ख" DEVANAGARI LETTER KHA
          U+0917: "ग" DEVANAGARI LETTER GA -->
-    <string name="label_to_alpha_key">&#x0915;&#x0916;&#x0917;</string>
+    <string name="keylabel_to_alpha">&#x0915;&#x0916;&#x0917;</string>
     <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
-    <string name="keylabel_for_symbols_1">&#x0967;</string>
+    <string name="keyspec_symbols_1">&#x0967;</string>
     <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
-    <string name="keylabel_for_symbols_2">&#x0968;</string>
+    <string name="keyspec_symbols_2">&#x0968;</string>
     <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
-    <string name="keylabel_for_symbols_3">&#x0969;</string>
+    <string name="keyspec_symbols_3">&#x0969;</string>
     <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
-    <string name="keylabel_for_symbols_4">&#x096A;</string>
+    <string name="keyspec_symbols_4">&#x096A;</string>
     <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
-    <string name="keylabel_for_symbols_5">&#x096B;</string>
+    <string name="keyspec_symbols_5">&#x096B;</string>
     <!-- U+096C: "६" DEVANAGARI DIGIT SIX -->
-    <string name="keylabel_for_symbols_6">&#x096C;</string>
+    <string name="keyspec_symbols_6">&#x096C;</string>
     <!-- U+096D: "७" DEVANAGARI DIGIT SEVEN -->
-    <string name="keylabel_for_symbols_7">&#x096D;</string>
+    <string name="keyspec_symbols_7">&#x096D;</string>
     <!-- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
-    <string name="keylabel_for_symbols_8">&#x096E;</string>
+    <string name="keyspec_symbols_8">&#x096E;</string>
     <!-- U+096F: "९" DEVANAGARI DIGIT NINE -->
-    <string name="keylabel_for_symbols_9">&#x096F;</string>
+    <string name="keyspec_symbols_9">&#x096F;</string>
     <!-- U+0966: "०" DEVANAGARI DIGIT ZERO -->
-    <string name="keylabel_for_symbols_0">&#x0966;</string>
+    <string name="keyspec_symbols_0">&#x0966;</string>
     <!-- Label for "switch to symbols" key. -->
-    <string name="label_to_symbol_key">?&#x0967;&#x0968;&#x0969;</string>
+    <string name="keylabel_to_symbol">?&#x0967;&#x0968;&#x0969;</string>
-    <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
+    <string name="additional_morekeys_symbols_1">1</string>
-         part because it'll be appended by the code. -->
+    <string name="additional_morekeys_symbols_2">2</string>
-    <string name="label_to_symbol_with_microphone_key">&#x0967;&#x0968;&#x0969;</string>
+    <string name="additional_morekeys_symbols_3">3</string>
-    <string name="additional_more_keys_for_symbols_1">1</string>
+    <string name="additional_morekeys_symbols_4">4</string>
-    <string name="additional_more_keys_for_symbols_2">2</string>
+    <string name="additional_morekeys_symbols_5">5</string>
-    <string name="additional_more_keys_for_symbols_3">3</string>
+    <string name="additional_morekeys_symbols_6">6</string>
-    <string name="additional_more_keys_for_symbols_4">4</string>
+    <string name="additional_morekeys_symbols_7">7</string>
-    <string name="additional_more_keys_for_symbols_5">5</string>
+    <string name="additional_morekeys_symbols_8">8</string>
-    <string name="additional_more_keys_for_symbols_6">6</string>
+    <string name="additional_morekeys_symbols_9">9</string>
-    <string name="additional_more_keys_for_symbols_7">7</string>
+    <string name="additional_morekeys_symbols_0">0</string>
-    <string name="additional_more_keys_for_symbols_8">8</string>
-    <string name="additional_more_keys_for_symbols_9">9</string>
-    <string name="additional_more_keys_for_symbols_0">0</string>
     <!-- U+20B9: "₹" INDIAN RUPEE SIGN -->
-    <string name="keylabel_for_currency">&#x20B9;</string>
+    <string name="keyspec_currency">&#x20B9;</string>
 </resources>

tools/make-keyboard-text/res/values-hr/donottranslate-more-keys.xml

@@ -21,20 +21,20 @@
     <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
          U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
          U+00DF: "ß" LATIN SMALL LETTER SHARP S -->
-    <string name="more_keys_for_s">&#x0161;,&#x015B;,&#x00DF;</string>
+    <string name="morekeys_s">&#x0161;,&#x015B;,&#x00DF;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x00F1;,&#x0144;</string>
     <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
          U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
          U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
-    <string name="more_keys_for_z">&#x017E;,&#x017A;,&#x017C;</string>
+    <string name="morekeys_z">&#x017E;,&#x017A;,&#x017C;</string>
     <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
          U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
-    <string name="more_keys_for_c">&#x010D;,&#x0107;,&#x00E7;</string>
+    <string name="morekeys_c">&#x010D;,&#x0107;,&#x00E7;</string>
     <!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
-    <string name="more_keys_for_d">&#x0111;</string>
+    <string name="morekeys_d">&#x0111;</string>
     <string name="single_quotes">!text/single_9qm_rqm</string>
     <string name="double_quotes">!text/double_9qm_rqm</string>
     <string name="single_angle_quotes">!text/single_raqm_laqm</string>

tools/make-keyboard-text/res/values-hu/donottranslate-more-keys.xml

@@ -26,7 +26,7 @@
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
@@ -34,14 +34,14 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EE;,&#x00EF;,&#x00EC;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EE;,&#x00EF;,&#x00EC;,&#x012F;,&#x012B;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
@@ -51,14 +51,14 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F6;,&#x0151;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F6;,&#x0151;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x0171;,&#x00FB;,&#x00F9;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x00FC;,&#x0171;,&#x00FB;,&#x00F9;,&#x016B;</string>
     <string name="single_quotes">!text/single_9qm_rqm</string>
     <string name="double_quotes">!text/double_9qm_rqm</string>
     <string name="single_angle_quotes">!text/single_raqm_laqm</string>

tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml

@@ -22,7 +22,7 @@
          U+0531: "Ա" ARMENIAN CAPITAL LETTER AYB
          U+0532: "Բ" ARMENIAN CAPITAL LETTER BEN
          U+0533: "Գ" ARMENIAN CAPITAL LETTER GIM -->
-    <string name="label_to_alpha_key">&#x0531;&#x0532;&#x0533;</string>
+    <string name="keylabel_to_alpha">&#x0531;&#x0532;&#x0533;</string>
     <!-- U+055E: "՞" ARMENIAN QUESTION MARK
          U+055C: "՜" ARMENIAN EXCLAMATION MARK
          U+055A: "՚" ARMENIAN APOSTROPHE
@@ -33,21 +33,21 @@
          U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
          U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
          U+055F: "՟" ARMENIAN ABBREVIATION MARK -->
-    <string name="more_keys_for_punctuation">"!autoColumnOrder!8,\\,,&#x055E;,&#x055C;,.,&#x055A;,&#x0559;,?,!,&#x055D;,&#x055B;,&#x058A;,&#x00BB;,&#x00AB;,&#x055F;,;,:"</string>
+    <string name="morekeys_punctuation">"!autoColumnOrder!8,\\,,&#x055E;,&#x055C;,.,&#x055A;,&#x0559;,?,!,&#x055D;,&#x055B;,&#x058A;,&#x00BB;,&#x00AB;,&#x055F;,;,:"</string>
     <!-- U+055E: "՞" ARMENIAN QUESTION MARK
          U+00BF: "¿" INVERTED QUESTION MARK -->
-    <string name="more_keys_for_question">&#x055E;,&#x00BF;</string>
+    <string name="morekeys_question">&#x055E;,&#x00BF;</string>
     <!-- U+055C: "՜" ARMENIAN EXCLAMATION MARK
          U+00A1: "¡" INVERTED EXCLAMATION MARK -->
-    <string name="more_keys_for_exclamation">&#x055C;,&#x00A1;</string>
+    <string name="morekeys_exclamation">&#x055C;,&#x00A1;</string>
     <!-- U+058F: "֏" ARMENIAN DRAM SIGN -->
     <!-- TODO: Enable this when we have glyph for the following letter
-         <string name="keylabel_for_currency">&#x058F;</string>
+         <string name="keyspec_currency">&#x058F;</string>
     -->
     <!-- U+055D: "՝" ARMENIAN COMMA -->
-    <string name="keylabel_for_tablet_comma">&#x055D;</string>
+    <string name="keyspec_tablet_comma">&#x055D;</string>
     <!-- U+0589: "։" ARMENIAN FULL STOP -->
-    <string name="keylabel_for_period">&#x0589;</string>
+    <string name="keyspec_period">&#x0589;</string>
-    <string name="keylabel_for_tablet_period">&#x0589;</string>
+    <string name="keyspec_tablet_period">&#x0589;</string>
-    <string name="more_keys_for_tablet_period">!text/more_keys_for_punctuation</string>
+    <string name="morekeys_tablet_period">!text/morekeys_punctuation</string>
 </resources>

tools/make-keyboard-text/res/values-is/donottranslate-more-keys.xml

@@ -26,7 +26,7 @@
          U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E4;,&#x00E6;,&#x00E5;,&#x00E0;,&#x00E2;,&#x00E3;,&#x0101;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E4;,&#x00E6;,&#x00E5;,&#x00E0;,&#x00E2;,&#x00E3;,&#x0101;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
@@ -34,14 +34,14 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00EB;,&#x00E8;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00EB;,&#x00E8;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EF;,&#x00EE;,&#x00EC;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EF;,&#x00EE;,&#x00EC;,&#x012F;,&#x012B;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -50,20 +50,20 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00FB;,&#x00F9;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x00FC;,&#x00FB;,&#x00F9;,&#x016B;</string>
     <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
          U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
-    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <string name="morekeys_y">&#x00FD;,&#x00FF;</string>
     <!-- U+00F0: "ð" LATIN SMALL LETTER ETH -->
-    <string name="more_keys_for_d">&#x00F0;</string>
+    <string name="morekeys_d">&#x00F0;</string>
     <!-- U+00FE: "þ" LATIN SMALL LETTER THORN -->
-    <string name="more_keys_for_t">&#x00FE;</string>
+    <string name="morekeys_t">&#x00FE;</string>
     <string name="single_quotes">!text/single_9qm_lqm</string>
     <string name="double_quotes">!text/double_9qm_lqm</string>
 </resources>

tools/make-keyboard-text/res/values-it/donottranslate-more-keys.xml

@@ -27,7 +27,7 @@
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
          U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
-    <string name="more_keys_for_a">&#x00E0;,&#x00E1;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;,&#x00AA;</string>
+    <string name="morekeys_a">&#x00E0;,&#x00E1;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;,&#x00AA;</string>
     <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
@@ -35,14 +35,14 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x012F;,&#x012B;</string>
     <!-- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
          U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -52,11 +52,11 @@
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
          U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
-    <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x00F4;,&#x00F6;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;,&#x00BA;</string>
+    <string name="morekeys_o">&#x00F2;,&#x00F3;,&#x00F4;,&#x00F6;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;,&#x00BA;</string>
     <!-- U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00F9;,&#x00FA;,&#x00FB;,&#x00FC;,&#x016B;</string>
+    <string name="morekeys_u">&#x00F9;,&#x00FA;,&#x00FB;,&#x00FC;,&#x016B;</string>
 </resources>

tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml

@@ -22,12 +22,12 @@
          U+05D0: "א" HEBREW LETTER ALEF
          U+05D1: "ב" HEBREW LETTER BET
          U+05D2: "ג" HEBREW LETTER GIMEL -->
-    <string name="label_to_alpha_key">&#x05D0;&#x05D1;&#x05D2;</string>
+    <string name="keylabel_to_alpha">&#x05D0;&#x05D1;&#x05D2;</string>
     <!-- U+2605: "★" BLACK STAR -->
-    <string name="more_keys_for_star">&#x2605;</string>
+    <string name="morekeys_star">&#x2605;</string>
     <!-- U+00B1: "±" PLUS-MINUS SIGN
          U+FB29: "﬩" HEBREW LETTER ALTERNATIVE PLUS SIGN -->
-    <string name="more_keys_for_plus">&#x00B1;,&#xFB29;</string>
+    <string name="morekeys_plus">&#x00B1;,&#xFB29;</string>
     <!-- The all letters need to be mirrored are found at
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
     <!-- U+2264: "≤" LESS-THAN OR EQUAL TO
@@ -53,5 +53,5 @@
     <string name="single_quotes">!text/single_rqm_9qm</string>
     <string name="double_quotes">!text/double_rqm_9qm</string>
     <!-- U+20AA: "₪" NEW SHEQEL SIGN -->
-    <string name="keylabel_for_currency">&#x20AA;</string>
+    <string name="keyspec_currency">&#x20AA;</string>
 </resources>

tools/make-keyboard-text/res/values-ka-rGE/donottranslate-more-keys.xml

@@ -22,7 +22,7 @@
          U+10D0: "ა" GEORGIAN LETTER AN
          U+10D1: "ბ" GEORGIAN LETTER BAN
          U+10D2: "გ" GEORGIAN LETTER GAN -->
-    <string name="label_to_alpha_key">&#x10D0;&#x10D1;&#x10D2;</string>
+    <string name="keylabel_to_alpha">&#x10D0;&#x10D1;&#x10D2;</string>
     <string name="single_quotes">!text/single_9qm_lqm</string>
     <string name="double_quotes">!text/double_9qm_lqm</string>
 </resources>

tools/make-keyboard-text/res/values-kk/donottranslate-more-keys.xml

@@ -19,37 +19,37 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
-    <string name="keylabel_for_east_slavic_row1_9">&#x0449;</string>
+    <string name="keyspec_east_slavic_row1_9">&#x0449;</string>
     <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
-    <string name="keylabel_for_east_slavic_row2_2">&#x044B;</string>
+    <string name="keyspec_east_slavic_row2_2">&#x044B;</string>
     <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
-    <string name="keylabel_for_east_slavic_row2_11">&#x044D;</string>
+    <string name="keyspec_east_slavic_row2_11">&#x044D;</string>
     <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
-    <string name="keylabel_for_east_slavic_row3_5">&#x0438;</string>
+    <string name="keyspec_east_slavic_row3_5">&#x0438;</string>
     <!-- U+04AF: "ү" CYRILLIC SMALL LETTER STRAIGHT U
          U+04B1: "ұ" CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE -->
-    <string name="more_keys_for_cyrillic_u">&#x04AF;,&#x04B1;</string>
+    <string name="morekeys_cyrillic_u">&#x04AF;,&#x04B1;</string>
     <!-- U+049B: "қ" CYRILLIC SMALL LETTER KA WITH DESCENDER -->
-    <string name="more_keys_for_cyrillic_ka">&#x049B;</string>
+    <string name="morekeys_cyrillic_ka">&#x049B;</string>
     <!-- U+0451: "ё" CYRILLIC SMALL LETTER IO -->
-    <string name="more_keys_for_cyrillic_ie">&#x0451;</string>
+    <string name="morekeys_cyrillic_ie">&#x0451;</string>
     <!-- U+04A3: "ң" CYRILLIC SMALL LETTER EN WITH DESCENDER -->
-    <string name="more_keys_for_cyrillic_en">&#x04A3;</string>
+    <string name="morekeys_cyrillic_en">&#x04A3;</string>
     <!-- U+0493: "ғ" CYRILLIC SMALL LETTER GHE WITH STROKE -->
-    <string name="more_keys_for_cyrillic_ghe">&#x0493;</string>
+    <string name="morekeys_cyrillic_ghe">&#x0493;</string>
     <!-- U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
-    <string name="more_keys_for_east_slavic_row2_2">&#x0456;</string>
+    <string name="morekeys_east_slavic_row2_2">&#x0456;</string>
     <!-- U+04D9: "ә" CYRILLIC SMALL LETTER SCHWA -->
-    <string name="more_keys_for_cyrillic_a">&#x04D9;</string>
+    <string name="morekeys_cyrillic_a">&#x04D9;</string>
     <!-- U+04E9: "ө" CYRILLIC SMALL LETTER BARRED O -->
-    <string name="more_keys_for_cyrillic_o">&#x04E9;</string>
+    <string name="morekeys_cyrillic_o">&#x04E9;</string>
     <!-- U+04BB: "һ" CYRILLIC SMALL LETTER SHHA -->
-    <string name="more_keys_for_east_slavic_row2_11">&#x04BB;</string>
+    <string name="morekeys_east_slavic_row2_11">&#x04BB;</string>
     <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-    <string name="more_keys_for_cyrillic_soft_sign">&#x044A;</string>
+    <string name="morekeys_cyrillic_soft_sign">&#x044A;</string>
     <!-- Label for "switch to alphabetic" key.
          U+0410: "А" CYRILLIC CAPITAL LETTER A
          U+0411: "Б" CYRILLIC CAPITAL LETTER BE
          U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
-    <string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
+    <string name="keylabel_to_alpha">&#x0410;&#x0411;&#x0412;</string>
 </resources>

tools/make-keyboard-text/res/values-km-rKH/donottranslate-more-keys.xml

@@ -22,7 +22,7 @@
          U+1780: "ក" KHMER LETTER KA
          U+1781: "ខ" KHMER LETTER KHA
          U+1782: "គ" KHMER LETTER KO -->
-    <string name="label_to_alpha_key">&#x1780;&#x1781;&#x1782;</string>
+    <string name="keylabel_to_alpha">&#x1780;&#x1781;&#x1782;</string>
     <!-- U+17DB: "៛" KHMER CURRENCY SYMBOL RIEL -->
-    <string name="more_keys_for_currency_dollar">&#x17DB;,&#x00A2;,&#x00A3;,&#x20AC;,&#x00A5;,&#x20B1;</string>
+    <string name="morekeys_currency_dollar">&#x17DB;,&#x00A2;,&#x00A3;,&#x20AC;,&#x00A5;,&#x20B1;</string>
 </resources>

tools/make-keyboard-text/res/values-ky/donottranslate-more-keys.xml

@@ -19,26 +19,26 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
-    <string name="keylabel_for_east_slavic_row1_9">&#x0449;</string>
+    <string name="keyspec_east_slavic_row1_9">&#x0449;</string>
     <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
-    <string name="keylabel_for_east_slavic_row2_2">&#x044B;</string>
+    <string name="keyspec_east_slavic_row2_2">&#x044B;</string>
     <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
-    <string name="keylabel_for_east_slavic_row2_11">&#x044D;</string>
+    <string name="keyspec_east_slavic_row2_11">&#x044D;</string>
     <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
-    <string name="keylabel_for_east_slavic_row3_5">&#x0438;</string>
+    <string name="keyspec_east_slavic_row3_5">&#x0438;</string>
     <!-- U+04AF: "ү" CYRILLIC SMALL LETTER STRAIGHT U -->
-    <string name="more_keys_for_cyrillic_u">&#x04AF;</string>
+    <string name="morekeys_cyrillic_u">&#x04AF;</string>
     <!-- U+0451: "ё" CYRILLIC SMALL LETTER IO -->
-    <string name="more_keys_for_cyrillic_ie">&#x0451;</string>
+    <string name="morekeys_cyrillic_ie">&#x0451;</string>
     <!-- U+04A3: "ң" CYRILLIC SMALL LETTER EN WITH DESCENDER -->
-    <string name="more_keys_for_cyrillic_en">&#x04A3;</string>
+    <string name="morekeys_cyrillic_en">&#x04A3;</string>
     <!-- U+04E9: "ө" CYRILLIC SMALL LETTER BARRED O -->
-    <string name="more_keys_for_cyrillic_o">&#x04E9;</string>
+    <string name="morekeys_cyrillic_o">&#x04E9;</string>
     <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-    <string name="more_keys_for_cyrillic_soft_sign">&#x044A;</string>
+    <string name="morekeys_cyrillic_soft_sign">&#x044A;</string>
     <!-- Label for "switch to alphabetic" key.
          U+0410: "А" CYRILLIC CAPITAL LETTER A
          U+0411: "Б" CYRILLIC CAPITAL LETTER BE
          U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
-    <string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
+    <string name="keylabel_to_alpha">&#x0410;&#x0411;&#x0412;</string>
 </resources>

tools/make-keyboard-text/res/values-lo-rLA/donottranslate-more-keys.xml

@@ -22,7 +22,7 @@
          U+0E81: "ກ" LAO LETTER KO
          U+0E82: "ຂ" LAO LETTER KHO SUNG
          U+0E84: "ຄ" LAO LETTER KHO TAM -->
-    <string name="label_to_alpha_key">&#x0E81;&#x0E82;&#x0E84;</string>
+    <string name="keylabel_to_alpha">&#x0E81;&#x0E82;&#x0E84;</string>
     <!-- U+20AD: "₭" KIP SIGN -->
-    <string name="keylabel_for_currency">&#x20AD;</string>
+    <string name="keyspec_currency">&#x20AD;</string>
 </resources>

tools/make-keyboard-text/res/values-lt/donottranslate-more-keys.xml

@@ -27,7 +27,7 @@
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+00E6: "æ" LATIN SMALL LETTER AE -->
-    <string name="more_keys_for_a">&#x0105;,&#x00E4;,&#x0101;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E5;,&#x00E6;</string>
+    <string name="morekeys_a">&#x0105;,&#x00E4;,&#x0101;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E5;,&#x00E6;</string>
     <!-- U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON
@@ -36,7 +36,7 @@
          U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
          U+011B: "ě" LATIN SMALL LETTER E WITH CARON -->
-    <string name="more_keys_for_e">&#x0117;,&#x0119;,&#x0113;,&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x011B;</string>
+    <string name="morekeys_e">&#x0117;,&#x0119;,&#x0113;,&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x011B;</string>
     <!-- U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
@@ -44,7 +44,7 @@
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+0131: "ı" LATIN SMALL LETTER DOTLESS I -->
-    <string name="more_keys_for_i">&#x012F;,&#x012B;,&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0131;</string>
+    <string name="morekeys_i">&#x012F;,&#x012B;,&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0131;</string>
     <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
          U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -53,7 +53,7 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
-    <string name="more_keys_for_o">&#x00F6;,&#x00F5;,&#x00F2;,&#x00F3;,&#x00F4;,&#x0153;,&#x0151;,&#x00F8;</string>
+    <string name="morekeys_o">&#x00F6;,&#x00F5;,&#x00F2;,&#x00F3;,&#x00F4;,&#x0153;,&#x0151;,&#x00F8;</string>
     <!-- U+016B: "ū" LATIN SMALL LETTER U WITH MACRON
          U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
@@ -63,46 +63,46 @@
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
          U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
-    <string name="more_keys_for_u">&#x016B;,&#x0173;,&#x00FC;,&#x016B;,&#x00F9;,&#x00FA;,&#x00FB;,&#x016F;,&#x0171;</string>
+    <string name="morekeys_u">&#x016B;,&#x0173;,&#x00FC;,&#x016B;,&#x00F9;,&#x00FA;,&#x00FB;,&#x016F;,&#x0171;</string>
     <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
          U+00DF: "ß" LATIN SMALL LETTER SHARP S
          U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
          U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
-    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;,&#x015F;</string>
+    <string name="morekeys_s">&#x0161;,&#x00DF;,&#x015B;,&#x015F;</string>
     <!-- U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
          U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x0146;,&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x0146;,&#x00F1;,&#x0144;</string>
     <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
          U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
-    <string name="more_keys_for_c">&#x010D;,&#x00E7;,&#x0107;</string>
+    <string name="morekeys_c">&#x010D;,&#x00E7;,&#x0107;</string>
     <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
          U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
-    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <string name="morekeys_y">&#x00FD;,&#x00FF;</string>
     <!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON -->
-    <string name="more_keys_for_d">&#x010F;</string>
+    <string name="morekeys_d">&#x010F;</string>
     <!-- U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
          U+0159: "ř" LATIN SMALL LETTER R WITH CARON
          U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE -->
-    <string name="more_keys_for_r">&#x0157;,&#x0159;,&#x0155;</string>
+    <string name="morekeys_r">&#x0157;,&#x0159;,&#x0155;</string>
     <!-- U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
          U+0165: "ť" LATIN SMALL LETTER T WITH CARON -->
-    <string name="more_keys_for_t">&#x0163;,&#x0165;</string>
+    <string name="morekeys_t">&#x0163;,&#x0165;</string>
     <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
          U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
          U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
-    <string name="more_keys_for_z">&#x017E;,&#x017C;,&#x017A;</string>
+    <string name="morekeys_z">&#x017E;,&#x017C;,&#x017A;</string>
     <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
-    <string name="more_keys_for_k">&#x0137;</string>
+    <string name="morekeys_k">&#x0137;</string>
     <!-- U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
          U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
          U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
          U+013E: "ľ" LATIN SMALL LETTER L WITH CARON -->
-    <string name="more_keys_for_l">&#x013C;,&#x0142;,&#x013A;,&#x013E;</string>
+    <string name="morekeys_l">&#x013C;,&#x0142;,&#x013A;,&#x013E;</string>
     <!-- U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
          U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE -->
-    <string name="more_keys_for_g">&#x0123;,&#x011F;</string>
+    <string name="morekeys_g">&#x0123;,&#x011F;</string>
     <string name="single_quotes">!text/single_9qm_lqm</string>
     <string name="double_quotes">!text/double_9qm_lqm</string>
 </resources>

tools/make-keyboard-text/res/values-lv/donottranslate-more-keys.xml

@@ -27,7 +27,7 @@
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+00E6: "æ" LATIN SMALL LETTER AE
          U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK -->
-    <string name="more_keys_for_a">&#x0101;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E4;,&#x00E5;,&#x00E6;,&#x0105;</string>
+    <string name="morekeys_a">&#x0101;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E4;,&#x00E5;,&#x00E6;,&#x0105;</string>
     <!-- U+0113: "ē" LATIN SMALL LETTER E WITH MACRON
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
@@ -36,7 +36,7 @@
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+011B: "ě" LATIN SMALL LETTER E WITH CARON -->
-    <string name="more_keys_for_e">&#x0113;,&#x0117;,&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0119;,&#x011B;</string>
+    <string name="morekeys_e">&#x0113;,&#x0117;,&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0119;,&#x011B;</string>
     <!-- U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
@@ -44,7 +44,7 @@
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+0131: "ı" LATIN SMALL LETTER DOTLESS I -->
-    <string name="more_keys_for_i">&#x012B;,&#x012F;,&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0131;</string>
+    <string name="morekeys_i">&#x012B;,&#x012F;,&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0131;</string>
     <!-- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
          U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -53,7 +53,7 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
-    <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x00F4;,&#x00F5;,&#x00F6;,&#x0153;,&#x0151;,&#x00F8;</string>
+    <string name="morekeys_o">&#x00F2;,&#x00F3;,&#x00F4;,&#x00F5;,&#x00F6;,&#x0153;,&#x0151;,&#x00F8;</string>
     <!-- U+016B: "ū" LATIN SMALL LETTER U WITH MACRON
          U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
@@ -62,46 +62,46 @@
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
          U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
-    <string name="more_keys_for_u">&#x016B;,&#x0173;,&#x00F9;,&#x00FA;,&#x00FB;,&#x00FC;,&#x016F;,&#x0171;</string>
+    <string name="morekeys_u">&#x016B;,&#x0173;,&#x00F9;,&#x00FA;,&#x00FB;,&#x00FC;,&#x016F;,&#x0171;</string>
     <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
          U+00DF: "ß" LATIN SMALL LETTER SHARP S
          U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
          U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
-    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;,&#x015F;</string>
+    <string name="morekeys_s">&#x0161;,&#x00DF;,&#x015B;,&#x015F;</string>
     <!-- U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
          U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x0146;,&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x0146;,&#x00F1;,&#x0144;</string>
     <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
          U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
-    <string name="more_keys_for_c">&#x010D;,&#x00E7;,&#x0107;</string>
+    <string name="morekeys_c">&#x010D;,&#x00E7;,&#x0107;</string>
     <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
          U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
-    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <string name="morekeys_y">&#x00FD;,&#x00FF;</string>
     <!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON -->
-    <string name="more_keys_for_d">&#x010F;</string>
+    <string name="morekeys_d">&#x010F;</string>
     <!-- U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
          U+0159: "ř" LATIN SMALL LETTER R WITH CARON
          U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE -->
-    <string name="more_keys_for_r">&#x0157;,&#x0159;,&#x0155;</string>
+    <string name="morekeys_r">&#x0157;,&#x0159;,&#x0155;</string>
     <!-- U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
          U+0165: "ť" LATIN SMALL LETTER T WITH CARON -->
-    <string name="more_keys_for_t">&#x0163;,&#x0165;</string>
+    <string name="morekeys_t">&#x0163;,&#x0165;</string>
     <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
          U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
          U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
-    <string name="more_keys_for_z">&#x017E;,&#x017C;,&#x017A;</string>
+    <string name="morekeys_z">&#x017E;,&#x017C;,&#x017A;</string>
     <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
-    <string name="more_keys_for_k">&#x0137;</string>
+    <string name="morekeys_k">&#x0137;</string>
     <!-- U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
          U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
          U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
          U+013E: "ľ" LATIN SMALL LETTER L WITH CARON -->
-    <string name="more_keys_for_l">&#x013C;,&#x0142;,&#x013A;,&#x013E;</string>
+    <string name="morekeys_l">&#x013C;,&#x0142;,&#x013A;,&#x013E;</string>
     <!-- U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
          U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE -->
-    <string name="more_keys_for_g">&#x0123;,&#x011F;</string>
+    <string name="morekeys_g">&#x0123;,&#x011F;</string>
     <string name="single_quotes">!text/single_9qm_lqm</string>
     <string name="double_quotes">!text/double_9qm_lqm</string>
 </resources>

tools/make-keyboard-text/res/values-mk/donottranslate-more-keys.xml

@@ -19,22 +19,22 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- U+0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
-    <string name="keylabel_for_south_slavic_row1_6">&#x0455;</string>
+    <string name="keyspec_south_slavic_row1_6">&#x0455;</string>
     <!-- U+045C: "ќ" CYRILLIC SMALL LETTER KJE -->
-    <string name="keylabel_for_south_slavic_row2_11">&#x045C;</string>
+    <string name="keyspec_south_slavic_row2_11">&#x045C;</string>
     <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-    <string name="keylabel_for_south_slavic_row3_1">&#x0437;</string>
+    <string name="keyspec_south_slavic_row3_1">&#x0437;</string>
     <!-- U+0453: "ѓ" CYRILLIC SMALL LETTER GJE -->
-    <string name="keylabel_for_south_slavic_row3_8">&#x0453;</string>
+    <string name="keyspec_south_slavic_row3_8">&#x0453;</string>
     <!-- U+0450: "ѐ" CYRILLIC SMALL LETTER IE WITH GRAVE -->
-    <string name="more_keys_for_cyrillic_ie">&#x0450;</string>
+    <string name="morekeys_cyrillic_ie">&#x0450;</string>
     <!-- U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
-    <string name="more_keys_for_cyrillic_i">&#x045D;</string>
+    <string name="morekeys_cyrillic_i">&#x045D;</string>
     <!-- Label for "switch to alphabetic" key.
          U+0410: "А" CYRILLIC CAPITAL LETTER A
          U+0411: "Б" CYRILLIC CAPITAL LETTER BE
          U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
-    <string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
+    <string name="keylabel_to_alpha">&#x0410;&#x0411;&#x0412;</string>
     <string name="single_quotes">!text/single_9qm_lqm</string>
     <string name="double_quotes">!text/double_9qm_lqm</string>
 </resources>

tools/make-keyboard-text/res/values-mn-rMN/donottranslate-more-keys.xml

@@ -22,7 +22,7 @@
          U+0410: "А" CYRILLIC CAPITAL LETTER A
          U+0411: "Б" CYRILLIC CAPITAL LETTER BE
          U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
-    <string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
+    <string name="keylabel_to_alpha">&#x0410;&#x0411;&#x0412;</string>
     <!-- U+20AE: "₮" TUGRIK SIGN -->
-    <string name="keylabel_for_currency">&#x20AE;</string>
+    <string name="keyspec_currency">&#x20AE;</string>
 </resources>

tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml

@@ -22,5 +22,5 @@
          U+1000: "က" MYANMAR LETTER KA
          U+1001: "ခ" MYANMAR LETTER KHA
          U+1002: "ဂ" MYANMAR LETTER GA -->
-    <string name="label_to_alpha_key">&#x1000;&#x1001;&#x1002;</string>
+    <string name="keylabel_to_alpha">&#x1000;&#x1001;&#x1002;</string>
 </resources>

tools/make-keyboard-text/res/values-nb/donottranslate-more-keys.xml

@@ -24,7 +24,7 @@
          U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x00E0;,&#x00E4;,&#x00E1;,&#x00E2;,&#x00E3;,&#x0101;</string>
+    <string name="morekeys_a">&#x00E0;,&#x00E4;,&#x00E1;,&#x00E2;,&#x00E3;,&#x0101;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
@@ -32,7 +32,7 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
          U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
          U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
@@ -40,23 +40,23 @@
          U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F4;,&#x00F2;,&#x00F3;,&#x00F6;,&#x00F5;,&#x0153;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F4;,&#x00F2;,&#x00F3;,&#x00F6;,&#x00F5;,&#x0153;,&#x014D;</string>
     <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
     <!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
-    <string name="keylabel_for_nordic_row1_11">&#x00E5;</string>
+    <string name="keyspec_nordic_row1_11">&#x00E5;</string>
     <!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
-    <string name="keylabel_for_nordic_row2_10">&#x00F8;</string>
+    <string name="keyspec_nordic_row2_10">&#x00F8;</string>
     <!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
-    <string name="keylabel_for_nordic_row2_11">&#x00E6;</string>
+    <string name="keyspec_nordic_row2_11">&#x00E6;</string>
     <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
-    <string name="more_keys_for_nordic_row2_10">&#x00F6;</string>
+    <string name="morekeys_nordic_row2_10">&#x00F6;</string>
     <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
-    <string name="more_keys_for_nordic_row2_11">&#x00E4;</string>
+    <string name="morekeys_nordic_row2_11">&#x00E4;</string>
     <string name="single_quotes">!text/single_9qm_rqm</string>
     <string name="double_quotes">!text/double_9qm_rqm</string>
 </resources>

tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml

@@ -22,42 +22,39 @@
          U+0915: "क" DEVANAGARI LETTER KA
          U+0916: "ख" DEVANAGARI LETTER KHA
          U+0917: "ग" DEVANAGARI LETTER GA -->
-    <string name="label_to_alpha_key">&#x0915;&#x0916;&#x0917;</string>
+    <string name="keylabel_to_alpha">&#x0915;&#x0916;&#x0917;</string>
     <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
-    <string name="keylabel_for_symbols_1">&#x0967;</string>
+    <string name="keyspec_symbols_1">&#x0967;</string>
     <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
-    <string name="keylabel_for_symbols_2">&#x0968;</string>
+    <string name="keyspec_symbols_2">&#x0968;</string>
     <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
-    <string name="keylabel_for_symbols_3">&#x0969;</string>
+    <string name="keyspec_symbols_3">&#x0969;</string>
     <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
-    <string name="keylabel_for_symbols_4">&#x096A;</string>
+    <string name="keyspec_symbols_4">&#x096A;</string>
     <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
-    <string name="keylabel_for_symbols_5">&#x096B;</string>
+    <string name="keyspec_symbols_5">&#x096B;</string>
     <!-- U+096C: "६" DEVANAGARI DIGIT SIX -->
-    <string name="keylabel_for_symbols_6">&#x096C;</string>
+    <string name="keyspec_symbols_6">&#x096C;</string>
     <!-- U+096D: "७" DEVANAGARI DIGIT SEVEN -->
-    <string name="keylabel_for_symbols_7">&#x096D;</string>
+    <string name="keyspec_symbols_7">&#x096D;</string>
     <!-- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
-    <string name="keylabel_for_symbols_8">&#x096E;</string>
+    <string name="keyspec_symbols_8">&#x096E;</string>
     <!-- U+096F: "९" DEVANAGARI DIGIT NINE -->
-    <string name="keylabel_for_symbols_9">&#x096F;</string>
+    <string name="keyspec_symbols_9">&#x096F;</string>
     <!-- U+0966: "०" DEVANAGARI DIGIT ZERO -->
-    <string name="keylabel_for_symbols_0">&#x0966;</string>
+    <string name="keyspec_symbols_0">&#x0966;</string>
     <!-- Label for "switch to symbols" key. -->
-    <string name="label_to_symbol_key">?&#x0967;&#x0968;&#x0969;</string>
+    <string name="keylabel_to_symbol">?&#x0967;&#x0968;&#x0969;</string>
-    <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
+    <string name="additional_morekeys_symbols_1">1</string>
-         part because it'll be appended by the code. -->
+    <string name="additional_morekeys_symbols_2">2</string>
-    <string name="label_to_symbol_with_microphone_key">&#x0967;&#x0968;&#x0969;</string>
+    <string name="additional_morekeys_symbols_3">3</string>
-    <string name="additional_more_keys_for_symbols_1">1</string>
+    <string name="additional_morekeys_symbols_4">4</string>
-    <string name="additional_more_keys_for_symbols_2">2</string>
+    <string name="additional_morekeys_symbols_5">5</string>
-    <string name="additional_more_keys_for_symbols_3">3</string>
+    <string name="additional_morekeys_symbols_6">6</string>
-    <string name="additional_more_keys_for_symbols_4">4</string>
+    <string name="additional_morekeys_symbols_7">7</string>
-    <string name="additional_more_keys_for_symbols_5">5</string>
+    <string name="additional_morekeys_symbols_8">8</string>
-    <string name="additional_more_keys_for_symbols_6">6</string>
+    <string name="additional_morekeys_symbols_9">9</string>
-    <string name="additional_more_keys_for_symbols_7">7</string>
+    <string name="additional_morekeys_symbols_0">0</string>
-    <string name="additional_more_keys_for_symbols_8">8</string>
-    <string name="additional_more_keys_for_symbols_9">9</string>
-    <string name="additional_more_keys_for_symbols_0">0</string>
     <!-- U+0930/U+0941/U+002E "रु." NEPALESE RUPEE SIGN -->
-    <string name="keylabel_for_currency">&#x0930;&#x0941;&#x002E;</string>
+    <string name="keyspec_currency">&#x0930;&#x0941;&#x002E;</string>
 </resources>

tools/make-keyboard-text/res/values-nl/donottranslate-more-keys.xml

@@ -26,7 +26,7 @@
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E4;,&#x00E2;,&#x00E0;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E4;,&#x00E2;,&#x00E0;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
          U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
@@ -34,7 +34,7 @@
          U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00EB;,&#x00EA;,&#x00E8;,&#x0119;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00EB;,&#x00EA;,&#x00E8;,&#x0119;,&#x0117;,&#x0113;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
@@ -42,7 +42,7 @@
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
          U+0133: "ij" LATIN SMALL LIGATURE IJ -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;,&#x0133;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;,&#x0133;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -51,18 +51,18 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00FB;,&#x00F9;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x00FC;,&#x00FB;,&#x00F9;,&#x016B;</string>
     <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
          U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
-    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <string name="morekeys_n">&#x00F1;,&#x0144;</string>
     <!-- U+0133: "ij" LATIN SMALL LIGATURE IJ -->
-    <string name="more_keys_for_y">&#x0133;</string>
+    <string name="morekeys_y">&#x0133;</string>
     <string name="single_quotes">!text/single_9qm_rqm</string>
     <string name="double_quotes">!text/double_9qm_rqm</string>
 </resources>

tools/make-keyboard-text/res/values-pl/donottranslate-more-keys.xml

@@ -27,7 +27,7 @@
          U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
-    <string name="more_keys_for_a">&#x0105;,&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <string name="morekeys_a">&#x0105;,&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
     <!-- U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
          U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
@@ -35,7 +35,7 @@
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
-    <string name="more_keys_for_e">&#x0119;,&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0117;,&#x0113;</string>
+    <string name="morekeys_e">&#x0119;,&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0117;,&#x0113;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -44,24 +44,24 @@
          U+0153: "œ" LATIN SMALL LIGATURE OE
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
     <!-- U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
          U+00DF: "ß" LATIN SMALL LETTER SHARP S
          U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
-    <string name="more_keys_for_s">&#x015B;,&#x00DF;,&#x0161;</string>
+    <string name="morekeys_s">&#x015B;,&#x00DF;,&#x0161;</string>
     <!-- U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
          U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
-    <string name="more_keys_for_n">&#x0144;,&#x00F1;</string>
+    <string name="morekeys_n">&#x0144;,&#x00F1;</string>
     <!-- U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
          U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
-    <string name="more_keys_for_c">&#x0107;,&#x00E7;,&#x010D;</string>
+    <string name="morekeys_c">&#x0107;,&#x00E7;,&#x010D;</string>
     <!-- U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
          U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
          U+017E: "ž" LATIN SMALL LETTER Z WITH CARON -->
-    <string name="more_keys_for_z">&#x017C;,&#x017A;,&#x017E;</string>
+    <string name="morekeys_z">&#x017C;,&#x017A;,&#x017E;</string>
     <!-- U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
-    <string name="more_keys_for_l">&#x0142;</string>
+    <string name="morekeys_l">&#x0142;</string>
     <string name="single_quotes">!text/single_9qm_rqm</string>
     <string name="double_quotes">!text/double_9qm_rqm</string>
 </resources>

tools/make-keyboard-text/res/values-pt/donottranslate-more-keys.xml

@@ -26,7 +26,7 @@
          U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
          U+00E6: "æ" LATIN SMALL LETTER AE
          U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
-    <string name="more_keys_for_a">&#x00E1;,&#x00E3;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E5;,&#x00E6;,&#x00AA;</string>
+    <string name="morekeys_a">&#x00E1;,&#x00E3;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E5;,&#x00E6;,&#x00AA;</string>
     <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
          U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
          U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
@@ -34,14 +34,14 @@
          U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
          U+0113: "ē" LATIN SMALL LETTER E WITH MACRON
          U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS -->
-    <string name="more_keys_for_e">&#x00E9;,&#x00EA;,&#x00E8;,&#x0119;,&#x0117;,&#x0113;,&#x00EB;</string>
+    <string name="morekeys_e">&#x00E9;,&#x00EA;,&#x00E8;,&#x0119;,&#x0117;,&#x0113;,&#x00EB;</string>
     <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
          U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
          U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
          U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
          U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
          U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
-    <string name="more_keys_for_i">&#x00ED;,&#x00EE;,&#x00EC;,&#x00EF;,&#x012F;,&#x012B;</string>
+    <string name="morekeys_i">&#x00ED;,&#x00EE;,&#x00EC;,&#x00EF;,&#x012F;,&#x012B;</string>
     <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
          U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
          U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -51,15 +51,15 @@
          U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
          U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
          U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
-    <string name="more_keys_for_o">&#x00F3;,&#x00F5;,&#x00F4;,&#x00F2;,&#x00F6;,&#x0153;,&#x00F8;,&#x014D;,&#x00BA;</string>
+    <string name="morekeys_o">&#x00F3;,&#x00F5;,&#x00F4;,&#x00F2;,&#x00F6;,&#x0153;,&#x00F8;,&#x014D;,&#x00BA;</string>
     <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
          U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
          U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
          U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
          U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
-    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
+    <string name="morekeys_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
     <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
          U+010D: "č" LATIN SMALL LETTER C WITH CARON
          U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
-    <string name="more_keys_for_c">&#x00E7;,&#x010D;,&#x0107;</string>
+    <string name="morekeys_c">&#x00E7;,&#x010D;,&#x0107;</string>
 </resources>