aboutsummaryrefslogtreecommitdiffstats
path: root/tools/make-keyboard-text/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-14 16:44:14 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-03-25 13:02:09 +0900
commit393efd94e5afe3ac3a03c72e40778a5e5c6ddec6 (patch)
treef13ac9071a0a4a626ec01e5a6e5a776345d32f0d /tools/make-keyboard-text/res
parent37b9562fd7b593c90d7ab383ec650f39a7c0f621 (diff)
downloadlatinime-393efd94e5afe3ac3a03c72e40778a5e5c6ddec6.tar.gz
latinime-393efd94e5afe3ac3a03c72e40778a5e5c6ddec6.tar.xz
latinime-393efd94e5afe3ac3a03c72e40778a5e5c6ddec6.zip
Rename text resources consistently
- keylabel_<key>, the key label text of the <key> - keyspec_<key>, the key specification of the <key> - keyhintlabel_<key>, the hint label text of the <key> - morekeys_<key>, the more keys specifications of the <key> - additional_morekeys_<key>, the additional more keys specification of the <key> Change-Id: Ib2127f21fa33a2568e8a6eba65cfdb2cf78b480e
Diffstat (limited to 'tools/make-keyboard-text/res')
-rw-r--r--tools/make-keyboard-text/res/values-af/donottranslate-more-keys.xml14
-rw-r--r--tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml85
-rw-r--r--tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml16
-rw-r--r--tools/make-keyboard-text/res/values-be-rBY/donottranslate-more-keys.xml14
-rw-r--r--tools/make-keyboard-text/res/values-bg/donottranslate-more-keys.xml2
-rw-r--r--tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml22
-rw-r--r--tools/make-keyboard-text/res/values-cs/donottranslate-more-keys.xml26
-rw-r--r--tools/make-keyboard-text/res/values-da/donottranslate-more-keys.xml30
-rw-r--r--tools/make-keyboard-text/res/values-de/donottranslate-more-keys.xml24
-rw-r--r--tools/make-keyboard-text/res/values-el/donottranslate-more-keys.xml2
-rw-r--r--tools/make-keyboard-text/res/values-en/donottranslate-more-keys.xml16
-rw-r--r--tools/make-keyboard-text/res/values-eo/donottranslate-more-keys.xml52
-rw-r--r--tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml18
-rw-r--r--tools/make-keyboard-text/res/values-et-rEE/donottranslate-more-keys.xml41
-rw-r--r--tools/make-keyboard-text/res/values-eu-rES/donottranslate-more-keys.xml14
-rw-r--r--tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml91
-rw-r--r--tools/make-keyboard-text/res/values-fi/donottranslate-more-keys.xml20
-rw-r--r--tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml26
-rw-r--r--tools/make-keyboard-text/res/values-gl-rES/donottranslate-more-keys.xml14
-rw-r--r--tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml49
-rw-r--r--tools/make-keyboard-text/res/values-hr/donottranslate-more-keys.xml10
-rw-r--r--tools/make-keyboard-text/res/values-hu/donottranslate-more-keys.xml10
-rw-r--r--tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml18
-rw-r--r--tools/make-keyboard-text/res/values-is/donottranslate-more-keys.xml16
-rw-r--r--tools/make-keyboard-text/res/values-it/donottranslate-more-keys.xml10
-rw-r--r--tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml8
-rw-r--r--tools/make-keyboard-text/res/values-ka-rGE/donottranslate-more-keys.xml2
-rw-r--r--tools/make-keyboard-text/res/values-kk/donottranslate-more-keys.xml30
-rw-r--r--tools/make-keyboard-text/res/values-km-rKH/donottranslate-more-keys.xml4
-rw-r--r--tools/make-keyboard-text/res/values-ky/donottranslate-more-keys.xml20
-rw-r--r--tools/make-keyboard-text/res/values-lo-rLA/donottranslate-more-keys.xml4
-rw-r--r--tools/make-keyboard-text/res/values-lt/donottranslate-more-keys.xml32
-rw-r--r--tools/make-keyboard-text/res/values-lv/donottranslate-more-keys.xml32
-rw-r--r--tools/make-keyboard-text/res/values-mk/donottranslate-more-keys.xml14
-rw-r--r--tools/make-keyboard-text/res/values-mn-rMN/donottranslate-more-keys.xml4
-rw-r--r--tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml2
-rw-r--r--tools/make-keyboard-text/res/values-nb/donottranslate-more-keys.xml18
-rw-r--r--tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml49
-rw-r--r--tools/make-keyboard-text/res/values-nl/donottranslate-more-keys.xml14
-rw-r--r--tools/make-keyboard-text/res/values-pl/donottranslate-more-keys.xml16
-rw-r--r--tools/make-keyboard-text/res/values-pt/donottranslate-more-keys.xml12
-rw-r--r--tools/make-keyboard-text/res/values-rm/donottranslate-more-keys.xml2
-rw-r--r--tools/make-keyboard-text/res/values-ro/donottranslate-more-keys.xml8
-rw-r--r--tools/make-keyboard-text/res/values-ru/donottranslate-more-keys.xml14
-rw-r--r--tools/make-keyboard-text/res/values-sk/donottranslate-more-keys.xml32
-rw-r--r--tools/make-keyboard-text/res/values-sl/donottranslate-more-keys.xml8
-rw-r--r--tools/make-keyboard-text/res/values-sr/donottranslate-more-keys.xml22
-rw-r--r--tools/make-keyboard-text/res/values-sv/donottranslate-more-keys.xml38
-rw-r--r--tools/make-keyboard-text/res/values-sw/donottranslate-more-keys.xml20
-rw-r--r--tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml4
-rw-r--r--tools/make-keyboard-text/res/values-tl/donottranslate-more-keys.xml14
-rw-r--r--tools/make-keyboard-text/res/values-tr/donottranslate-more-keys.xml14
-rw-r--r--tools/make-keyboard-text/res/values-uk/donottranslate-more-keys.xml18
-rw-r--r--tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml16
-rw-r--r--tools/make-keyboard-text/res/values-zu/donottranslate-more-keys.xml16
-rw-r--r--tools/make-keyboard-text/res/values-zz/donottranslate-more-keys.xml38
-rw-r--r--tools/make-keyboard-text/res/values/donottranslate-more-keys.xml279
57 files changed, 715 insertions, 729 deletions
diff --git a/tools/make-keyboard-text/res/values-af/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-af/donottranslate-more-keys.xml
index 5a90e62bd..45acb7e57 100644
--- a/tools/make-keyboard-text/res/values-af/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml
index dcff29a57..4ecb10533 100644
--- a/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml
+++ b/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>
- <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
- part because it'll be appended by the code. -->
- <string name="label_to_symbol_with_microphone_key">&#x0663;&#x0662;&#x0661;</string>
- <string name="additional_more_keys_for_symbols_1">1</string>
- <string name="additional_more_keys_for_symbols_2">2</string>
- <string name="additional_more_keys_for_symbols_3">3</string>
- <string name="additional_more_keys_for_symbols_4">4</string>
- <string name="additional_more_keys_for_symbols_5">5</string>
- <string name="additional_more_keys_for_symbols_6">6</string>
- <string name="additional_more_keys_for_symbols_7">7</string>
- <string name="additional_more_keys_for_symbols_8">8</string>
- <string name="additional_more_keys_for_symbols_9">9</string>
+ <string name="keylabel_to_symbol">&#x0663;&#x0662;&#x0661;&#x061F;</string>
+ <string name="additional_morekeys_symbols_1">1</string>
+ <string name="additional_morekeys_symbols_2">2</string>
+ <string name="additional_morekeys_symbols_3">3</string>
+ <string name="additional_morekeys_symbols_4">4</string>
+ <string name="additional_morekeys_symbols_5">5</string>
+ <string name="additional_morekeys_symbols_6">6</string>
+ <string name="additional_morekeys_symbols_7">7</string>
+ <string name="additional_morekeys_symbols_8">8</string>
+ <string name="additional_morekeys_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="more_keys_for_period">!text/more_keys_for_arabic_diacritics</string>
- <string name="keyhintlabel_for_tablet_period">&#x0651;</string>
- <string name="more_keys_for_tablet_period">!text/more_keys_for_arabic_diacritics</string>
- <string name="keylabel_for_symbols_question">&#x061F;</string>
- <string name="keylabel_for_symbols_semicolon">&#x061B;</string>
+ <string name="keyhintlabel_period">&#x0651;</string>
+ <string name="morekeys_period">!text/morekeys_arabic_diacritics</string>
+ <string name="keyhintlabel_tablet_period">&#x0651;</string>
+ <string name="morekeys_tablet_period">!text/morekeys_arabic_diacritics</string>
+ <string name="keyspec_symbols_question">&#x061F;</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="more_keys_for_symbols_semicolon">;</string>
+ <string name="morekeys_question">?,&#x00BF;</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="keyhintlabel_for_tablet_comma">"&#x061F;"</string>
- <string name="more_keys_for_tablet_comma">"!fixedColumnOrder!4,:,!,&#x061F;,&#x061B;,-,/,\",\'"</string>
+ <string name="keyspec_tablet_comma">"&#x060C;"</string>
+ <string name="keyhintlabel_tablet_comma">"&#x061F;"</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="more_keys_for_right_parenthesis">!fixedColumnOrder!4,&#xFD3F;|&#xFD3E;,!text/keyspecs_for_right_parenthesis_more_keys</string>
+ <string name="morekeys_left_parenthesis">!fixedColumnOrder!4,&#xFD3E;|&#xFD3F;,!text/keyspecs_left_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>
diff --git a/tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml
index db1784c17..54aa570b6 100644
--- a/tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-be-rBY/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-be-rBY/donottranslate-more-keys.xml
index 4f29f317b..52ada29d9 100644
--- a/tools/make-keyboard-text/res/values-be-rBY/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-bg/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-bg/donottranslate-more-keys.xml
index 5262133de..8a98b1227 100644
--- a/tools/make-keyboard-text/res/values-bg/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml
index 574be244e..125f08f26 100644
--- a/tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml
+++ b/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="more_keys_for_tablet_punctuation">"!autoColumnOrder!8,\\,,',&#x00B7;,#,),(,/,;,@,:,-,\",+,\\%,&amp;"</string>
+ <string name="morekeys_punctuation">"!autoColumnOrder!9,\\,,?,!,&#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>
diff --git a/tools/make-keyboard-text/res/values-cs/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-cs/donottranslate-more-keys.xml
index 5ce1d3bc8..1a27783e9 100644
--- a/tools/make-keyboard-text/res/values-cs/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-da/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-da/donottranslate-more-keys.xml
index cbaf9f497..c22e26275 100644
--- a/tools/make-keyboard-text/res/values-da/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-de/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-de/donottranslate-more-keys.xml
index bb8bb7201..94b17243c 100644
--- a/tools/make-keyboard-text/res/values-de/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-el/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-el/donottranslate-more-keys.xml
index 964dba081..77950c3b3 100644
--- a/tools/make-keyboard-text/res/values-el/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-en/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-en/donottranslate-more-keys.xml
index 969a5041b..7998bf161 100644
--- a/tools/make-keyboard-text/res/values-en/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-eo/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-eo/donottranslate-more-keys.xml
index e929869e2..7ef3101f5 100644
--- a/tools/make-keyboard-text/res/values-eo/donottranslate-more-keys.xml
+++ b/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="more_keys_for_q">q</string>
- <string name="more_keys_for_x">x</string>
+ <string name="morekeys_w">w,&#x0175;</string>
+ <string name="morekeys_q">q</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>
diff --git a/tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml
index 173750262..22e537069 100644
--- a/tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml
+++ b/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>
- </resources>
+ <string name="morekeys_punctuation">"!autoColumnOrder!9,\\,,?,!,#,),(,/,;,&#x00A1;,',@,:,-,\",+,\\%,&amp;,&#x00BF;"</string>
+</resources>
diff --git a/tools/make-keyboard-text/res/values-et-rEE/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-et-rEE/donottranslate-more-keys.xml
index e9bd9faf7..9a8fa3c59 100644
--- a/tools/make-keyboard-text/res/values-et-rEE/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-eu-rES/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-eu-rES/donottranslate-more-keys.xml
index 83dbe0e85..95f632a52 100644
--- a/tools/make-keyboard-text/res/values-eu-rES/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml
index b886195b5..bdbc92afa 100644
--- a/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml
+++ b/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>
- <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
- part because it'll be appended by the code. -->
- <string name="label_to_symbol_with_microphone_key">&#x06F3;&#x06F2;&#x06F1;</string>
- <string name="additional_more_keys_for_symbols_1">1</string>
- <string name="additional_more_keys_for_symbols_2">2</string>
- <string name="additional_more_keys_for_symbols_3">3</string>
- <string name="additional_more_keys_for_symbols_4">4</string>
- <string name="additional_more_keys_for_symbols_5">5</string>
- <string name="additional_more_keys_for_symbols_6">6</string>
- <string name="additional_more_keys_for_symbols_7">7</string>
- <string name="additional_more_keys_for_symbols_8">8</string>
- <string name="additional_more_keys_for_symbols_9">9</string>
+ <string name="keylabel_to_symbol">&#x06F3;&#x06F2;&#x06F1;&#x061F;</string>
+ <string name="additional_morekeys_symbols_1">1</string>
+ <string name="additional_morekeys_symbols_2">2</string>
+ <string name="additional_morekeys_symbols_3">3</string>
+ <string name="additional_morekeys_symbols_4">4</string>
+ <string name="additional_morekeys_symbols_5">5</string>
+ <string name="additional_morekeys_symbols_6">6</string>
+ <string name="additional_morekeys_symbols_7">7</string>
+ <string name="additional_morekeys_symbols_8">8</string>
+ <string name="additional_morekeys_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="more_keys_for_period">!text/more_keys_for_arabic_diacritics</string>
- <string name="keyhintlabel_for_tablet_period">&#x064B;</string>
- <string name="more_keys_for_tablet_period">!text/more_keys_for_arabic_diacritics</string>
- <string name="keylabel_for_symbols_question">&#x061F;</string>
- <string name="keylabel_for_symbols_semicolon">&#x061B;</string>
+ <string name="keyhintlabel_period">&#x064B;</string>
+ <string name="morekeys_period">!text/morekeys_arabic_diacritics</string>
+ <string name="keyhintlabel_tablet_period">&#x064B;</string>
+ <string name="morekeys_tablet_period">!text/morekeys_arabic_diacritics</string>
+ <string name="keyspec_symbols_question">&#x061F;</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="more_keys_for_symbols_semicolon">;</string>
+ <string name="morekeys_question">?,&#x00BF;</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="keyhintlabel_for_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="keyspec_tablet_comma">"&#x060C;"</string>
+ <string name="keyhintlabel_tablet_comma">"&#x061F;"</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="more_keys_for_right_parenthesis">!fixedColumnOrder!4,&#xFD3F;|&#xFD3E;,!text/keyspecs_for_right_parenthesis_more_keys</string>
+ <string name="morekeys_left_parenthesis">!fixedColumnOrder!4,&#xFD3E;|&#xFD3F;,!text/keyspecs_left_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="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_less_than">!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_less_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>
diff --git a/tools/make-keyboard-text/res/values-fi/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-fi/donottranslate-more-keys.xml
index 25b785845..82b847262 100644
--- a/tools/make-keyboard-text/res/values-fi/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml
index 47b1c9ef7..dded5d251 100644
--- a/tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-gl-rES/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-gl-rES/donottranslate-more-keys.xml
index 83dbe0e85..95f632a52 100644
--- a/tools/make-keyboard-text/res/values-gl-rES/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml
index de10a010f..55723cdd1 100644
--- a/tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml
+++ b/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>
- <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
- part because it'll be appended by the code. -->
- <string name="label_to_symbol_with_microphone_key">&#x0967;&#x0968;&#x0969;</string>
- <string name="additional_more_keys_for_symbols_1">1</string>
- <string name="additional_more_keys_for_symbols_2">2</string>
- <string name="additional_more_keys_for_symbols_3">3</string>
- <string name="additional_more_keys_for_symbols_4">4</string>
- <string name="additional_more_keys_for_symbols_5">5</string>
- <string name="additional_more_keys_for_symbols_6">6</string>
- <string name="additional_more_keys_for_symbols_7">7</string>
- <string name="additional_more_keys_for_symbols_8">8</string>
- <string name="additional_more_keys_for_symbols_9">9</string>
- <string name="additional_more_keys_for_symbols_0">0</string>
+ <string name="keylabel_to_symbol">?&#x0967;&#x0968;&#x0969;</string>
+ <string name="additional_morekeys_symbols_1">1</string>
+ <string name="additional_morekeys_symbols_2">2</string>
+ <string name="additional_morekeys_symbols_3">3</string>
+ <string name="additional_morekeys_symbols_4">4</string>
+ <string name="additional_morekeys_symbols_5">5</string>
+ <string name="additional_morekeys_symbols_6">6</string>
+ <string name="additional_morekeys_symbols_7">7</string>
+ <string name="additional_morekeys_symbols_8">8</string>
+ <string name="additional_morekeys_symbols_9">9</string>
+ <string name="additional_morekeys_symbols_0">0</string>
<!-- U+20B9: "₹" INDIAN RUPEE SIGN -->
- <string name="keylabel_for_currency">&#x20B9;</string>
+ <string name="keyspec_currency">&#x20B9;</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-hr/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hr/donottranslate-more-keys.xml
index 022bd2a87..73e51db4f 100644
--- a/tools/make-keyboard-text/res/values-hr/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-hu/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hu/donottranslate-more-keys.xml
index ce2f5d057..a394a9722 100644
--- a/tools/make-keyboard-text/res/values-hu/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
index 8ab78d06d..1e051190c 100644
--- a/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
+++ b/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="keylabel_for_tablet_period">&#x0589;</string>
- <string name="more_keys_for_tablet_period">!text/more_keys_for_punctuation</string>
+ <string name="keyspec_period">&#x0589;</string>
+ <string name="keyspec_tablet_period">&#x0589;</string>
+ <string name="morekeys_tablet_period">!text/morekeys_punctuation</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-is/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-is/donottranslate-more-keys.xml
index 2886d015e..ea7f86f1f 100644
--- a/tools/make-keyboard-text/res/values-is/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-it/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-it/donottranslate-more-keys.xml
index 17dd03108..6492553ed 100644
--- a/tools/make-keyboard-text/res/values-it/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml
index 8314ae5da..0decb8fa2 100644
--- a/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-ka-rGE/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ka-rGE/donottranslate-more-keys.xml
index 8c2add44c..f458c02e3 100644
--- a/tools/make-keyboard-text/res/values-ka-rGE/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-kk/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-kk/donottranslate-more-keys.xml
index dcf7480bd..5e18128da 100644
--- a/tools/make-keyboard-text/res/values-kk/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-km-rKH/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-km-rKH/donottranslate-more-keys.xml
index 8b24a2f7a..edd3753b7 100644
--- a/tools/make-keyboard-text/res/values-km-rKH/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-ky/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ky/donottranslate-more-keys.xml
index 1d3922f06..3d885bf72 100644
--- a/tools/make-keyboard-text/res/values-ky/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-lo-rLA/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-lo-rLA/donottranslate-more-keys.xml
index 1d8ffa8cf..1059930e4 100644
--- a/tools/make-keyboard-text/res/values-lo-rLA/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-lt/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-lt/donottranslate-more-keys.xml
index c1c596059..8b6a1b2b6 100644
--- a/tools/make-keyboard-text/res/values-lt/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-lv/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-lv/donottranslate-more-keys.xml
index c27458b7c..83f83fc99 100644
--- a/tools/make-keyboard-text/res/values-lv/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-mk/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-mk/donottranslate-more-keys.xml
index 2db75c8f5..1ab1354c8 100644
--- a/tools/make-keyboard-text/res/values-mk/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-mn-rMN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-mn-rMN/donottranslate-more-keys.xml
index a7f366685..3fafb397b 100644
--- a/tools/make-keyboard-text/res/values-mn-rMN/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml
index 16a0bc41a..f6186ffac 100644
--- a/tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-nb/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-nb/donottranslate-more-keys.xml
index 2cecb5e65..c5307a98d 100644
--- a/tools/make-keyboard-text/res/values-nb/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml
index e92a87e19..97c50d1b8 100644
--- a/tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml
+++ b/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>
- <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
- part because it'll be appended by the code. -->
- <string name="label_to_symbol_with_microphone_key">&#x0967;&#x0968;&#x0969;</string>
- <string name="additional_more_keys_for_symbols_1">1</string>
- <string name="additional_more_keys_for_symbols_2">2</string>
- <string name="additional_more_keys_for_symbols_3">3</string>
- <string name="additional_more_keys_for_symbols_4">4</string>
- <string name="additional_more_keys_for_symbols_5">5</string>
- <string name="additional_more_keys_for_symbols_6">6</string>
- <string name="additional_more_keys_for_symbols_7">7</string>
- <string name="additional_more_keys_for_symbols_8">8</string>
- <string name="additional_more_keys_for_symbols_9">9</string>
- <string name="additional_more_keys_for_symbols_0">0</string>
+ <string name="keylabel_to_symbol">?&#x0967;&#x0968;&#x0969;</string>
+ <string name="additional_morekeys_symbols_1">1</string>
+ <string name="additional_morekeys_symbols_2">2</string>
+ <string name="additional_morekeys_symbols_3">3</string>
+ <string name="additional_morekeys_symbols_4">4</string>
+ <string name="additional_morekeys_symbols_5">5</string>
+ <string name="additional_morekeys_symbols_6">6</string>
+ <string name="additional_morekeys_symbols_7">7</string>
+ <string name="additional_morekeys_symbols_8">8</string>
+ <string name="additional_morekeys_symbols_9">9</string>
+ <string name="additional_morekeys_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>
diff --git a/tools/make-keyboard-text/res/values-nl/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-nl/donottranslate-more-keys.xml
index e5d82951a..f9a26c540 100644
--- a/tools/make-keyboard-text/res/values-nl/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-pl/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-pl/donottranslate-more-keys.xml
index b5cf6a0fa..8a87db41e 100644
--- a/tools/make-keyboard-text/res/values-pl/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-pt/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-pt/donottranslate-more-keys.xml
index 0c9065f27..f3f667efc 100644
--- a/tools/make-keyboard-text/res/values-pt/donottranslate-more-keys.xml
+++ b/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>
diff --git a/tools/make-keyboard-text/res/values-rm/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-rm/donottranslate-more-keys.xml
index aa0d7f817..2df401eb4 100644
--- a/tools/make-keyboard-text/res/values-rm/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-rm/donottranslate-more-keys.xml
@@ -25,5 +25,5 @@
U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
U+0153: "œ" LATIN SMALL LIGATURE OE
U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
- <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x00F6;,&#x00F4;,&#x00F5;,&#x0153;,&#x00F8;</string>
+ <string name="morekeys_o">&#x00F2;,&#x00F3;,&#x00F6;,&#x00F4;,&#x00F5;,&#x0153;,&#x00F8;</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-ro/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ro/donottranslate-more-keys.xml
index f399eb28e..6286c7bae 100644
--- a/tools/make-keyboard-text/res/values-ro/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-ro/donottranslate-more-keys.xml
@@ -27,21 +27,21 @@
U+00E6: "æ" LATIN SMALL LETTER AE
U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
- <string name="more_keys_for_a">&#x00E2;,&#x00E3;,&#x0103;,&#x00E0;,&#x00E1;,&#x00E4;,&#x00E6;,&#x00E5;,&#x0101;</string>
+ <string name="morekeys_a">&#x00E2;,&#x00E3;,&#x0103;,&#x00E0;,&#x00E1;,&#x00E4;,&#x00E6;,&#x00E5;,&#x0101;</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+0219: "ș" LATIN SMALL LETTER S WITH COMMA BELOW
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">&#x0219;,&#x00DF;,&#x015B;,&#x0161;</string>
+ <string name="morekeys_s">&#x0219;,&#x00DF;,&#x015B;,&#x0161;</string>
<!-- U+021B: "ț" LATIN SMALL LETTER T WITH COMMA BELOW -->
- <string name="more_keys_for_t">&#x021B;</string>
+ <string name="morekeys_t">&#x021B;</string>
<string name="single_quotes">!text/single_9qm_rqm</string>
<string name="double_quotes">!text/double_9qm_rqm</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-ru/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ru/donottranslate-more-keys.xml
index 44244bc20..2093ba88b 100644
--- a/tools/make-keyboard-text/res/values-ru/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-ru/donottranslate-more-keys.xml
@@ -19,22 +19,22 @@
-->
<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+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>
diff --git a/tools/make-keyboard-text/res/values-sk/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-sk/donottranslate-more-keys.xml
index cf2238f67..a05b70370 100644
--- a/tools/make-keyboard-text/res/values-sk/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-sk/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">&#x00E1;,&#x00E4;,&#x0101;,&#x00E0;,&#x00E2;,&#x00E3;,&#x00E5;,&#x00E6;,&#x0105;</string>
+ <string name="morekeys_a">&#x00E1;,&#x00E4;,&#x0101;,&#x00E0;,&#x00E2;,&#x00E3;,&#x00E5;,&#x00E6;,&#x0105;</string>
<!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
U+011B: "ě" LATIN SMALL LETTER E WITH CARON
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+0119: "ę" LATIN SMALL LETTER E WITH OGONEK -->
- <string name="more_keys_for_e">&#x00E9;,&#x011B;,&#x0113;,&#x0117;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;</string>
+ <string name="morekeys_e">&#x00E9;,&#x011B;,&#x0113;,&#x0117;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;</string>
<!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
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">&#x00ED;,&#x012B;,&#x012F;,&#x00EC;,&#x00EE;,&#x00EF;,&#x0131;</string>
+ <string name="morekeys_i">&#x00ED;,&#x012B;,&#x012F;,&#x00EC;,&#x00EE;,&#x00EF;,&#x0131;</string>
<!-- U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
@@ -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">&#x00F4;,&#x00F3;,&#x00F6;,&#x00F2;,&#x00F5;,&#x0153;,&#x0151;,&#x00F8;</string>
+ <string name="morekeys_o">&#x00F4;,&#x00F3;,&#x00F6;,&#x00F2;,&#x00F5;,&#x0153;,&#x0151;,&#x00F8;</string>
<!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
@@ -62,47 +62,47 @@
U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
- <string name="more_keys_for_u">&#x00FA;,&#x016F;,&#x00FC;,&#x016B;,&#x0173;,&#x00F9;,&#x00FB;,&#x0171;</string>
+ <string name="morekeys_u">&#x00FA;,&#x016F;,&#x00FC;,&#x016B;,&#x0173;,&#x00F9;,&#x00FB;,&#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+0148: "ň" LATIN SMALL LETTER N WITH CARON
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">&#x0148;,&#x0146;,&#x00F1;,&#x0144;</string>
+ <string name="morekeys_n">&#x0148;,&#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+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
U+0159: "ř" LATIN SMALL LETTER R WITH CARON
U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA -->
- <string name="more_keys_for_r">&#x0155;,&#x0159;,&#x0157;</string>
+ <string name="morekeys_r">&#x0155;,&#x0159;,&#x0157;</string>
<!-- U+0165: "ť" LATIN SMALL LETTER T WITH CARON
U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA -->
- <string name="more_keys_for_t">&#x0165;,&#x0163;</string>
+ <string name="morekeys_t">&#x0165;,&#x0163;</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+013E: "ľ" LATIN SMALL LETTER L WITH CARON
U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
- <string name="more_keys_for_l">&#x013E;,&#x013A;,&#x013C;,&#x0142;</string>
+ <string name="morekeys_l">&#x013E;,&#x013A;,&#x013C;,&#x0142;</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>
<string name="single_angle_quotes">!text/single_raqm_laqm</string>
diff --git a/tools/make-keyboard-text/res/values-sl/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-sl/donottranslate-more-keys.xml
index 1e5d1d71f..d529589a0 100644
--- a/tools/make-keyboard-text/res/values-sl/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-sl/donottranslate-more-keys.xml
@@ -19,14 +19,14 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
- <string name="more_keys_for_s">&#x0161;</string>
+ <string name="morekeys_s">&#x0161;</string>
<!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
- <string name="more_keys_for_c">&#x010D;,&#x0107;</string>
+ <string name="morekeys_c">&#x010D;,&#x0107;</string>
<!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
- <string name="more_keys_for_d">&#x0111;</string>
+ <string name="morekeys_d">&#x0111;</string>
<!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON -->
- <string name="more_keys_for_z">&#x017E;</string>
+ <string name="morekeys_z">&#x017E;</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>
diff --git a/tools/make-keyboard-text/res/values-sr/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-sr/donottranslate-more-keys.xml
index c00d2a665..870a71331 100644
--- a/tools/make-keyboard-text/res/values-sr/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-sr/donottranslate-more-keys.xml
@@ -23,37 +23,37 @@
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+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+010F: "ď" LATIN SMALL LETTER D WITH CARON
- <string name="more_keys_for_d">&#x010F;</string>
+ <string name="morekeys_d">&#x010F;</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>
END: More keys definitions for Serbian (Latin) -->
<!-- BEGIN: More keys definitions for Serbian (Cyrillic) -->
<!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
- <string name="keylabel_for_south_slavic_row1_6">&#x0437;</string>
+ <string name="keyspec_south_slavic_row1_6">&#x0437;</string>
<!-- U+045B: "ћ" CYRILLIC SMALL LETTER TSHE -->
- <string name="keylabel_for_south_slavic_row2_11">&#x045B;</string>
+ <string name="keyspec_south_slavic_row2_11">&#x045B;</string>
<!-- U+0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
- <string name="keylabel_for_south_slavic_row3_1">&#x0455;</string>
+ <string name="keyspec_south_slavic_row3_1">&#x0455;</string>
<!-- U+0452: "ђ" CYRILLIC SMALL LETTER DJE -->
- <string name="keylabel_for_south_slavic_row3_8">&#x0452;</string>
+ <string name="keyspec_south_slavic_row3_8">&#x0452;</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>
<!-- END: More keys definitions for Serbian (Cyrillic) -->
<!-- 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>
<string name="single_angle_quotes">!text/single_raqm_laqm</string>
diff --git a/tools/make-keyboard-text/res/values-sv/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-sv/donottranslate-more-keys.xml
index 0da027258..ead514026 100644
--- a/tools/make-keyboard-text/res/values-sv/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-sv/donottranslate-more-keys.xml
@@ -23,71 +23,71 @@
U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK
U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE -->
- <string name="more_keys_for_a">&#x00E1;,&#x00E0;,&#x00E2;,&#x0105;,&#x00E3;</string>
+ <string name="morekeys_a">&#x00E1;,&#x00E0;,&#x00E2;,&#x0105;,&#x00E3;</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+00F0: "ð" LATIN SMALL LETTER ETH
U+010F: "ď" LATIN SMALL LETTER D WITH CARON -->
- <string name="more_keys_for_d">&#x00F0;,&#x010F;</string>
+ <string name="morekeys_d">&#x00F0;,&#x010F;</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+0119: "ę" LATIN SMALL LETTER E WITH OGONEK -->
- <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;</string>
+ <string name="morekeys_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;</string>
<!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS -->
- <string name="more_keys_for_i">&#x00ED;,&#x00EC;,&#x00EE;,&#x00EF;</string>
+ <string name="morekeys_i">&#x00ED;,&#x00EC;,&#x00EE;,&#x00EF;</string>
<!-- U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
- <string name="more_keys_for_l">&#x0142;</string>
+ <string name="morekeys_l">&#x0142;</string>
<!-- U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
U+0148: "ň" LATIN SMALL LETTER N WITH CARON -->
- <string name="more_keys_for_n">&#x0144;,&#x00F1;,&#x0148;</string>
+ <string name="morekeys_n">&#x0144;,&#x00F1;,&#x0148;</string>
<!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
- <string name="more_keys_for_o">&#x00F3;,&#x00F2;,&#x00F4;,&#x00F5;,&#x014D;</string>
+ <string name="morekeys_o">&#x00F3;,&#x00F2;,&#x00F4;,&#x00F5;,&#x014D;</string>
<!-- U+0159: "ř" LATIN SMALL LETTER R WITH CARON -->
- <string name="more_keys_for_r">&#x0159;</string>
+ <string name="morekeys_r">&#x0159;</string>
<!-- U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
U+0161: "š" LATIN SMALL LETTER S WITH CARON
U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
U+00DF: "ß" LATIN SMALL LETTER SHARP S -->
- <string name="more_keys_for_s">&#x015B;,&#x0161;,&#x015F;,&#x00DF;</string>
+ <string name="morekeys_s">&#x015B;,&#x0161;,&#x015F;,&#x00DF;</string>
<!-- U+0165: "ť" LATIN SMALL LETTER T WITH CARON
U+00FE: "þ" LATIN SMALL LETTER THORN -->
- <string name="more_keys_for_t">&#x0165;,&#x00FE;</string>
+ <string name="morekeys_t">&#x0165;,&#x00FE;</string>
<!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
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">&#x00FC;,&#x00FA;,&#x00F9;,&#x00FB;,&#x016B;</string>
+ <string name="morekeys_u">&#x00FC;,&#x00FA;,&#x00F9;,&#x00FB;,&#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+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
- <string name="more_keys_for_z">&#x017A;,&#x017E;,&#x017C;</string>
+ <string name="morekeys_z">&#x017A;,&#x017E;,&#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+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+00E6: "æ" LATIN SMALL LETTER AE -->
- <string name="more_keys_for_nordic_row2_11">&#x00E6;</string>
+ <string name="morekeys_nordic_row2_11">&#x00E6;</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+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
U+0153: "œ" LATIN SMALL LIGATURE OE -->
- <string name="more_keys_for_nordic_row2_10">&#x00F8;,&#x0153;</string>
+ <string name="morekeys_nordic_row2_10">&#x00F8;,&#x0153;</string>
<string name="single_angle_quotes">!text/single_raqm_laqm</string>
<string name="double_angle_quotes">!text/double_raqm_laqm</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-sw/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-sw/donottranslate-more-keys.xml
index 968a80c1c..e06ae21cd 100644
--- a/tools/make-keyboard-text/res/values-sw/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-sw/donottranslate-more-keys.xml
@@ -18,7 +18,7 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- This is the same as English except more_keys_for_g. -->
+ <!-- This is the same as English except morekeys_g. -->
<!-- U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
@@ -27,19 +27,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
@@ -48,18 +48,18 @@
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="more_keys_for_g">g\'</string>
+ <string name="morekeys_c">&#x00E7;</string>
+ <string name="morekeys_g">g\'</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml
index 070c91526..3329cf241 100644
--- a/tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml
@@ -22,7 +22,7 @@
U+0E01: "ก" THAI CHARACTER KO KAI
U+0E02: "ข" THAI CHARACTER KHO KHAI
U+0E04: "ค" THAI CHARACTER KHO KHWAI -->
- <string name="label_to_alpha_key">&#x0E01;&#x0E02;&#x0E04;</string>
+ <string name="keylabel_to_alpha">&#x0E01;&#x0E02;&#x0E04;</string>
<!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
- <string name="keylabel_for_currency">&#x0E3F;</string>
+ <string name="keyspec_currency">&#x0E3F;</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-tl/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-tl/donottranslate-more-keys.xml
index 383d55ccf..cf25b6f43 100644
--- a/tools/make-keyboard-text/res/values-tl/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-tl/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>
diff --git a/tools/make-keyboard-text/res/values-tr/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-tr/donottranslate-more-keys.xml
index 1161811d4..db1108ff6 100644
--- a/tools/make-keyboard-text/res/values-tr/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-tr/donottranslate-more-keys.xml
@@ -19,7 +19,7 @@
-->
<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+0131: "ı" LATIN SMALL LETTER DOTLESS I
U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
@@ -27,7 +27,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
@@ -36,22 +36,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>
diff --git a/tools/make-keyboard-text/res/values-uk/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-uk/donottranslate-more-keys.xml
index f797255e5..1f72d068b 100644
--- a/tools/make-keyboard-text/res/values-uk/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-uk/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+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
- <string name="keylabel_for_east_slavic_row2_2">&#x0456;</string>
+ <string name="keyspec_east_slavic_row2_2">&#x0456;</string>
<!-- U+0454: "є" CYRILLIC SMALL LETTER UKRAINIAN IE -->
- <string name="keylabel_for_east_slavic_row2_11">&#x0454;</string>
+ <string name="keyspec_east_slavic_row2_11">&#x0454;</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+0491: "ґ" CYRILLIC SMALL LETTER GHE WITH UPTURN -->
- <string name="more_keys_for_cyrillic_ghe">&#x0491;</string>
+ <string name="morekeys_cyrillic_ghe">&#x0491;</string>
<!-- U+0457: "ї" CYRILLIC SMALL LETTER YI -->
- <string name="more_keys_for_east_slavic_row2_2">&#x0457;</string>
+ <string name="morekeys_east_slavic_row2_2">&#x0457;</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>
<!-- U+20B4: "₴" HRYVNIA SIGN -->
- <string name="keylabel_for_currency">&#x20B4;</string>
+ <string name="keyspec_currency">&#x20B4;</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>
diff --git a/tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml
index f01f0687a..aa571700f 100644
--- a/tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml
@@ -35,7 +35,7 @@
U+1EA9: "ẩ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
U+1EAB: "ẫ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
U+1EAD: "ậ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW -->
- <string name="more_keys_for_a">&#x00E0;,&#x00E1;,&#x1EA3;,&#x00E3;,&#x1EA1;,&#x0103;,&#x1EB1;,&#x1EAF;,&#x1EB3;,&#x1EB5;,&#x1EB7;,&#x00E2;,&#x1EA7;,&#x1EA5;,&#x1EA9;,&#x1EAB;,&#x1EAD;</string>
+ <string name="morekeys_a">&#x00E0;,&#x00E1;,&#x1EA3;,&#x00E3;,&#x1EA1;,&#x0103;,&#x1EB1;,&#x1EAF;,&#x1EB3;,&#x1EB5;,&#x1EB7;,&#x00E2;,&#x1EA7;,&#x1EA5;,&#x1EA9;,&#x1EAB;,&#x1EAD;</string>
<!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
U+1EBB: "ẻ" LATIN SMALL LETTER E WITH HOOK ABOVE
@@ -47,13 +47,13 @@
U+1EC3: "ể" LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
U+1EC5: "ễ" LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
U+1EC7: "ệ" LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW -->
- <string name="more_keys_for_e">&#x00E8;,&#x00E9;,&#x1EBB;,&#x1EBD;,&#x1EB9;,&#x00EA;,&#x1EC1;,&#x1EBF;,&#x1EC3;,&#x1EC5;,&#x1EC7;</string>
+ <string name="morekeys_e">&#x00E8;,&#x00E9;,&#x1EBB;,&#x1EBD;,&#x1EB9;,&#x00EA;,&#x1EC1;,&#x1EBF;,&#x1EC3;,&#x1EC5;,&#x1EC7;</string>
<!-- U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
U+1EC9: "ỉ" LATIN SMALL LETTER I WITH HOOK ABOVE
U+0129: "ĩ" LATIN SMALL LETTER I WITH TILDE
U+1ECB: "ị" LATIN SMALL LETTER I WITH DOT BELOW -->
- <string name="more_keys_for_i">&#x00EC;,&#x00ED;,&#x1EC9;,&#x0129;,&#x1ECB;</string>
+ <string name="morekeys_i">&#x00EC;,&#x00ED;,&#x1EC9;,&#x0129;,&#x1ECB;</string>
<!-- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
U+1ECF: "ỏ" LATIN SMALL LETTER O WITH HOOK ABOVE
@@ -71,7 +71,7 @@
U+1EDF: "ở" LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
U+1EE1: "ỡ" LATIN SMALL LETTER O WITH HORN AND TILDE
U+1EE3: "ợ" LATIN SMALL LETTER O WITH HORN AND DOT BELOW -->
- <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x1ECF;,&#x00F5;,&#x1ECD;,&#x00F4;,&#x1ED3;,&#x1ED1;,&#x1ED5;,&#x1ED7;,&#x1ED9;,&#x01A1;,&#x1EDD;,&#x1EDB;,&#x1EDF;,&#x1EE1;,&#x1EE3;</string>
+ <string name="morekeys_o">&#x00F2;,&#x00F3;,&#x1ECF;,&#x00F5;,&#x1ECD;,&#x00F4;,&#x1ED3;,&#x1ED1;,&#x1ED5;,&#x1ED7;,&#x1ED9;,&#x01A1;,&#x1EDD;,&#x1EDB;,&#x1EDF;,&#x1EE1;,&#x1EE3;</string>
<!-- U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
U+1EE7: "ủ" LATIN SMALL LETTER U WITH HOOK ABOVE
@@ -83,15 +83,15 @@
U+1EED: "ử" LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
U+1EEF: "ữ" LATIN SMALL LETTER U WITH HORN AND TILDE
U+1EF1: "ự" LATIN SMALL LETTER U WITH HORN AND DOT BELOW -->
- <string name="more_keys_for_u">&#x00F9;,&#x00FA;,&#x1EE7;,&#x0169;,&#x1EE5;,&#x01B0;,&#x1EEB;,&#x1EE9;,&#x1EED;,&#x1EEF;,&#x1EF1;</string>
+ <string name="morekeys_u">&#x00F9;,&#x00FA;,&#x1EE7;,&#x0169;,&#x1EE5;,&#x01B0;,&#x1EEB;,&#x1EE9;,&#x1EED;,&#x1EEF;,&#x1EF1;</string>
<!-- U+1EF3: "ỳ" LATIN SMALL LETTER Y WITH GRAVE
U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
U+1EF7: "ỷ" LATIN SMALL LETTER Y WITH HOOK ABOVE
U+1EF9: "ỹ" LATIN SMALL LETTER Y WITH TILDE
U+1EF5: "ỵ" LATIN SMALL LETTER Y WITH DOT BELOW -->
- <string name="more_keys_for_y">&#x1EF3;,&#x00FD;,&#x1EF7;,&#x1EF9;,&#x1EF5;</string>
+ <string name="morekeys_y">&#x1EF3;,&#x00FD;,&#x1EF7;,&#x1EF9;,&#x1EF5;</string>
<!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
- <string name="more_keys_for_d">&#x0111;</string>
+ <string name="morekeys_d">&#x0111;</string>
<!-- U+20AB: "₫" DONG SIGN -->
- <string name="keylabel_for_currency">&#x20AB;</string>
+ <string name="keyspec_currency">&#x20AB;</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-zu/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-zu/donottranslate-more-keys.xml
index 191791530..f9150f366 100644
--- a/tools/make-keyboard-text/res/values-zu/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-zu/donottranslate-more-keys.xml
@@ -27,19 +27,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
@@ -48,17 +48,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>
diff --git a/tools/make-keyboard-text/res/values-zz/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-zz/donottranslate-more-keys.xml
index ad69019a3..f20c7f618 100644
--- a/tools/make-keyboard-text/res/values-zz/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-zz/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">&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E4;,&#x00E5;,&#x00E6;,&#x0101;,&#x0103;,&#x0105;,&#x00AA;</string>
+ <string name="morekeys_a">&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E4;,&#x00E5;,&#x00E6;,&#x0101;,&#x0103;,&#x0105;,&#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
@@ -39,7 +39,7 @@
U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
U+011B: "ě" LATIN SMALL LETTER E WITH CARON -->
- <string name="more_keys_for_e">&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0113;,&#x0115;,&#x0117;,&#x0119;,&#x011B;</string>
+ <string name="morekeys_e">&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0113;,&#x0115;,&#x0117;,&#x0119;,&#x011B;</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
@@ -50,7 +50,7 @@
U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
U+0131: "ı" LATIN SMALL LETTER DOTLESS I
U+0133: "ij" LATIN SMALL LIGATURE IJ -->
- <string name="more_keys_for_i">&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0129;,&#x012B;,&#x012D;,&#x012F;,&#x0131;,&#x0133;</string>
+ <string name="morekeys_i">&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0129;,&#x012B;,&#x012D;,&#x012F;,&#x0131;,&#x0133;</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
@@ -62,7 +62,7 @@
U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
U+0153: "œ" LATIN SMALL LIGATURE OE
U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
- <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x00F4;,&#x00F5;,&#x00F6;,&#x00F8;,&#x014D;,&#x014F;,&#x0151;,&#x0153;,&#x00BA;</string>
+ <string name="morekeys_o">&#x00F2;,&#x00F3;,&#x00F4;,&#x00F5;,&#x00F6;,&#x00F8;,&#x014D;,&#x014F;,&#x0151;,&#x0153;,&#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
@@ -73,67 +73,67 @@
U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK -->
- <string name="more_keys_for_u">&#x00F9;,&#x00FA;,&#x00FB;,&#x00FC;,&#x0169;,&#x016B;,&#x016D;,&#x016F;,&#x0171;,&#x0173;</string>
+ <string name="morekeys_u">&#x00F9;,&#x00FA;,&#x00FB;,&#x00FC;,&#x0169;,&#x016B;,&#x016D;,&#x016F;,&#x0171;,&#x0173;</string>
<!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
U+015D: "ŝ" LATIN SMALL LETTER S WITH CIRCUMFLEX
U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
U+0161: "š" LATIN SMALL LETTER S WITH CARON
U+017F: "ſ" LATIN SMALL LETTER LONG S -->
- <string name="more_keys_for_s">&#x00DF;,&#x015B;,&#x015D;,&#x015F;,&#x0161;,&#x017F;</string>
+ <string name="morekeys_s">&#x00DF;,&#x015B;,&#x015D;,&#x015F;,&#x0161;,&#x017F;</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+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
U+0109: "ĉ" LATIN SMALL LETTER C WITH CIRCUMFLEX
U+010B: "ċ" LATIN SMALL LETTER C WITH DOT ABOVE
U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
- <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x0109;,&#x010B;,&#x010D;</string>
+ <string name="morekeys_c">&#x00E7;,&#x0107;,&#x0109;,&#x010B;,&#x010D;</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+0133: "ij" LATIN SMALL LIGATURE IJ -->
- <string name="more_keys_for_y">&#x00FD;,&#x0177;,&#x00FF;,&#x0133;</string>
+ <string name="morekeys_y">&#x00FD;,&#x0177;,&#x00FF;,&#x0133;</string>
<!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON
U+0111: "đ" LATIN SMALL LETTER D WITH STROKE
U+00F0: "ð" LATIN SMALL LETTER ETH -->
- <string name="more_keys_for_d">&#x010F;,&#x0111;,&#x00F0;</string>
+ <string name="morekeys_d">&#x010F;,&#x0111;,&#x00F0;</string>
<!-- U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
U+0159: "ř" LATIN SMALL LETTER R WITH CARON -->
- <string name="more_keys_for_r">&#x0155;,&#x0157;,&#x0159;</string>
+ <string name="morekeys_r">&#x0155;,&#x0157;,&#x0159;</string>
<!-- U+00FE: "þ" LATIN SMALL LETTER THORN
U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
U+0165: "ť" LATIN SMALL LETTER T WITH CARON
U+0167: "ŧ" LATIN SMALL LETTER T WITH STROKE -->
- <string name="more_keys_for_t">&#x00FE;,&#x0163;,&#x0165;,&#x0167;</string>
+ <string name="morekeys_t">&#x00FE;,&#x0163;,&#x0165;,&#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+011D: "ĝ" LATIN SMALL LETTER G WITH CIRCUMFLEX
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">&#x011D;,&#x011F;,&#x0121;,&#x0123;</string>
+ <string name="morekeys_g">&#x011D;,&#x011F;,&#x0121;,&#x0123;</string>
<!-- U+0125: "ĥ" LATIN SMALL LETTER H WITH CIRCUMFLEX -->
- <string name="more_keys_for_h">&#x0125;</string>
+ <string name="morekeys_h">&#x0125;</string>
<!-- U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX -->
- <string name="more_keys_for_j">&#x0135;</string>
+ <string name="morekeys_j">&#x0135;</string>
<!-- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX -->
- <string name="more_keys_for_w">&#x0175;</string>
+ <string name="morekeys_w">&#x0175;</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
index 79f2c657e..4b9ca162e 100644
--- a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
@@ -18,58 +18,64 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="more_keys_for_a"></string>
- <string name="more_keys_for_e"></string>
- <string name="more_keys_for_i"></string>
- <string name="more_keys_for_o"></string>
- <string name="more_keys_for_u"></string>
- <string name="more_keys_for_s"></string>
- <string name="more_keys_for_n"></string>
- <string name="more_keys_for_c"></string>
- <string name="more_keys_for_y"></string>
- <string name="more_keys_for_d"></string>
- <string name="more_keys_for_r"></string>
- <string name="more_keys_for_t"></string>
- <string name="more_keys_for_z"></string>
- <string name="more_keys_for_k"></string>
- <string name="more_keys_for_l"></string>
- <string name="more_keys_for_g"></string>
- <string name="more_keys_for_v"></string>
- <string name="more_keys_for_h"></string>
- <string name="more_keys_for_j"></string>
- <string name="more_keys_for_w"></string>
- <string name="keylabel_for_nordic_row1_11"></string>
- <string name="keylabel_for_nordic_row2_10"></string>
- <string name="keylabel_for_nordic_row2_11"></string>
- <string name="more_keys_for_nordic_row2_10"></string>
- <string name="more_keys_for_nordic_row2_11"></string>
- <string name="keylabel_for_east_slavic_row1_9"></string>
- <string name="keylabel_for_east_slavic_row2_2"></string>
- <string name="keylabel_for_east_slavic_row2_11"></string>
- <string name="keylabel_for_east_slavic_row3_5"></string>
- <string name="more_keys_for_cyrillic_u"></string>
- <string name="more_keys_for_cyrillic_ka"></string>
- <string name="more_keys_for_cyrillic_en"></string>
- <string name="more_keys_for_cyrillic_ghe"></string>
- <string name="more_keys_for_east_slavic_row2_2"></string>
- <string name="more_keys_for_cyrillic_a"></string>
- <string name="more_keys_for_cyrillic_o"></string>
- <string name="more_keys_for_cyrillic_soft_sign"></string>
- <string name="more_keys_for_east_slavic_row2_11"></string>
- <string name="keylabel_for_south_slavic_row1_6"></string>
- <string name="keylabel_for_south_slavic_row2_11"></string>
- <string name="keylabel_for_south_slavic_row3_1"></string>
- <string name="keylabel_for_south_slavic_row3_8"></string>
- <string name="more_keys_for_cyrillic_ie"></string>
- <string name="more_keys_for_cyrillic_i"></string>
- <string name="keylabel_for_swiss_row1_11"></string>
- <string name="keylabel_for_swiss_row2_10"></string>
- <string name="keylabel_for_swiss_row2_11"></string>
- <string name="more_keys_for_swiss_row1_11"></string>
- <string name="more_keys_for_swiss_row2_10"></string>
- <string name="more_keys_for_swiss_row2_11"></string>
+ <string name="morekeys_a"></string>
+ <string name="morekeys_e"></string>
+ <string name="morekeys_i"></string>
+ <string name="morekeys_o"></string>
+ <string name="morekeys_u"></string>
+ <string name="morekeys_s"></string>
+ <string name="morekeys_n"></string>
+ <string name="morekeys_c"></string>
+ <string name="morekeys_y"></string>
+ <string name="morekeys_d"></string>
+ <string name="morekeys_r"></string>
+ <string name="morekeys_t"></string>
+ <string name="morekeys_z"></string>
+ <string name="morekeys_k"></string>
+ <string name="morekeys_l"></string>
+ <string name="morekeys_g"></string>
+ <string name="morekeys_v"></string>
+ <string name="morekeys_h"></string>
+ <string name="morekeys_j"></string>
+ <string name="morekeys_w"></string>
+ <string name="morekeys_q"></string>
+ <string name="morekeys_x"></string>
+ <string name="keyspec_q">q</string>
+ <string name="keyspec_w">w</string>
+ <string name="keyspec_y">y</string>
+ <string name="keyspec_x">x</string>
+ <string name="keyspec_nordic_row1_11"></string>
+ <string name="keyspec_nordic_row2_10"></string>
+ <string name="keyspec_nordic_row2_11"></string>
+ <string name="morekeys_nordic_row2_10"></string>
+ <string name="morekeys_nordic_row2_11"></string>
+ <string name="keyspec_east_slavic_row1_9"></string>
+ <string name="keyspec_east_slavic_row2_2"></string>
+ <string name="keyspec_east_slavic_row2_11"></string>
+ <string name="keyspec_east_slavic_row3_5"></string>
+ <string name="morekeys_east_slavic_row2_2"></string>
+ <string name="morekeys_east_slavic_row2_11"></string>
+ <string name="morekeys_cyrillic_u"></string>
+ <string name="morekeys_cyrillic_ka"></string>
+ <string name="morekeys_cyrillic_en"></string>
+ <string name="morekeys_cyrillic_ghe"></string>
+ <string name="morekeys_cyrillic_a"></string>
+ <string name="morekeys_cyrillic_o"></string>
+ <string name="morekeys_cyrillic_i"></string>
+ <string name="morekeys_cyrillic_ie"></string>
+ <string name="morekeys_cyrillic_soft_sign"></string>
+ <string name="keyspec_south_slavic_row1_6"></string>
+ <string name="keyspec_south_slavic_row2_11"></string>
+ <string name="keyspec_south_slavic_row3_1"></string>
+ <string name="keyspec_south_slavic_row3_8"></string>
+ <string name="keyspec_swiss_row1_11"></string>
+ <string name="keyspec_swiss_row2_10"></string>
+ <string name="keyspec_swiss_row2_11"></string>
+ <string name="morekeys_swiss_row1_11"></string>
+ <string name="morekeys_swiss_row2_10"></string>
+ <string name="morekeys_swiss_row2_11"></string>
<!-- Label for "switch to alphabetic" key. -->
- <string name="label_to_alpha_key">ABC</string>
+ <string name="keylabel_to_alpha">ABC</string>
<string name="single_quotes">!text/single_lqm_rqm</string>
<string name="double_quotes">!text/double_lqm_rqm</string>
<string name="single_angle_quotes">!text/single_laqm_raqm</string>
@@ -79,80 +85,77 @@
U+20AC: "€" EURO SIGN
U+00A5: "¥" YEN SIGN
U+20B1: "₱" PESO SIGN -->
- <string name="more_keys_for_currency_dollar">&#x00A2;,&#x00A3;,&#x20AC;,&#x00A5;,&#x20B1;</string>
- <string name="keylabel_for_currency">$</string>
- <string name="more_keys_for_currency">$,&#x00A2;,&#x20AC;,&#x00A3;,&#x00A5;,&#x20B1;</string>
- <string name="more_keys_for_punctuation">"!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&amp;"</string>
- <string name="more_keys_for_tablet_punctuation">"!autoColumnOrder!7,\\,,',#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,@,:,-,\",+,\\%,&amp;"</string>
+ <string name="morekeys_currency_dollar">&#x00A2;,&#x00A3;,&#x20AC;,&#x00A5;,&#x20B1;</string>
+ <string name="keyspec_currency">$</string>
+ <string name="morekeys_currency">$,&#x00A2;,&#x20AC;,&#x00A3;,&#x00A5;,&#x20B1;</string>
+ <string name="morekeys_punctuation">"!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&amp;"</string>
+ <string name="morekeys_tablet_punctuation">"!autoColumnOrder!7,\\,,',#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,@,:,-,\",+,\\%,&amp;"</string>
<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
- <string name="keylabel_for_spanish_row2_10">&#x00F1;</string>
+ <string name="keyspec_spanish_row2_10">&#x00F1;</string>
<!-- U+2020: "†" DAGGER
U+2021: "‡" DOUBLE DAGGER
U+2605: "★" BLACK STAR -->
- <string name="more_keys_for_star">&#x2020;,&#x2021;,&#x2605;</string>
+ <string name="morekeys_star">&#x2020;,&#x2021;,&#x2605;</string>
<!-- U+266A: "♪" EIGHTH NOTE
U+2665: "♥" BLACK HEART SUIT
U+2660: "♠" BLACK SPADE SUIT
U+2666: "♦" BLACK DIAMOND SUIT
U+2663: "♣" BLACK CLUB SUIT -->
- <string name="more_keys_for_bullet">&#x266A;,&#x2665;,&#x2660;,&#x2666;,&#x2663;</string>
+ <string name="morekeys_bullet">&#x266A;,&#x2665;,&#x2660;,&#x2666;,&#x2663;</string>
<!-- U+00B1: "±" PLUS-MINUS SIGN -->
- <string name="more_keys_for_plus">&#x00B1;</string>
- <string name="more_keys_for_left_parenthesis">!fixedColumnOrder!3,!text/keyspecs_for_left_parenthesis_more_keys</string>
- <string name="more_keys_for_right_parenthesis">!fixedColumnOrder!3,!text/keyspecs_for_right_parenthesis_more_keys</string>
- <string name="more_keys_for_less_than">!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_left_double_angle_quote</string>
- <string name="more_keys_for_greater_than">!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_right_double_angle_quote</string>
- <string name="more_keys_for_arabic_diacritics"></string>
- <string name="keylabel_for_symbols_1">1</string>
- <string name="keylabel_for_symbols_2">2</string>
- <string name="keylabel_for_symbols_3">3</string>
- <string name="keylabel_for_symbols_4">4</string>
- <string name="keylabel_for_symbols_5">5</string>
- <string name="keylabel_for_symbols_6">6</string>
- <string name="keylabel_for_symbols_7">7</string>
- <string name="keylabel_for_symbols_8">8</string>
- <string name="keylabel_for_symbols_9">9</string>
- <string name="keylabel_for_symbols_0">0</string>
+ <string name="morekeys_plus">&#x00B1;</string>
+ <string name="morekeys_left_parenthesis">!fixedColumnOrder!3,!text/keyspecs_left_parenthesis_more_keys</string>
+ <string name="morekeys_right_parenthesis">!fixedColumnOrder!3,!text/keyspecs_right_parenthesis_more_keys</string>
+ <string name="morekeys_less_than">!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_left_double_angle_quote</string>
+ <string name="morekeys_greater_than">!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_right_double_angle_quote</string>
+ <string name="morekeys_arabic_diacritics"></string>
+ <string name="keyspec_symbols_1">1</string>
+ <string name="keyspec_symbols_2">2</string>
+ <string name="keyspec_symbols_3">3</string>
+ <string name="keyspec_symbols_4">4</string>
+ <string name="keyspec_symbols_5">5</string>
+ <string name="keyspec_symbols_6">6</string>
+ <string name="keyspec_symbols_7">7</string>
+ <string name="keyspec_symbols_8">8</string>
+ <string name="keyspec_symbols_9">9</string>
+ <string name="keyspec_symbols_0">0</string>
<!-- Label for "switch to symbols" key. -->
- <string name="label_to_symbol_key">?123</string>
- <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
- part because it'll be appended by the code. -->
- <string name="label_to_symbol_with_microphone_key">123</string>
- <string name="additional_more_keys_for_symbols_1"></string>
- <string name="additional_more_keys_for_symbols_2"></string>
- <string name="additional_more_keys_for_symbols_3"></string>
- <string name="additional_more_keys_for_symbols_4"></string>
- <string name="additional_more_keys_for_symbols_5"></string>
- <string name="additional_more_keys_for_symbols_6"></string>
- <string name="additional_more_keys_for_symbols_7"></string>
- <string name="additional_more_keys_for_symbols_8"></string>
- <string name="additional_more_keys_for_symbols_9"></string>
- <string name="additional_more_keys_for_symbols_0"></string>
+ <string name="keylabel_to_symbol">?123</string>
+ <string name="additional_morekeys_symbols_1"></string>
+ <string name="additional_morekeys_symbols_2"></string>
+ <string name="additional_morekeys_symbols_3"></string>
+ <string name="additional_morekeys_symbols_4"></string>
+ <string name="additional_morekeys_symbols_5"></string>
+ <string name="additional_morekeys_symbols_6"></string>
+ <string name="additional_morekeys_symbols_7"></string>
+ <string name="additional_morekeys_symbols_8"></string>
+ <string name="additional_morekeys_symbols_9"></string>
+ <string name="additional_morekeys_symbols_0"></string>
<!-- U+00B9: "¹" SUPERSCRIPT ONE
U+00BD: "½" VULGAR FRACTION ONE HALF
U+2153: "⅓" VULGAR FRACTION ONE THIRD
U+00BC: "¼" VULGAR FRACTION ONE QUARTER
U+215B: "⅛" VULGAR FRACTION ONE EIGHTH -->
- <string name="more_keys_for_symbols_1">&#x00B9;,&#x00BD;,&#x2153;,&#x00BC;,&#x215B;</string>
+ <string name="morekeys_symbols_1">&#x00B9;,&#x00BD;,&#x2153;,&#x00BC;,&#x215B;</string>
<!-- U+00B2: "²" SUPERSCRIPT TWO
U+2154: "⅔" VULGAR FRACTION TWO THIRDS -->
- <string name="more_keys_for_symbols_2">&#x00B2;,&#x2154;</string>
+ <string name="morekeys_symbols_2">&#x00B2;,&#x2154;</string>
<!-- U+00B3: "³" SUPERSCRIPT THREE
U+00BE: "¾" VULGAR FRACTION THREE QUARTERS
U+215C: "⅜" VULGAR FRACTION THREE EIGHTHS -->
- <string name="more_keys_for_symbols_3">&#x00B3;,&#x00BE;,&#x215C;</string>
+ <string name="morekeys_symbols_3">&#x00B3;,&#x00BE;,&#x215C;</string>
<!-- U+2074: "⁴" SUPERSCRIPT FOUR -->
- <string name="more_keys_for_symbols_4">&#x2074;</string>
+ <string name="morekeys_symbols_4">&#x2074;</string>
<!-- U+215D: "⅝" VULGAR FRACTION FIVE EIGHTHS -->
- <string name="more_keys_for_symbols_5">&#x215D;</string>
- <string name="more_keys_for_symbols_6"></string>
+ <string name="morekeys_symbols_5">&#x215D;</string>
+ <string name="morekeys_symbols_6"></string>
<!-- U+215E: "⅞" VULGAR FRACTION SEVEN EIGHTHS -->
- <string name="more_keys_for_symbols_7">&#x215E;</string>
- <string name="more_keys_for_symbols_8"></string>
- <string name="more_keys_for_symbols_9"></string>
+ <string name="morekeys_symbols_7">&#x215E;</string>
+ <string name="morekeys_symbols_8"></string>
+ <string name="morekeys_symbols_9"></string>
<!-- U+207F: "ⁿ" SUPERSCRIPT LATIN SMALL LETTER N
U+2205: "∅" EMPTY SET -->
- <string name="more_keys_for_symbols_0">&#x207F;,&#x2205;</string>
+ <string name="morekeys_symbols_0">&#x207F;,&#x2205;</string>
<!-- The all letters need to be mirrored are found at
http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt
U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
@@ -176,57 +179,51 @@
<string name="keyspec_left_single_angle_quote">&#x2039;</string>
<string name="keyspec_right_single_angle_quote">&#x203A;</string>
<!-- Comma key -->
- <string name="keylabel_for_comma">,</string>
- <string name="keylabel_for_tablet_comma">,</string>
- <string name="keyhintlabel_for_tablet_comma"></string>
- <string name="more_keys_for_tablet_comma"></string>
+ <string name="keyspec_comma">,</string>
+ <string name="keyspec_tablet_comma">,</string>
+ <string name="keyhintlabel_tablet_comma"></string>
+ <string name="morekeys_tablet_comma"></string>
<!-- Period key -->
- <string name="keylabel_for_period">.</string>
- <string name="keyhintlabel_for_period"></string>
- <string name="more_keys_for_period">!text/more_keys_for_punctuation</string>
- <string name="keylabel_for_tablet_period">.</string>
- <string name="keyhintlabel_for_tablet_period"></string>
- <string name="more_keys_for_tablet_period">!text/more_keys_for_tablet_punctuation</string>
- <string name="keylabel_for_symbols_question">?</string>
- <string name="keylabel_for_symbols_semicolon">;</string>
- <string name="keylabel_for_symbols_percent">%</string>
+ <string name="keyspec_period">.</string>
+ <string name="keyhintlabel_period"></string>
+ <string name="morekeys_period">!text/morekeys_punctuation</string>
+ <string name="keyspec_tablet_period">.</string>
+ <string name="keyhintlabel_tablet_period"></string>
+ <string name="morekeys_tablet_period">!text/morekeys_tablet_punctuation</string>
+ <string name="keyspec_symbols_question">?</string>
+ <string name="keyspec_symbols_semicolon">;</string>
+ <string name="keyspec_symbols_percent">%</string>
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
- <string name="more_keys_for_exclamation">&#x00A1;</string>
+ <string name="morekeys_exclamation">&#x00A1;</string>
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
- <string name="more_keys_for_question">&#x00BF;</string>
- <string name="more_keys_for_symbols_semicolon"></string>
+ <string name="morekeys_question">&#x00BF;</string>
+ <string name="morekeys_symbols_semicolon"></string>
<!-- U+2030: "‰" PER MILLE SIGN -->
- <string name="more_keys_for_symbols_percent">&#x2030;</string>
- <string name="more_keys_for_q"></string>
- <string name="more_keys_for_x"></string>
- <string name="keylabel_for_q">q</string>
- <string name="keylabel_for_w">w</string>
- <string name="keylabel_for_y">y</string>
- <string name="keylabel_for_x">x</string>
- <string name="more_keys_for_am_pm">!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm</string>
- <string name="settings_as_more_key">!icon/settings_key|!code/key_settings</string>
- <string name="shortcut_as_more_key">!icon/shortcut_key|!code/key_shortcut</string>
- <string name="action_next_as_more_key">!hasLabels!,!text/label_next_key|!code/key_action_next</string>
- <string name="action_previous_as_more_key">!hasLabels!,!text/label_previous_key|!code/key_action_previous</string>
+ <string name="morekeys_symbols_percent">&#x2030;</string>
+ <string name="morekeys_am_pm">!fixedColumnOrder!2,!hasLabels!,!text/keylabel_time_am,!text/keylabel_time_pm</string>
+ <string name="keyspec_settings">!icon/settings_key|!code/key_settings</string>
+ <string name="keyspec_shortcut">!icon/shortcut_key|!code/key_shortcut</string>
+ <string name="keyspec_action_next">!hasLabels!,!text/label_next_key|!code/key_action_next</string>
+ <string name="keyspec_action_previous">!hasLabels!,!text/label_previous_key|!code/key_action_previous</string>
<!-- Label for "switch to more symbol" modifier key ("= \ <"). Must be short to fit on key! -->
- <string name="label_to_more_symbol_key">= \\\\ &lt;</string>
+ <string name="keylabel_to_more_symbol">= \\\\ &lt;</string>
<!-- Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key! -->
- <string name="label_to_more_symbol_for_tablet_key">~ [ &lt;</string>
+ <string name="keylabel_tablet_to_more_symbol">~ [ &lt;</string>
<!-- Label for "switch to phone numeric" key. Must be short to fit on key! -->
- <string name="label_to_phone_numeric_key">123</string>
+ <string name="keylabel_to_phone_numeric">123</string>
<!-- Label for "switch to phone symbols" key. Must be short to fit on key! -->
<!-- U+FF0A: "*" FULLWIDTH ASTERISK
U+FF03: "#" FULLWIDTH NUMBER SIGN -->
- <string name="label_to_phone_symbols_key">&#xFF0A;&#xFF03;</string>
+ <string name="keylabel_to_phone_symbols">&#xFF0A;&#xFF03;</string>
<!-- Key label for "ante meridiem" -->
- <string name="label_time_am">"AM"</string>
+ <string name="keylabel_time_am">"AM"</string>
<!-- Key label for "post meridiem" -->
- <string name="label_time_pm">"PM"</string>
- <string name="keylabel_for_popular_domain">".com"</string>
+ <string name="keylabel_time_pm">"PM"</string>
+ <string name="keyspec_popular_domain">".com"</string>
<!-- popular web domains for the locale - most popular, displayed on the keyboard -->
- <string name="more_keys_for_popular_domain">"!hasLabels!,.net,.org,.gov,.edu"</string>
- <string name="keyspecs_for_left_parenthesis_more_keys">!text/keyspec_less_than,!text/keyspec_left_curly_bracket,!text/keyspec_left_square_bracket</string>
- <string name="keyspecs_for_right_parenthesis_more_keys">!text/keyspec_greater_than,!text/keyspec_right_curly_bracket,!text/keyspec_right_square_bracket</string>
+ <string name="morekeys_popular_domain">"!hasLabels!,.net,.org,.gov,.edu"</string>
+ <string name="keyspecs_left_parenthesis_more_keys">!text/keyspec_less_than,!text/keyspec_left_curly_bracket,!text/keyspec_left_square_bracket</string>
+ <string name="keyspecs_right_parenthesis_more_keys">!text/keyspec_greater_than,!text/keyspec_right_curly_bracket,!text/keyspec_right_square_bracket</string>
<!-- The following characters don't need BIDI mirroring.
U+2018: "‘" LEFT SINGLE QUOTATION MARK
U+2019: "’" RIGHT SINGLE QUOTATION MARK
@@ -258,8 +255,8 @@
<string name="double_9qm_lqm">&#x201D;,&#x201E;,&#x201C;</string>
<string name="double_9qm_rqm">&#x201C;,&#x201E;,&#x201D;</string>
<string name="double_rqm_9qm">&#x201C;,&#x201D;,&#x201E;</string>
- <string name="more_keys_for_single_quote">!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes</string>
- <string name="more_keys_for_double_quote">!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes</string>
- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes</string>
- <string name="emoji_key_as_more_key">!icon/emoji_key|!code/key_emoji</string>
+ <string name="morekeys_single_quote">!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes</string>
+ <string name="morekeys_double_quote">!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes</string>
+ <string name="morekeys_tablet_double_quote">!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes</string>
+ <string name="keyspec_emoji_key">!icon/emoji_key|!code/key_emoji</string>
</resources>