From 09c677f56ac0f155c6ecce3776d8c93c20625562 Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Fri, 10 Feb 2012 01:08:01 +0900
Subject: [PATCH] Replace UTF-8 string resources with their hex representations

bug: 5988656
Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
---
 .../values-ar/donottranslate-more-keys.xml    | 167 +++++++------
 java/res/values-ar/donottranslate.xml         |   2 +
 .../values-be/donottranslate-more-keys.xml    |   6 +-
 .../values-ca/donottranslate-more-keys.xml    |  60 ++++-
 .../values-cs/donottranslate-more-keys.xml    |  79 +++++-
 .../values-da/donottranslate-more-keys.xml    |  65 +++--
 .../values-de/donottranslate-more-keys.xml    |  39 ++-
 .../values-es/donottranslate-more-keys.xml    |  56 ++++-
 .../values-et/donottranslate-more-keys.xml    | 113 +++++++--
 .../values-fi/donottranslate-more-keys.xml    |  45 +++-
 .../values-fr/donottranslate-more-keys.xml    |  54 ++++-
 .../values-hr/donottranslate-more-keys.xml    |  22 +-
 .../values-hu/donottranslate-more-keys.xml    |  46 +++-
 .../values-it/donottranslate-more-keys.xml    |  46 +++-
 .../values-iw/donottranslate-more-keys.xml    |  43 ++--
 .../values-ky/donottranslate-more-keys.xml    |   9 +-
 .../values-lt/donottranslate-more-keys.xml    | 102 ++++++--
 .../values-lv/donottranslate-more-keys.xml    | 101 ++++++--
 .../values-nb/donottranslate-more-keys.xml    |  48 +++-
 .../values-nl/donottranslate-more-keys.xml    |  48 +++-
 .../values-pl/donottranslate-more-keys.xml    |  52 +++-
 .../values-pt/donottranslate-more-keys.xml    |  50 +++-
 .../values-rm/donottranslate-more-keys.xml    |   9 +-
 .../values-ro/donottranslate-more-keys.xml    |  28 ++-
 .../values-ru/donottranslate-more-keys.xml    |   3 +-
 .../values-sk/donottranslate-more-keys.xml    | 102 ++++++--
 .../values-sl/donottranslate-more-keys.xml    |  13 +-
 .../values-sv/donottranslate-more-keys.xml    |  42 +++-
 .../values-tr/donottranslate-more-keys.xml    |  43 +++-
 .../values-uk/donottranslate-more-keys.xml    |   6 +-
 .../values-vi/donottranslate-more-keys.xml    |  81 ++++++-
 java/res/values/donottranslate-more-keys.xml  | 106 ++++++---
 java/res/values/donottranslate.xml            |  24 +-
 java/res/xml-sw600dp/rows_arabic.xml          | 208 ++++++++--------
 java/res/xml-sw600dp/rows_bulgarian.xml       |  90 ++++---
 java/res/xml-sw600dp/rows_hebrew.xml          |  81 ++++---
 java/res/xml-sw600dp/rows_serbian.xml         |  93 +++++---
 java/res/xml-sw600dp/rows_slavic.xml          |  87 ++++---
 java/res/xml-sw600dp/rows_spanish.xml         |   3 +-
 java/res/xml-sw600dp/rows_symbols_shift.xml   |  71 ++++--
 java/res/xml-sw768dp/rows_arabic.xml          | 208 ++++++++--------
 java/res/xml-sw768dp/rows_bulgarian.xml       |  90 ++++---
 java/res/xml-sw768dp/rows_hebrew.xml          |  81 ++++---
 java/res/xml-sw768dp/rows_serbian.xml         |  93 +++++---
 java/res/xml-sw768dp/rows_slavic.xml          |  87 ++++---
 java/res/xml-sw768dp/rows_spanish.xml         |   3 +-
 java/res/xml-sw768dp/rows_symbols_shift.xml   |  68 ++++--
 java/res/xml/row_symbols_shift4.xml           |  12 +-
 java/res/xml/rows_arabic.xml                  | 224 ++++++++++--------
 java/res/xml/rows_bulgarian.xml               |  93 +++++---
 java/res/xml/rows_hebrew.xml                  | 102 +++++---
 java/res/xml/rows_serbian.xml                 |  93 +++++---
 java/res/xml/rows_slavic.xml                  |  84 ++++---
 java/res/xml/rows_spanish.xml                 |   3 +-
 java/res/xml/rows_symbols_shift.xml           |  48 ++--
 55 files changed, 2546 insertions(+), 1086 deletions(-)

diff --git a/java/res/values-ar/donottranslate-more-keys.xml b/java/res/values-ar/donottranslate-more-keys.xml
index df093b3c9d..e294e95d52 100644
--- a/java/res/values-ar/donottranslate-more-keys.xml
+++ b/java/res/values-ar/donottranslate-more-keys.xml
@@ -18,38 +18,48 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \u060c: ARABIC COMMA
-         \u061b: ARABIC SEMICOLON
-         \u061f: ARABIC QUESTION MARK -->
-    <!-- \u0650: ARABIC KASRA
-         \u064e: ARABIC FATHA
-         \u064b: ARABIC FATHATAN
-         \u0640: ARABIC TATWEEL
-         \u064d: ARABIC KASRATAN
-         \u0670: ARABIC LETTER SUPERSCRIPT ALEF
-         \u0656: ARABIC SUBSCRIPT ALEF
-         \u0654: ARABIC HAMZA ABOVE
-         \u0655: ARABIC HAMZA BELOW -->
-    <!-- \u0651: ARABIC SHADDA
-         \u0652: ARABIC SUKUN
-         \u064c: ARABIC DAMMATAN
-         \u0653: ARABIC MADDAH ABOVE
-         \u064f: ARABIC DAMMA -->
+    <!-- \u060c: "،" ARABIC COMMA
+         \u061b: "Ø›" ARABIC SEMICOLON
+         \u061f: "ØŸ" ARABIC QUESTION MARK -->
+    <!-- \u0650: "ِ" ARABIC KASRA
+         \u064e: "ÙŽ" ARABIC FATHA
+         \u064b: "Ù‹" ARABIC FATHATAN
+         \u0640: "Ù€" ARABIC TATWEEL
+         \u064d: "ٍ" ARABIC KASRATAN
+         \u0670: "Ù°" ARABIC LETTER SUPERSCRIPT ALEF
+         \u0656: "Ù–" ARABIC SUBSCRIPT ALEF
+         \u0654: "Ù”" ARABIC HAMZA ABOVE
+         \u0655: "Ù•" ARABIC HAMZA BELOW -->
+    <!-- \u0651: "Ù‘" ARABIC SHADDA
+         \u0652: "Ù’" ARABIC SUKUN
+         \u064c: "ٌ" ARABIC DAMMATAN
+         \u0653: "Ù“" ARABIC MADDAH ABOVE
+         \u064f: "ُ" ARABIC DAMMA -->
     <!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
     <!-- TODO: Will introduce "grouping marks" to the more characters specification. -->
     <string name="more_keys_for_punctuation">"\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0640\u0640\u0640|\u0640,\u064e,\u0650,\u064b,\u064d,\u0670,\u0656,\u0655,\u0654,\u0653,\u0652,\u0651,\u064c,\u064f"</string>
     <integer name="more_keys_keyboard_column_for_punctuation">9</integer>
     <string name="keyhintlabel_for_punctuation">\u064b</string>
-    <string name="keylabel_for_symbols_1">"Ù¡"</string>
-    <string name="keylabel_for_symbols_2">"Ù¢"</string>
-    <string name="keylabel_for_symbols_3">"Ù£"</string>
-    <string name="keylabel_for_symbols_4">"Ù¤"</string>
-    <string name="keylabel_for_symbols_5">"Ù¥"</string>
-    <string name="keylabel_for_symbols_6">"Ù¦"</string>
-    <string name="keylabel_for_symbols_7">"Ù§"</string>
-    <string name="keylabel_for_symbols_8">"Ù¨"</string>
-    <string name="keylabel_for_symbols_9">"Ù©"</string>
-    <string name="keylabel_for_symbols_0">"Ù "</string>
+    <!-- \u0661: "Ù¡" ARABIC-INDIC DIGIT ONE -->
+    <string name="keylabel_for_symbols_1">\u0661</string>
+    <!-- \u0662: "Ù¢" ARABIC-INDIC DIGIT TWO -->
+    <string name="keylabel_for_symbols_2">\u0662</string>
+    <!-- \u0663: "Ù£" ARABIC-INDIC DIGIT THREE -->
+    <string name="keylabel_for_symbols_3">\u0663</string>
+    <!-- \u0664: "Ù¤" ARABIC-INDIC DIGIT FOUR -->
+    <string name="keylabel_for_symbols_4">\u0664</string>
+    <!-- \u0665: "Ù¥" ARABIC-INDIC DIGIT FIVE -->
+    <string name="keylabel_for_symbols_5">\u0665</string>
+    <!-- \u0666: "Ù¦" ARABIC-INDIC DIGIT SIX -->
+    <string name="keylabel_for_symbols_6">\u0666</string>
+    <!-- \u0667: "Ù§" ARABIC-INDIC DIGIT SEVEN -->
+    <string name="keylabel_for_symbols_7">\u0667</string>
+    <!-- \u0668: "Ù¨" ARABIC-INDIC DIGIT EIGHT -->
+    <string name="keylabel_for_symbols_8">\u0668</string>
+    <!-- \u0669: "Ù©" ARABIC-INDIC DIGIT NINE -->
+    <string name="keylabel_for_symbols_9">\u0669</string>
+    <!-- \u0660: "Ù " ARABIC-INDIC DIGIT ZERO -->
+    <string name="keylabel_for_symbols_0">\u0660</string>
     <string name="additional_more_keys_for_symbols_1">1</string>
     <string name="additional_more_keys_for_symbols_2">2</string>
     <string name="additional_more_keys_for_symbols_3">3</string>
@@ -59,14 +69,14 @@
     <string name="additional_more_keys_for_symbols_7">7</string>
     <string name="additional_more_keys_for_symbols_8">8</string>
     <string name="additional_more_keys_for_symbols_9">9</string>
-    <!-- \u066b: ARABIC DECIMAL SEPARATOR
-         \u066c: ARABIC THOUSANDS SEPARATOR -->
+    <!-- \u066b: "Ù«" ARABIC DECIMAL SEPARATOR
+         \u066c: "Ù¬" ARABIC THOUSANDS SEPARATOR -->
     <string name="additional_more_keys_for_symbols_0">0,\u066b,\u066c</string>
     <string name="keylabel_for_comma">\u060c</string>
     <string name="keylabel_for_f1">\u060c</string>
     <string name="keylabel_for_symbols_question">\u061f</string>
     <string name="keylabel_for_symbols_semicolon">\u061b</string>
-    <!-- \u066a: ARABIC PERCENT SIGN -->
+    <!-- \u066a: "Ùª" ARABIC PERCENT SIGN -->
     <string name="keylabel_for_symbols_percent">\u066a</string>
     <string name="more_keys_for_comma">,</string>
     <string name="more_keys_for_f1">,</string>
@@ -74,70 +84,83 @@
     <string name="more_keys_for_f1_navigate">\\,,\@icon/tabKey|\@integer/key_tab</string>
     <string name="more_keys_for_symbols_question">\?</string>
     <string name="more_keys_for_symbols_semicolon">;</string>
-    <string name="more_keys_for_symbols_percent">%,‰</string>
-    <!-- \u060c: ARABIC COMMA
-         \u061b: ARABIC SEMICOLON
-         \u061f: ARABIC QUESTION MARK -->
-    <string name="keylabel_for_apostrophe">"\u060c"</string>
+    <!-- \u2030: "‰" PER MILLE SIGN -->
+    <string name="more_keys_for_symbols_percent">%,\u2030</string>
+    <!-- \u060c: "،" ARABIC COMMA
+         \u061b: "Ø›" ARABIC SEMICOLON
+         \u061f: "ØŸ" ARABIC QUESTION MARK -->
+    <string name="keylabel_for_apostrophe">\u060c</string>
     <string name="keylabel_for_dash">"."</string>
-    <string name="keyhintlabel_for_apostrophe">"\u061f"</string>
-    <string name="keyhintlabel_for_dash">"\u064b"</string>
+    <string name="keyhintlabel_for_apostrophe">\u061f</string>
+    <string name="keyhintlabel_for_dash">\u064b</string>
     <string name="more_keys_for_apostrophe">"\u061f,\u061b,!,:,-,/,\',\""</string>
-    <!-- \u0651: ARABIC SHADDA
-         \u0652: ARABIC SUKUN
-         \u064c: ARABIC DAMMATAN
-         \u0653: ARABIC MADDAH ABOVE
-         \u064f: ARABIC DAMMA -->
-    <!-- \u0650: ARABIC KASRA
-         \u064e: ARABIC FATHA
-         \u064b: ARABIC FATHATAN
-         \u0640: ARABIC TATWEEL
-         \u064d: ARABIC KASRATAN -->
-    <!-- \u0670: ARABIC LETTER SUPERSCRIPT ALEF
-         \u0656: ARABIC SUBSCRIPT ALEF
-         \u0654: ARABIC HAMZA ABOVE
-         \u0655: ARABIC HAMZA BELOW -->
+    <!-- \u0651: "Ù‘" ARABIC SHADDA
+         \u0652: "Ù’" ARABIC SUKUN
+         \u064c: "ٌ" ARABIC DAMMATAN
+         \u0653: "Ù“" ARABIC MADDAH ABOVE
+         \u064f: "ُ" ARABIC DAMMA -->
+    <!-- \u0650: "ِ" ARABIC KASRA
+         \u064e: "ÙŽ" ARABIC FATHA
+         \u064b: "Ù‹" ARABIC FATHATAN
+         \u0640: "Ù€" ARABIC TATWEEL
+         \u064d: "ٍ" ARABIC KASRATAN -->
+    <!-- \u0670: "Ù°" ARABIC LETTER SUPERSCRIPT ALEF
+         \u0656: "Ù–" ARABIC SUBSCRIPT ALEF
+         \u0654: "Ù”" ARABIC HAMZA ABOVE
+         \u0655: "Ù•" ARABIC HAMZA BELOW -->
     <!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
     <string name="more_keys_for_dash">"\u0651,\u0652,\u064c,\u0653,\u064f,\u0650,\u064e,\u064b,\u0640\u0640\u0640|\u0640,\u064d,\u0654,\u0656,\u0655,\u0670"</string>
-    <string name="more_keys_for_bullet">♪</string>
-    <!-- \u066d: ARABIC FIVE POINTED STAR -->
-    <string name="more_keys_for_star">★,\u066d</string>
+    <!-- \u266a: "♪" EIGHTH NOTE -->
+    <string name="more_keys_for_bullet">\u266a</string>
+    <!-- \u2605: "★" BLACK STAR
+         \u066d: "Ù­" ARABIC FIVE POINTED STAR -->
+    <string name="more_keys_for_star">\u2605,\u066d</string>
     <!-- The all letters need to be mirrored are found at
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
+    <!-- 0x0029: ")" RIGHT PARENTHESIS -->
     <integer name="keycode_for_left_parenthesis">0x0029</integer>
+    <!-- 0x0028: "(" LEFT PARENTHESIS -->
     <integer name="keycode_for_right_parenthesis">0x0028</integer>
-    <!-- \ufd3e: ORNATE LEFT PARENTHESIS
-         \ufd3f: ORNATE RIGHT PARENTHESIS -->
+    <!-- \ufd3e: "ï´¾" ORNATE LEFT PARENTHESIS
+         \ufd3f: "ï´¿" ORNATE RIGHT PARENTHESIS -->
+    <!-- TODO: DroidSansArabic lacks the glyph of \ufd3e ORNATE LEFT PARENTHESIS -->
+    <!-- TODO: DroidSansArabic lacks the glyph of \ufd3f ORNATE RIGHT PARENTHESIS -->
     <string name="more_keys_for_left_parenthesis">[|],{|},&lt;|&gt;,\ufd3e|\ufd3f</string>
     <string name="more_keys_for_right_parenthesis">]|[,}|{,&gt;|&lt;,\ufd3f|\ufd3e</string>
+    <!-- 0x003e: ">" GREATER-THAN SIGN -->
     <integer name="keycode_for_less_than">0x003e</integer>
+    <!-- 0x003c: "<" LESS-THAN SIGN -->
     <integer name="keycode_for_greater_than">0x003c</integer>
-    <!-- \u2264: LESS-THAN OR EQUAL TO
-         \u2265: GREATER-THAN EQUAL TO
-         \u00ab: LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-         \u00bb: RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-         \u2039: SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-         \u203a: SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+    <!-- \u2264: "≤" LESS-THAN OR EQUAL TO
+         \u2265: "≥" GREATER-THAN EQUAL TO
+         \u00ab: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+         \u00bb: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+         \u2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+         \u203a: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
          The following characters don't need BIDI mirroring.
-         \u2018: LEFT SINGLE QUOTATION MARK
-         \u2019: RIGHT SINGLE QUOTATION MARK
-         \u201a: SINGLE LOW-9 QUOTATION MARK
-         \u201b: SINGLE HIGH-REVERSED-9 QUOTATION MARK
-         \u201c: LEFT DOUBLE QUOTATION MARK
-         \u201d: RIGHT DOUBLE QUOTATION MARK
-         \u201e: DOUBLE LOW-9 QUOTATION MARK
-         \u201f: DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+         \u2018: "‘" LEFT SINGLE QUOTATION MARK
+         \u2019: "’" RIGHT SINGLE QUOTATION MARK
+         \u201a: "‚" SINGLE LOW-9 QUOTATION MARK
+         \u201b: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+         \u201c: "“" LEFT DOUBLE QUOTATION MARK
+         \u201d: "”" RIGHT DOUBLE QUOTATION MARK
+         \u201e: "„" DOUBLE LOW-9 QUOTATION MARK
+         \u201f: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
     <string name="more_keys_for_less_than">\u2264|\u2265,\u00ab|\u00bb,\u2039|\u203a</string>
     <string name="more_keys_for_greater_than">\u2265|\u2264,\u00bb|\u00ab,\u203a|\u2039</string>
+    <!-- 0x005d: "]" RIGHT SQUARE BRACKET -->
     <integer name="keycode_for_left_square_bracket">0x005d</integer>
+    <!-- 0x005b: "[" LEFT SQUARE BRACKET -->
     <integer name="keycode_for_right_square_bracket">0x005b</integer>
+    <!-- 0x007d: "}" RIGHT CURLY BRACKET -->
     <integer name="keycode_for_left_curly_bracket">0x007d</integer>
+    <!-- 0x007b: "{" LEFT CURLY BRACKET -->
     <integer name="keycode_for_right_curly_bracket">0x007b</integer>
-    <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+    <!-- TODO: Neither DroidSans nor Roboto have the glyph for \u201f DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
     <!-- <string name="more_keys_for_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb</string> -->
     <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
     <string name="more_keys_for_double_quote">\u201d,\u00ab|\u00bb,\u201c,\u00bb|\u00ab</string>
-    <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+    <!-- TODO: Neither DroidSans nor Roboto have the glyph for \u201f DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
     <!-- <string name="more_keys_for_tablet_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb,\u2018,\u2019,\u201a,\u201b</string> -->
     <!-- The 8-more keys with maxMoreKeysColumn=4 will be displayed in order of "3,1,2,4|7,5,6,8". -->
     <string name="more_keys_for_tablet_double_quote">\u201d,\u00ab|\u00bb,\u201c,\u00bb|\u00ab,\u2019,\u201a,\u2018,\u201b</string>
diff --git a/java/res/values-ar/donottranslate.xml b/java/res/values-ar/donottranslate.xml
index a9aad4e3c2..968a7309fb 100644
--- a/java/res/values-ar/donottranslate.xml
+++ b/java/res/values-ar/donottranslate.xml
@@ -21,5 +21,7 @@
     <!-- The all letters need to be mirrored are found at
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
     <!-- Symbols that are suggested between words -->
+    <!-- \u0022: """ QUOTATION MARK (double quotation mark)
+         \u0027: "'" APOSTROPHE (single quotation mark) -->
     <string name="suggested_punctuations">!,?,\\,,:,;,\u0022,(|),)|(,\u0027,-,/,@,_</string>
 </resources>
diff --git a/java/res/values-be/donottranslate-more-keys.xml b/java/res/values-be/donottranslate-more-keys.xml
index 28264c4ac6..0110de04b6 100644
--- a/java/res/values-be/donottranslate-more-keys.xml
+++ b/java/res/values-be/donottranslate-more-keys.xml
@@ -18,6 +18,8 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="keylabel_for_slavic_shcha">Ñž</string>
-    <string name="keylabel_for_slavic_i">i</string>
+    <!-- \u045e: "Ñž" CYRILLIC SMALL LETTER SHORT U -->
+    <string name="keylabel_for_slavic_shcha">\u045e</string>
+    <!-- \u0456: "Ñ–" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
+    <string name="keylabel_for_slavic_i">\u0456</string>
 </resources>
diff --git a/java/res/values-ca/donottranslate-more-keys.xml b/java/res/values-ca/donottranslate-more-keys.xml
index 512a861106..68d7f90719 100644
--- a/java/res/values-ca/donottranslate-more-keys.xml
+++ b/java/res/values-ca/donottranslate-more-keys.xml
@@ -18,12 +18,56 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">à,á,ä,â,ã,å,ą,æ,ā,ª</string>
-    <string name="more_keys_for_e">è,é,ë,ê,ę,ė,ē</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_n">ñ,ń</string>
-    <string name="more_keys_for_c">ç,ć,č</string>
-    <string name="more_keys_for_l">Å€,Å‚</string>
+    <!-- \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         \u00aa: "ª" FEMININE ORDINAL INDICATOR -->
+    <string name="more_keys_for_a">\u00e0,\u00e1,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa</string>
+    <!-- \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">\u00e8,\u00e9,\u00eb,\u00ea,\u0119,\u0117,\u0113</string>
+    <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">\u00ed,\u00ef,\u00ec,\u00ee,\u012f,\u012b</string>
+    <!-- \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON
+         \u00ba: "º" MASCULINE ORDINAL INDICATOR -->
+    <string name="more_keys_for_o">\u00f2,\u00f3,\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba</string>
+    <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fa,\u00fc,\u00f9,\u00fb,\u016b</string>
+    <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u00f1,\u0144</string>
+    <!-- \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         \u010d: "č" LATIN SMALL LETTER C WITH CARON -->
+    <string name="more_keys_for_c">\u00e7,\u0107,\u010d</string>
+    <!-- \u0140: "Å€" LATIN SMALL LETTER L WITH MIDDLE DOT
+         \u0142: "Å‚" LATIN SMALL LETTER L WITH STROKE -->
+    <string name="more_keys_for_l">\u0140,\u0142</string>
 </resources>
diff --git a/java/res/values-cs/donottranslate-more-keys.xml b/java/res/values-cs/donottranslate-more-keys.xml
index 3701adb1b7..475b589f66 100644
--- a/java/res/values-cs/donottranslate-more-keys.xml
+++ b/java/res/values-cs/donottranslate-more-keys.xml
@@ -18,17 +18,70 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">á,à,â,ä,æ,ã,å,ā</string>
-    <string name="more_keys_for_e">é,ě,è,ê,ë,ę,ė,ē</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>
+    <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">\u00e1,\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101</string>
+    <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u011b: "Ä›" LATIN SMALL LETTER E WITH CARON
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">\u00e9,\u011b,\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113</string>
+    <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">\u00ed,\u00ee,\u00ef,\u00ec,\u012f,\u012b</string>
+    <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">\u00f3,\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d</string>
+    <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u016f: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fa,\u016f,\u00fb,\u00fc,\u00f9,\u016b</string>
+    <!-- \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON
+         \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE -->
+    <string name="more_keys_for_s">\u0161,\u00df,\u015b</string>
+    <!-- \u0148: "ň" LATIN SMALL LETTER N WITH CARON
+         \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u0148,\u00f1,\u0144</string>
+    <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+         \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">\u010d,\u00e7,\u0107</string>
+    <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">\u00fd,\u00ff</string>
+    <!-- \u010f: "ď" LATIN SMALL LETTER D WITH CARON -->
+    <string name="more_keys_for_d">\u010f</string>
+    <!-- \u0159: "Å™" LATIN SMALL LETTER R WITH CARON -->
+    <string name="more_keys_for_r">\u0159</string>
+    <!-- \u0165: "Å¥" LATIN SMALL LETTER T WITH CARON -->
+    <string name="more_keys_for_t">\u0165</string>
+    <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+         \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE
+         \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
+    <string name="more_keys_for_z">\u017e,\u017a,\u017c</string>
 </resources>
diff --git a/java/res/values-da/donottranslate-more-keys.xml b/java/res/values-da/donottranslate-more-keys.xml
index b1c8d20720..84dc1bf073 100644
--- a/java/res/values-da/donottranslate-more-keys.xml
+++ b/java/res/values-da/donottranslate-more-keys.xml
@@ -18,19 +18,54 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">á,ä,à,â,ã,ā</string>
-    <string name="more_keys_for_e">é,ë</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_y">ý,ÿ</string>
-    <string name="more_keys_for_d">ð</string>
-    <string name="more_keys_for_l">Å‚</string>
-    <string name="keylabel_for_scandinavia_row1_11">Ã¥</string>
-    <string name="keylabel_for_scandinavia_row2_10">æ</string>
-    <string name="keylabel_for_scandinavia_row2_11">ø</string>
-    <string name="more_keys_for_scandinavia_row2_10">ä</string>
-    <string name="more_keys_for_scandinavia_row2_11">ö</string>
+    <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">\u00e1,\u00e4,\u00e0,\u00e2,\u00e3,\u0101</string>
+    <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS -->
+    <string name="more_keys_for_e">\u00e9,\u00eb</string>
+    <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS -->
+    <string name="more_keys_for_i">\u00ed,\u00ef</string>
+    <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">\u00f3,\u00f4,\u00f2,\u00f5,\u0153,\u014d</string>
+    <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fa,\u00fc,\u00fb,\u00f9,\u016b</string>
+    <!-- \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">\u00df,\u015b,\u0161</string>
+    <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u00f1,\u0144</string>
+    <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">\u00fd,\u00ff</string>
+    <!-- \u00f0: "ð" LATIN SMALL LETTER ETH -->
+    <string name="more_keys_for_d">\u00f0</string>
+    <!-- \u0142: "Å‚" LATIN SMALL LETTER L WITH STROKE -->
+    <string name="more_keys_for_l">\u0142</string>
+    <!-- \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE -->
+    <string name="keylabel_for_scandinavia_row1_11">\u00e5</string>
+    <!-- \u00e6: "æ" LATIN SMALL LETTER AE -->
+    <string name="keylabel_for_scandinavia_row2_10">\u00e6</string>
+    <!-- \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="keylabel_for_scandinavia_row2_11">\u00f8</string>
+    <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+    <string name="more_keys_for_scandinavia_row2_10">\u00e4</string>
+    <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+    <string name="more_keys_for_scandinavia_row2_11">\u00f6</string>
 </resources>
diff --git a/java/res/values-de/donottranslate-more-keys.xml b/java/res/values-de/donottranslate-more-keys.xml
index 48462c59d8..b8dca393c4 100644
--- a/java/res/values-de/donottranslate-more-keys.xml
+++ b/java/res/values-de/donottranslate-more-keys.xml
@@ -18,10 +18,37 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">ä,â,à,á,æ,ã,å,ā</string>
-    <string name="more_keys_for_e">Ä—</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>
+    <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">\u00e4,\u00e2,\u00e0,\u00e1,\u00e6,\u00e3,\u00e5,\u0101</string>
+    <!-- \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE -->
+    <string name="more_keys_for_e">\u0117</string>
+    <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">\u00f6,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u00f8,\u014d</string>
+    <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fc,\u00fb,\u00f9,\u00fa,\u016b</string>
+    <!-- \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">\u00df,\u015b,\u0161</string>
+    <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u00f1,\u0144</string>
 </resources>
diff --git a/java/res/values-es/donottranslate-more-keys.xml b/java/res/values-es/donottranslate-more-keys.xml
index 4292736473..644229ad12 100644
--- a/java/res/values-es/donottranslate-more-keys.xml
+++ b/java/res/values-es/donottranslate-more-keys.xml
@@ -18,12 +18,54 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">á,à,ä,â,ã,å,ą,æ,ā,ª</string>
-    <string name="more_keys_for_e">é,è,ë,ê,ę,ė,ē</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_n">ñ,ń</string>
-    <string name="more_keys_for_c">ç,ć,č</string>
+    <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         \u00aa: "ª" FEMININE ORDINAL INDICATOR -->
+    <string name="more_keys_for_a">\u00e1,\u00e0,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa</string>
+    <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">\u00e9,\u00e8,\u00eb,\u00ea,\u0119,\u0117,\u0113</string>
+    <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">\u00ed,\u00ef,\u00ec,\u00ee,\u012f,\u012b</string>
+    <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON
+         \u00ba: "º" MASCULINE ORDINAL INDICATOR -->
+    <string name="more_keys_for_o">\u00f3,\u00f2,\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba</string>
+    <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fa,\u00fc,\u00f9,\u00fb,\u016b</string>
+    <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u00f1,\u0144</string>
+    <!-- \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         \u010d: "č" LATIN SMALL LETTER C WITH CARON -->
+    <string name="more_keys_for_c">\u00e7,\u0107,\u010d</string>
     <string name="more_keys_for_punctuation">"\\,,\?,!,¿,¡,:,-,\',\",),(,/,;,+,&amp;,\@"</string>
 </resources>
diff --git a/java/res/values-et/donottranslate-more-keys.xml b/java/res/values-et/donottranslate-more-keys.xml
index bda22fcec6..833c71687e 100644
--- a/java/res/values-et/donottranslate-more-keys.xml
+++ b/java/res/values-et/donottranslate-more-keys.xml
@@ -18,25 +18,98 @@
 */
 -->
 <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="keylabel_for_scandinavia_row1_11">ü</string>
-    <string name="keylabel_for_scandinavia_row2_10">ö</string>
-    <string name="keylabel_for_scandinavia_row2_11">ä</string>
-    <string name="more_keys_for_scandinavia_row2_10">õ</string>
+    <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK -->
+    <string name="more_keys_for_a">\u00e4,\u0101,\u00e0,\u00e1,\u00e2,\u00e3,\u00e5,\u00e6,\u0105</string>
+    <!-- \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u011b: "Ä›" LATIN SMALL LETTER E WITH CARON -->
+    <string name="more_keys_for_e">\u0113,\u00e8,\u0117,\u00e9,\u00ea,\u00eb,\u0119,\u011b</string>
+    <!-- \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+    <string name="more_keys_for_i">\u012b,\u00ec,\u012f,\u00ed,\u00ee,\u00ef,\u0131</string>
+    <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_o">\u00f6,\u00f5,\u00f2,\u00f3,\u00f4,\u0153,\u0151,\u00f8</string>
+    <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON
+         \u0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u016f: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+         \u0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+    <string name="more_keys_for_u">\u00fc,\u016b,\u0173,\u00f9,\u00fa,\u00fb,\u016f,\u0171</string>
+    <!-- \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON
+         \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u015f: "ÅŸ" LATIN SMALL LETTER S WITH CEDILLA -->
+    <string name="more_keys_for_s">\u0161,\u00df,\u015b,\u015f</string>
+    <!-- \u0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+         \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u0146,\u00f1,\u0144,\u0144</string>
+    <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+         \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">\u010d,\u00e7,\u0107</string>
+    <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">\u00fd,\u00ff</string>
+    <!-- \u010f: "ď" LATIN SMALL LETTER D WITH CARON -->
+    <string name="more_keys_for_d">\u010f</string>
+    <!-- \u0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA
+         \u0159: "Å™" LATIN SMALL LETTER R WITH CARON
+         \u0155: "Å•" LATIN SMALL LETTER R WITH ACUTE -->
+    <string name="more_keys_for_r">\u0157,\u0159,\u0155</string>
+    <!-- \u0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
+         \u0165: "Å¥" LATIN SMALL LETTER T WITH CARON -->
+    <string name="more_keys_for_t">\u0163,\u0165</string>
+    <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+         \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+         \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+    <string name="more_keys_for_z">\u017e,\u017c,\u017a</string>
+    <!-- \u0137: "Ä·" LATIN SMALL LETTER K WITH CEDILLA -->
+    <string name="more_keys_for_k">\u0137</string>
+    <!-- \u013c: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+         \u0142: "Å‚" LATIN SMALL LETTER L WITH STROKE
+         \u013a: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+         \u013e: "ľ" LATIN SMALL LETTER L WITH CARON -->
+    <string name="more_keys_for_l">\u013c,\u0142,\u013a,\u013e</string>
+    <!-- \u0123: "Ä£" LATIN SMALL LETTER G WITH CEDILLA
+         \u011f: "ÄŸ" LATIN SMALL LETTER G WITH BREVE -->
+    <string name="more_keys_for_g">\u0123,\u011f</string>
+    <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row1_11">\u00fc</string>
+    <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_10">\u00f6</string>
+    <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_11">\u00e4</string>
+    <!-- \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE -->
+    <string name="more_keys_for_scandinavia_row2_10">\u00f5</string>
     <string name="more_keys_for_scandinavia_row2_11"></string>
 </resources>
diff --git a/java/res/values-fi/donottranslate-more-keys.xml b/java/res/values-fi/donottranslate-more-keys.xml
index b922fe21d9..af8b00e9af 100644
--- a/java/res/values-fi/donottranslate-more-keys.xml
+++ b/java/res/values-fi/donottranslate-more-keys.xml
@@ -18,14 +18,39 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">æ,à,á,â,ã,ā</string>
-    <string name="more_keys_for_o">ø,ô,ò,ó,õ,œ,ō</string>
-    <string name="more_keys_for_u">ü</string>
-    <string name="more_keys_for_s">š,ß,ś</string>
-    <string name="more_keys_for_z">ž,ź,ż</string>
-    <string name="keylabel_for_scandinavia_row1_11">Ã¥</string>
-    <string name="keylabel_for_scandinavia_row2_10">ö</string>
-    <string name="keylabel_for_scandinavia_row2_11">ä</string>
-    <string name="more_keys_for_scandinavia_row2_10">ø</string>
-    <string name="more_keys_for_scandinavia_row2_11">æ</string>
+    <!-- \u00e6: "æ" LATIN SMALL LETTER AE
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">\u00e6,\u00e0,\u00e1,\u00e2,\u00e3,\u0101</string>
+    <!-- \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">\u00f8,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u014d</string>
+    <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
+    <string name="more_keys_for_u">\u00fc</string>
+    <!-- \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON
+         \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE -->
+    <string name="more_keys_for_s">\u0161,\u00df,\u015b</string>
+    <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+         \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE
+         \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
+    <string name="more_keys_for_z">\u017e,\u017a,\u017c</string>
+    <!-- \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE -->
+    <string name="keylabel_for_scandinavia_row1_11">\u00e5</string>
+    <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_10">\u00f6</string>
+    <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_11">\u00e4</string>
+    <!-- \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_scandinavia_row2_10">\u00f8</string>
+    <!-- \u00e6: "æ" LATIN SMALL LETTER AE -->
+    <string name="more_keys_for_scandinavia_row2_11">\u00e6</string>
 </resources>
diff --git a/java/res/values-fr/donottranslate-more-keys.xml b/java/res/values-fr/donottranslate-more-keys.xml
index 0f78e7cd99..ac731afc58 100644
--- a/java/res/values-fr/donottranslate-more-keys.xml
+++ b/java/res/values-fr/donottranslate-more-keys.xml
@@ -18,11 +18,51 @@
 */
 -->
 <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_c">ç,ć,č</string>
-    <string name="more_keys_for_y">%,ÿ</string>
+    <!-- \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         \u00aa: "ª" FEMININE ORDINAL INDICATOR -->
+    <string name="more_keys_for_a">\u00e0,\u00e2,%,\u00e6,\u00e1,\u00e4,\u00e3,\u00e5,\u0101,\u00aa</string>
+    <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">\u00e9,\u00e8,\u00ea,\u00eb,%,\u0119,\u0117,\u0113</string>
+    <!-- \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">\u00ee,%,\u00ef,\u00ec,\u00ed,\u012f,\u012b</string>
+    <!-- \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON
+         \u00ba: "º" MASCULINE ORDINAL INDICATOR -->
+    <string name="more_keys_for_o">\u00f4,\u0153,%,\u00f6,\u00f2,\u00f3,\u00f5,\u00f8,\u014d,\u00ba</string>
+    <!-- \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00f9,\u00fb,%,\u00fc,\u00fa,\u016b</string>
+    <!-- \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         \u010d: "č" LATIN SMALL LETTER C WITH CARON -->
+    <string name="more_keys_for_c">\u00e7,\u0107,\u010d</string>
+    <!-- \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">%,\u00ff</string>
 </resources>
diff --git a/java/res/values-hr/donottranslate-more-keys.xml b/java/res/values-hr/donottranslate-more-keys.xml
index 112c444c30..9ec04f7dd2 100644
--- a/java/res/values-hr/donottranslate-more-keys.xml
+++ b/java/res/values-hr/donottranslate-more-keys.xml
@@ -18,10 +18,22 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_s">š,ś,ß</string>
-    <string name="more_keys_for_n">ñ,ń</string>
+    <!-- \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u00df: "ß" LATIN SMALL LETTER SHARP S -->
+    <string name="more_keys_for_s">\u0161,\u015b,\u00df</string>
+    <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u00f1,\u0144</string>
     <string name="more_keys_for_y"></string>
-    <string name="more_keys_for_z">ž,ź,ż</string>
-    <string name="more_keys_for_c">č,ć,ç</string>
-    <string name="more_keys_for_d">Ä‘</string>
+    <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+         \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE
+         \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
+    <string name="more_keys_for_z">\u017e,\u017a,\u017c</string>
+    <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
+    <string name="more_keys_for_c">\u010d,\u0107,\u00e7</string>
+    <!-- \u0111: "Ä‘" LATIN SMALL LETTER D WITH STROKE -->
+    <string name="more_keys_for_d">\u0111</string>
 </resources>
diff --git a/java/res/values-hu/donottranslate-more-keys.xml b/java/res/values-hu/donottranslate-more-keys.xml
index cc23dff48b..b707c53e69 100644
--- a/java/res/values-hu/donottranslate-more-keys.xml
+++ b/java/res/values-hu/donottranslate-more-keys.xml
@@ -18,9 +18,45 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">á,à,â,ä,æ,ã,å,ā</string>
-    <string name="more_keys_for_e">é,è,ê,ë,ę,ė,ē</string>
-    <string name="more_keys_for_i">í,î,ï,ì,į,ī</string>
-    <string name="more_keys_for_o">ó,ö,ő,ô,ò,õ,œ,ø,ō</string>
-    <string name="more_keys_for_u">ú,ü,ű,û,ù,ū</string>
+    <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">\u00e1,\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101</string>
+    <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">\u00e9,\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113</string>
+    <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">\u00ed,\u00ee,\u00ef,\u00ec,\u012f,\u012b</string>
+    <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">\u00f3,\u00f6,\u0151,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d</string>
+    <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fa,\u00fc,\u0171,\u00fb,\u00f9,\u016b</string>
 </resources>
diff --git a/java/res/values-it/donottranslate-more-keys.xml b/java/res/values-it/donottranslate-more-keys.xml
index 69659a3893..01a4c5f5f4 100644
--- a/java/res/values-it/donottranslate-more-keys.xml
+++ b/java/res/values-it/donottranslate-more-keys.xml
@@ -18,9 +18,45 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">à,á,â,ä,æ,ã,å,ā,ª</string>
-    <string name="more_keys_for_e">è,é,ê,ë,ę,ė,ē</string>
-    <string name="more_keys_for_i">ì,í,î,ï,į,ī</string>
-    <string name="more_keys_for_o">ò,ó,ô,ö,õ,œ,ø,ō,º</string>
-    <string name="more_keys_for_u">ù,ú,û,ü,ū</string>
+    <!-- \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         \u00aa: "ª" FEMININE ORDINAL INDICATOR -->
+    <string name="more_keys_for_a">\u00e0,\u00e1,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101,\u00aa</string>
+    <!-- \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">\u00e8,\u00e9,\u00ea,\u00eb,\u0119,\u0117,\u0113</string>
+    <!-- \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">\u00ec,\u00ed,\u00ee,\u00ef,\u012f,\u012b</string>
+    <!-- \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON
+         \u00ba: "º" MASCULINE ORDINAL INDICATOR -->
+    <string name="more_keys_for_o">\u00f2,\u00f3,\u00f4,\u00f6,\u00f5,\u0153,\u00f8,\u014d,\u00ba</string>
+    <!-- \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00f9,\u00fa,\u00fb,\u00fc,\u016b</string>
 </resources>
diff --git a/java/res/values-iw/donottranslate-more-keys.xml b/java/res/values-iw/donottranslate-more-keys.xml
index f44ff21231..32dc111469 100644
--- a/java/res/values-iw/donottranslate-more-keys.xml
+++ b/java/res/values-iw/donottranslate-more-keys.xml
@@ -18,36 +18,47 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_star">★</string>
-    <string name="more_keys_for_plus">±,﬩</string>
+    <!-- \u2605: "★" BLACK STAR -->
+    <string name="more_keys_for_star">\u2605</string>
+    <!-- \u00b1: "±" PLUS-MINUS SIGN
+         \ufb29: "﬩" HEBREW LETTER ALTERNATIVE PLUS SIGN -->
+    <string name="more_keys_for_plus">\u00b1,\ufb29</string>
     <!-- The all letters need to be mirrored are found at
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
+    <!-- 0x0029: ")" RIGHT PARENTHESIS -->
     <integer name="keycode_for_left_parenthesis">0x0029</integer>
+    <!-- 0x0028: "(" LEFT PARENTHESIS -->
     <integer name="keycode_for_right_parenthesis">0x0028</integer>
     <string name="more_keys_for_left_parenthesis">[|],{|},&lt;|&gt;</string>
     <string name="more_keys_for_right_parenthesis">]|[,}|{,&gt;|&lt;</string>
+    <!-- 0x003e: ">" GREATER-THAN SIGN -->
     <integer name="keycode_for_less_than">0x003e</integer>
+    <!-- 0x003c: "<" LESS-THAN SIGN -->
     <integer name="keycode_for_greater_than">0x003c</integer>
-    <!-- \u2264: LESS-THAN OR EQUAL TO
-         \u2265: GREATER-THAN EQUAL TO
-         \u00ab: LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-         \u00bb: RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-         \u2039: SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-         \u203a: SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+    <!-- \u2264: "≤" LESS-THAN OR EQUAL TO
+         \u2265: "≥" GREATER-THAN EQUAL TO
+         \u00ab: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+         \u00bb: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+         \u2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+         \u203a: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
          The following characters don't need BIDI mirroring.
-         \u2018: LEFT SINGLE QUOTATION MARK
-         \u2019: RIGHT SINGLE QUOTATION MARK
-         \u201a: SINGLE LOW-9 QUOTATION MARK
-         \u201b: SINGLE HIGH-REVERSED-9 QUOTATION MARK
-         \u201c: LEFT DOUBLE QUOTATION MARK
-         \u201d: RIGHT DOUBLE QUOTATION MARK
-         \u201e: DOUBLE LOW-9 QUOTATION MARK
-         \u201f: DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+         \u2018: "‘" LEFT SINGLE QUOTATION MARK
+         \u2019: "’" RIGHT SINGLE QUOTATION MARK
+         \u201a: "‚" SINGLE LOW-9 QUOTATION MARK
+         \u201b: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+         \u201c: "“" LEFT DOUBLE QUOTATION MARK
+         \u201d: "”" RIGHT DOUBLE QUOTATION MARK
+         \u201e: "„" DOUBLE LOW-9 QUOTATION MARK
+         \u201f: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
     <string name="more_keys_for_less_than">\u2264|\u2265,\u00ab|\u00bb,\u2039|\u203a</string>
     <string name="more_keys_for_greater_than">\u2265|\u2264,\u00bb|\u00ab,\u203a|\u2039</string>
+    <!-- 0x005d: "]" RIGHT SQUARE BRACKET -->
     <integer name="keycode_for_left_square_bracket">0x005d</integer>
+    <!-- 0x005b: "[" LEFT SQUARE BRACKET -->
     <integer name="keycode_for_right_square_bracket">0x005b</integer>
+    <!-- 0x007d: "}" RIGHT CURLY BRACKET -->
     <integer name="keycode_for_left_curly_bracket">0x007d</integer>
+    <!-- 0x007b: "{" LEFT CURLY BRACKET -->
     <integer name="keycode_for_right_curly_bracket">0x007b</integer>
     <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
     <!-- <string name="more_keys_for_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb</string> -->
diff --git a/java/res/values-ky/donottranslate-more-keys.xml b/java/res/values-ky/donottranslate-more-keys.xml
index 44720aa7f5..563a199702 100644
--- a/java/res/values-ky/donottranslate-more-keys.xml
+++ b/java/res/values-ky/donottranslate-more-keys.xml
@@ -18,7 +18,10 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_slavic_u">Ò¯</string>
-    <string name="more_keys_for_slavic_en">Ò£</string>
-    <string name="more_keys_for_slavic_o">Ó©</string>
+    <!-- \u04af: "Ò¯" CYRILLIC SMALL LETTER STRAIGHT U -->
+    <string name="more_keys_for_slavic_u">\u04af</string>
+    <!-- \u04a3: "Ò£" CYRILLIC SMALL LETTER EN WITH DESCENDER -->
+    <string name="more_keys_for_slavic_en">\u04a3</string>
+    <!-- \u04e9: "Ó©" CYRILLIC SMALL LETTER BARRED O -->
+    <string name="more_keys_for_slavic_o">\u04e9</string>
 </resources>
diff --git a/java/res/values-lt/donottranslate-more-keys.xml b/java/res/values-lt/donottranslate-more-keys.xml
index fc6c84b2df..ec450816d4 100644
--- a/java/res/values-lt/donottranslate-more-keys.xml
+++ b/java/res/values-lt/donottranslate-more-keys.xml
@@ -18,20 +18,90 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">ą,ä,ā,à,á,â,ã,å,æ</string>
-    <string name="more_keys_for_e">ė,ę,ē,è,é,ê,ë,ě</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>
+    <!-- \u0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u00e6: "æ" LATIN SMALL LETTER AE -->
+    <string name="more_keys_for_a">\u0105,\u00e4,\u0101,\u00e0,\u00e1,\u00e2,\u00e3,\u00e5,\u00e6</string>
+    <!-- \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u011b: "Ä›" LATIN SMALL LETTER E WITH CARON -->
+    <string name="more_keys_for_e">\u0117,\u0119,\u0113,\u00e8,\u00e9,\u00ea,\u00eb,\u011b</string>
+    <!-- \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+    <string name="more_keys_for_i">\u012f,\u012b,\u00ec,\u00ed,\u00ee,\u00ef,\u0131</string>
+    <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_o">\u00f6,\u00f5,\u00f2,\u00f3,\u00f4,\u0153,\u0151,\u00f8</string>
+    <!-- \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON
+         \u0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u016f: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+         \u0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+    <string name="more_keys_for_u">\u016b,\u0173,\u00fc,\u016b,\u00f9,\u00fa,\u00fb,\u016f,\u0171</string>
+    <!-- \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON
+         \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u015f: "ÅŸ" LATIN SMALL LETTER S WITH CEDILLA -->
+    <string name="more_keys_for_s">\u0161,\u00df,\u015b,\u015f</string>
+    <!-- \u0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+         \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u0146,\u00f1,\u0144,\u0144</string>
+    <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+         \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">\u010d,\u00e7,\u0107</string>
+    <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">\u00fd,\u00ff</string>
+    <!-- \u010f: "ď" LATIN SMALL LETTER D WITH CARON -->
+    <string name="more_keys_for_d">\u010f</string>
+    <!-- \u0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA
+         \u0159: "Å™" LATIN SMALL LETTER R WITH CARON
+         \u0155: "Å•" LATIN SMALL LETTER R WITH ACUTE -->
+    <string name="more_keys_for_r">\u0157,\u0159,\u0155</string>
+    <!-- \u0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
+         \u0165: "Å¥" LATIN SMALL LETTER T WITH CARON -->
+    <string name="more_keys_for_t">\u0163,\u0165</string>
+    <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+         \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+         \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+    <string name="more_keys_for_z">\u017e,\u017c,\u017a</string>
+    <!-- \u0137: "Ä·" LATIN SMALL LETTER K WITH CEDILLA -->
+    <string name="more_keys_for_k">\u0137</string>
+    <!-- \u013c: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+         \u0142: "Å‚" LATIN SMALL LETTER L WITH STROKE
+         \u013a: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+         \u013e: "ľ" LATIN SMALL LETTER L WITH CARON -->
+    <string name="more_keys_for_l">\u013c,\u0142,\u013a,\u013e</string>
+    <!-- \u0123: "Ä£" LATIN SMALL LETTER G WITH CEDILLA
+         \u011f: "ÄŸ" LATIN SMALL LETTER G WITH BREVE -->
+    <string name="more_keys_for_g">\u0123,\u011f</string>
 </resources>
diff --git a/java/res/values-lv/donottranslate-more-keys.xml b/java/res/values-lv/donottranslate-more-keys.xml
index 3b937dfe3d..7d3a3d82d1 100644
--- a/java/res/values-lv/donottranslate-more-keys.xml
+++ b/java/res/values-lv/donottranslate-more-keys.xml
@@ -18,20 +18,89 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">ā,à,á,â,ã,ä,å,æ,ą</string>
-    <string name="more_keys_for_e">ē,ė,è,é,ê,ë,ę,ě</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>
+    <!-- \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK -->
+    <string name="more_keys_for_a">\u0101,\u00e0,\u00e1,\u00e2,\u00e3,\u00e4,\u00e5,\u00e6,\u0105</string>
+    <!-- \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u011b: "Ä›" LATIN SMALL LETTER E WITH CARON -->
+    <string name="more_keys_for_e">\u0113,\u0117,\u00e8,\u00e9,\u00ea,\u00eb,\u0119,\u011b</string>
+    <!-- \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+    <string name="more_keys_for_i">\u012b,\u012f,\u00ec,\u00ed,\u00ee,\u00ef,\u0131</string>
+    <!-- \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_o">\u00f2,\u00f3,\u00f4,\u00f5,\u00f6,\u0153,\u0151,\u00f8</string>
+    <!-- \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON
+         \u0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u016f: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+         \u0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+    <string name="more_keys_for_u">\u016b,\u0173,\u00f9,\u00fa,\u00fb,\u00fc,\u016f,\u0171</string>
+    <!-- \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON
+         \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u015f: "ÅŸ" LATIN SMALL LETTER S WITH CEDILLA -->
+    <string name="more_keys_for_s">\u0161,\u00df,\u015b,\u015f</string>
+    <!-- \u0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+         \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u0146,\u00f1,\u0144,\u0144</string>
+    <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+         \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">\u010d,\u00e7,\u0107</string>
+    <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">\u00fd,\u00ff</string>
+    <!-- \u010f: "ď" LATIN SMALL LETTER D WITH CARON -->
+    <string name="more_keys_for_d">\u010f</string>
+    <!-- \u0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA
+         \u0159: "Å™" LATIN SMALL LETTER R WITH CARON
+         \u0155: "Å•" LATIN SMALL LETTER R WITH ACUTE -->
+    <string name="more_keys_for_r">\u0157,\u0159,\u0155</string>
+    <!-- \u0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
+         \u0165: "Å¥" LATIN SMALL LETTER T WITH CARON -->
+    <string name="more_keys_for_t">\u0163,\u0165</string>
+    <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+         \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+         \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+    <string name="more_keys_for_z">\u017e,\u017c,\u017a</string>
+    <!-- \u0137: "Ä·" LATIN SMALL LETTER K WITH CEDILLA -->
+    <string name="more_keys_for_k">\u0137</string>
+    <!-- \u013c: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+         \u0142: "Å‚" LATIN SMALL LETTER L WITH STROKE
+         \u013a: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+         \u013e: "ľ" LATIN SMALL LETTER L WITH CARON -->
+    <string name="more_keys_for_l">\u013c,\u0142,\u013a,\u013e</string>
+    <!-- \u0123: "Ä£" LATIN SMALL LETTER G WITH CEDILLA
+         \u011f: "ÄŸ" LATIN SMALL LETTER G WITH BREVE -->
+    <string name="more_keys_for_g">\u0123,\u011f</string>
 </resources>
diff --git a/java/res/values-nb/donottranslate-more-keys.xml b/java/res/values-nb/donottranslate-more-keys.xml
index cf6e4d1ce3..c3d1288728 100644
--- a/java/res/values-nb/donottranslate-more-keys.xml
+++ b/java/res/values-nb/donottranslate-more-keys.xml
@@ -18,13 +18,43 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">à,ä,á,â,ã,ā</string>
-    <string name="more_keys_for_e">é,è,ê,ë,ę,ė,ē</string>
-    <string name="more_keys_for_o">ô,ò,ó,ö,õ,œ,ō</string>
-    <string name="more_keys_for_u">ü,û,ù,ú,ū</string>
-    <string name="keylabel_for_scandinavia_row1_11">Ã¥</string>
-    <string name="keylabel_for_scandinavia_row2_10">ø</string>
-    <string name="keylabel_for_scandinavia_row2_11">æ</string>
-    <string name="more_keys_for_scandinavia_row2_10">ö</string>
-    <string name="more_keys_for_scandinavia_row2_11">ä</string>
+    <!-- \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">\u00e0,\u00e4,\u00e1,\u00e2,\u00e3,\u0101</string>
+    <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">\u00e9,\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113</string>
+    <!-- \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">\u00f4,\u00f2,\u00f3,\u00f6,\u00f5,\u0153,\u014d</string>
+    <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fc,\u00fb,\u00f9,\u00fa,\u016b</string>
+    <!-- \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE -->
+    <string name="keylabel_for_scandinavia_row1_11">\u00e5</string>
+    <!-- \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="keylabel_for_scandinavia_row2_10">\u00f8</string>
+    <!-- \u00e6: "æ" LATIN SMALL LETTER AE -->
+    <string name="keylabel_for_scandinavia_row2_11">\u00e6</string>
+    <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+    <string name="more_keys_for_scandinavia_row2_10">\u00f6</string>
+    <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+    <string name="more_keys_for_scandinavia_row2_11">\u00e4</string>
 </resources>
diff --git a/java/res/values-nl/donottranslate-more-keys.xml b/java/res/values-nl/donottranslate-more-keys.xml
index ac03872f33..6310cbce3a 100644
--- a/java/res/values-nl/donottranslate-more-keys.xml
+++ b/java/res/values-nl/donottranslate-more-keys.xml
@@ -18,10 +18,46 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">á,ä,â,à,æ,ã,å,ā</string>
-    <string name="more_keys_for_e">é,ë,ê,è,ę,ė,ē</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_n">ñ,ń</string>
+    <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">\u00e1,\u00e4,\u00e2,\u00e0,\u00e6,\u00e3,\u00e5,\u0101</string>
+    <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">\u00e9,\u00eb,\u00ea,\u00e8,\u0119,\u0117,\u0113</string>
+    <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">\u00ed,\u00ef,\u00ec,\u00ee,\u012f,\u012b</string>
+    <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">\u00f3,\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d</string>
+    <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fa,\u00fc,\u00fb,\u00f9,\u016b</string>
+    <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u00f1,\u0144</string>
 </resources>
diff --git a/java/res/values-pl/donottranslate-more-keys.xml b/java/res/values-pl/donottranslate-more-keys.xml
index 84e74e8496..51477c38be 100644
--- a/java/res/values-pl/donottranslate-more-keys.xml
+++ b/java/res/values-pl/donottranslate-more-keys.xml
@@ -18,12 +18,48 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">ą,á,à,â,ä,æ,ã,å,ā</string>
-    <string name="more_keys_for_e">ę,è,é,ê,ë,ė,ē</string>
-    <string name="more_keys_for_o">ó,ö,ô,ò,õ,œ,ø,ō</string>
-    <string name="more_keys_for_s">ś,ß,š</string>
-    <string name="more_keys_for_n">ń,ñ</string>
-    <string name="more_keys_for_c">ć,ç,č</string>
-    <string name="more_keys_for_z">ż,ź,ž</string>
-    <string name="more_keys_for_l">Å‚</string>
+    <!-- \u0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">\u0105,\u00e1,\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101</string>
+    <!-- \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">\u0119,\u00e8,\u00e9,\u00ea,\u00eb,\u0117,\u0113</string>
+    <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">\u00f3,\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d</string>
+    <!-- \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">\u015b,\u00df,\u0161</string>
+    <!-- \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
+         \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
+    <string name="more_keys_for_n">\u0144,\u00f1</string>
+    <!-- \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u010d: "č" LATIN SMALL LETTER C WITH CARON -->
+    <string name="more_keys_for_c">\u0107,\u00e7,\u010d</string>
+    <!-- \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+         \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE
+         \u017e: "ž" LATIN SMALL LETTER Z WITH CARON -->
+    <string name="more_keys_for_z">\u017c,\u017a,\u017e</string>
+    <!-- \u0142: "Å‚" LATIN SMALL LETTER L WITH STROKE -->
+    <string name="more_keys_for_l">\u0142</string>
 </resources>
diff --git a/java/res/values-pt/donottranslate-more-keys.xml b/java/res/values-pt/donottranslate-more-keys.xml
index 868fe7824f..cc476d6d47 100644
--- a/java/res/values-pt/donottranslate-more-keys.xml
+++ b/java/res/values-pt/donottranslate-more-keys.xml
@@ -18,10 +18,48 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">á,ã,à,â,ä,å,æ,ª</string>
-    <string name="more_keys_for_e">é,ê,è,ę,ė,ē,ë</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_c">ç,č,ć</string>
+    <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u00aa: "ª" FEMININE ORDINAL INDICATOR -->
+    <string name="more_keys_for_a">\u00e1,\u00e3,\u00e0,\u00e2,\u00e4,\u00e5,\u00e6,\u00aa</string>
+    <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS -->
+    <string name="more_keys_for_e">\u00e9,\u00ea,\u00e8,\u0119,\u0117,\u0113,\u00eb</string>
+    <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">\u00ed,\u00ee,\u00ec,\u00ef,\u012f,\u012b</string>
+    <!-- \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON
+         \u00ba: "º" MASCULINE ORDINAL INDICATOR -->
+    <string name="more_keys_for_o">\u00f3,\u00f5,\u00f4,\u00f2,\u00f6,\u0153,\u00f8,\u014d,\u00ba</string>
+    <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fa,\u00fc,\u00f9,\u00fb,\u016b</string>
+    <!-- \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u010d: "č" LATIN SMALL LETTER C WITH CARON
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">\u00e7,\u010d,\u0107</string>
 </resources>
diff --git a/java/res/values-rm/donottranslate-more-keys.xml b/java/res/values-rm/donottranslate-more-keys.xml
index c40c29b13e..22af05fc2d 100644
--- a/java/res/values-rm/donottranslate-more-keys.xml
+++ b/java/res/values-rm/donottranslate-more-keys.xml
@@ -18,5 +18,12 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_o">ò,ó,ö,ô,õ,œ,ø</string>
+    <!-- \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_o">\u00f2,\u00f3,\u00f6,\u00f4,\u00f5,\u0153,\u00f8</string>
 </resources>
diff --git a/java/res/values-ro/donottranslate-more-keys.xml b/java/res/values-ro/donottranslate-more-keys.xml
index 42fd913363..4497f664e4 100644
--- a/java/res/values-ro/donottranslate-more-keys.xml
+++ b/java/res/values-ro/donottranslate-more-keys.xml
@@ -18,8 +18,28 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">â,ã,ă,à,á,ä,æ,å,ā</string>
-    <string name="more_keys_for_i">î,ï,ì,í,į,ī</string>
-    <string name="more_keys_for_s">ș,ß,ś,š</string>
-    <string name="more_keys_for_t">È›</string>
+    <!-- \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u0103: "ă" LATIN SMALL LETTER A WITH BREVE
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">\u00e2,\u00e3,\u0103,\u00e0,\u00e1,\u00e4,\u00e6,\u00e5,\u0101</string>
+    <!-- \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">\u00ee,\u00ef,\u00ec,\u00ed,\u012f,\u012b</string>
+    <!-- \u0219: "È™" LATIN SMALL LETTER S WITH COMMA BELOW
+         \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">\u0219,\u00df,\u015b,\u0161</string>
+    <!-- \u021b: "È›" LATIN SMALL LETTER T WITH COMMA BELOW -->
+    <string name="more_keys_for_t">\u021b</string>
 </resources>
diff --git a/java/res/values-ru/donottranslate-more-keys.xml b/java/res/values-ru/donottranslate-more-keys.xml
index b7e74660db..6b6c2b340e 100644
--- a/java/res/values-ru/donottranslate-more-keys.xml
+++ b/java/res/values-ru/donottranslate-more-keys.xml
@@ -18,5 +18,6 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_slavic_ye">Ñ‘</string>
+    <!-- \u0451: "Ñ‘" CYRILLIC SMALL LETTER IO -->
+    <string name="more_keys_for_slavic_ye">\u0451</string>
 </resources>
diff --git a/java/res/values-sk/donottranslate-more-keys.xml b/java/res/values-sk/donottranslate-more-keys.xml
index 574eedb1f3..31c5984541 100644
--- a/java/res/values-sk/donottranslate-more-keys.xml
+++ b/java/res/values-sk/donottranslate-more-keys.xml
@@ -18,20 +18,90 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">á,ä,ā,à,â,ã,å,æ,ą</string>
-    <string name="more_keys_for_e">é,ě,ē,ė,è,ê,ë,ę</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>
+    <!-- \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         \u0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+         \u00e6: "æ" LATIN SMALL LETTER AE
+         \u0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK -->
+    <string name="more_keys_for_a">\u00e1,\u00e4,\u0101,\u00e0,\u00e2,\u00e3,\u00e5,\u00e6,\u0105</string>
+    <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u011b: "Ä›" LATIN SMALL LETTER E WITH CARON
+         \u0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
+         \u0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK -->
+    <string name="more_keys_for_e">\u00e9,\u011b,\u0113,\u0117,\u00e8,\u00ea,\u00eb,\u0119</string>
+    <!-- \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+    <string name="more_keys_for_i">\u00ed,\u012b,\u012f,\u00ec,\u00ee,\u00ef,\u0131</string>
+    <!-- \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_o">\u00f4,\u00f3,\u00f6,\u00f2,\u00f5,\u0153,\u0151,\u00f8</string>
+    <!-- \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u016f: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+         \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON
+         \u0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+    <string name="more_keys_for_u">\u00fa,\u016f,\u00fc,\u016b,\u0173,\u00f9,\u00fb,\u0171</string>
+    <!-- \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON
+         \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u015f: "ÅŸ" LATIN SMALL LETTER S WITH CEDILLA -->
+    <string name="more_keys_for_s">\u0161,\u00df,\u015b,\u015f</string>
+    <!-- \u0148: "ň" LATIN SMALL LETTER N WITH CARON
+         \u0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+         \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
+         \u0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">\u0148,\u0146,\u00f1,\u0144,\u0144</string>
+    <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+         \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">\u010d,\u00e7,\u0107</string>
+    <!-- \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         \u00ff: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">\u00fd,\u00ff</string>
+    <!-- \u010f: "ď" LATIN SMALL LETTER D WITH CARON -->
+    <string name="more_keys_for_d">\u010f</string>
+    <!-- \u0155: "Å•" LATIN SMALL LETTER R WITH ACUTE
+         \u0159: "Å™" LATIN SMALL LETTER R WITH CARON
+         \u0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA -->
+    <string name="more_keys_for_r">\u0155,\u0159,\u0157</string>
+    <!-- \u0165: "Å¥" LATIN SMALL LETTER T WITH CARON
+         \u0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA -->
+    <string name="more_keys_for_t">\u0165,\u0163</string>
+    <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON
+         \u017c: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+         \u017a: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+    <string name="more_keys_for_z">\u017e,\u017c,\u017a</string>
+    <!-- \u0137: "Ä·" LATIN SMALL LETTER K WITH CEDILLA -->
+    <string name="more_keys_for_k">\u0137</string>
+    <!-- \u013e: "ľ" LATIN SMALL LETTER L WITH CARON
+         \u013a: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+         \u013c: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+         \u0142: "Å‚" LATIN SMALL LETTER L WITH STROKE -->
+    <string name="more_keys_for_l">\u013e,\u013a,\u013c,\u0142</string>
+    <!-- \u0123: "Ä£" LATIN SMALL LETTER G WITH CEDILLA
+         \u011f: "ÄŸ" LATIN SMALL LETTER G WITH BREVE -->
+    <string name="more_keys_for_g">\u0123,\u011f</string>
 </resources>
diff --git a/java/res/values-sl/donottranslate-more-keys.xml b/java/res/values-sl/donottranslate-more-keys.xml
index b72c6799e8..6890ac73f1 100644
--- a/java/res/values-sl/donottranslate-more-keys.xml
+++ b/java/res/values-sl/donottranslate-more-keys.xml
@@ -18,8 +18,13 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_s">Å¡</string>
-    <string name="more_keys_for_c">č,ć</string>
-    <string name="more_keys_for_d">Ä‘</string>
-    <string name="more_keys_for_z">ž</string>
+    <!-- \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">\u0161</string>
+    <!-- \u010d: "č" LATIN SMALL LETTER C WITH CARON
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">\u010d,\u0107</string>
+    <!-- \u0111: "Ä‘" LATIN SMALL LETTER D WITH STROKE -->
+    <string name="more_keys_for_d">\u0111</string>
+    <!-- \u017e: "ž" LATIN SMALL LETTER Z WITH CARON -->
+    <string name="more_keys_for_z">\u017e</string>
 </resources>
diff --git a/java/res/values-sv/donottranslate-more-keys.xml b/java/res/values-sv/donottranslate-more-keys.xml
index 6d9800e57c..94bcfa0219 100644
--- a/java/res/values-sv/donottranslate-more-keys.xml
+++ b/java/res/values-sv/donottranslate-more-keys.xml
@@ -18,13 +18,37 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_e">é,è,ê,ë,ę</string>
-    <string name="more_keys_for_o">œ,ô,ò,ó,õ,ō</string>
-    <string name="more_keys_for_u">ü,û,ù,ú,ū</string>
-    <string name="more_keys_for_s">ß,ś,š</string>
-    <string name="keylabel_for_scandinavia_row1_11">Ã¥</string>
-    <string name="keylabel_for_scandinavia_row2_10">ö</string>
-    <string name="keylabel_for_scandinavia_row2_11">ä</string>
-    <string name="more_keys_for_scandinavia_row2_10">ø</string>
-    <string name="more_keys_for_scandinavia_row2_11">æ</string>
+    <!-- \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u00eb: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         \u0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK -->
+    <string name="more_keys_for_e">\u00e9,\u00e8,\u00ea,\u00eb,\u0119</string>
+    <!-- \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">\u0153,\u00f4,\u00f2,\u00f3,\u00f5,\u014d</string>
+    <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fc,\u00fb,\u00f9,\u00fa,\u016b</string>
+    <!-- \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">\u00df,\u015b,\u0161</string>
+    <!-- \u00e5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE -->
+    <string name="keylabel_for_scandinavia_row1_11">\u00e5</string>
+    <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_10">\u00f6</string>
+    <!-- \u00e4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_11">\u00e4</string>
+    <!-- \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_scandinavia_row2_10">\u00f8</string>
+    <!-- \u00e6: "æ" LATIN SMALL LETTER AE -->
+    <string name="more_keys_for_scandinavia_row2_11">\u00e6</string>
 </resources>
diff --git a/java/res/values-tr/donottranslate-more-keys.xml b/java/res/values-tr/donottranslate-more-keys.xml
index 227ebf98c9..12315e42fe 100644
--- a/java/res/values-tr/donottranslate-more-keys.xml
+++ b/java/res/values-tr/donottranslate-more-keys.xml
@@ -18,11 +18,40 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">â</string>
-    <string name="more_keys_for_i">ı,î,ï,ì,í,į,ī</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_g">ÄŸ</string>
-    <string name="more_keys_for_c">ç,ć,č</string>
+    <!-- \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX -->
+    <string name="more_keys_for_a">\u00e2</string>
+    <!-- \u0131: "ı" LATIN SMALL LETTER DOTLESS I
+         \u00ee: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         \u00ef: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u012f: "į" LATIN SMALL LETTER I WITH OGONEK
+         \u012b: "Ä«" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">\u0131,\u00ee,\u00ef,\u00ec,\u00ed,\u012f,\u012b</string>
+    <!-- \u00f6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u0153: "Å“" LATIN SMALL LIGATURE OE
+         \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u00f8: "ø" LATIN SMALL LETTER O WITH STROKE
+         \u014d: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">\u00f6,\u00f4,\u0153,\u00f2,\u00f3,\u00f5,\u00f8,\u014d</string>
+    <!-- \u00fc: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         \u00fb: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u016b: "Å«" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">\u00fc,\u00fb,\u00f9,\u00fa,\u016b</string>
+    <!-- \u015f: "ÅŸ" LATIN SMALL LETTER S WITH CEDILLA
+         \u00df: "ß" LATIN SMALL LETTER SHARP S
+         \u015b: "Å›" LATIN SMALL LETTER S WITH ACUTE
+         \u0161: "Å¡" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">\u015f,\u00df,\u015b,\u0161</string>
+    <!-- \u011f: "ÄŸ" LATIN SMALL LETTER G WITH BREVE -->
+    <string name="more_keys_for_g">\u011f</string>
+    <!-- \u00e7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         \u0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         \u010d: "č" LATIN SMALL LETTER C WITH CARON -->
+    <string name="more_keys_for_c">\u00e7,\u0107,\u010d</string>
 </resources>
diff --git a/java/res/values-uk/donottranslate-more-keys.xml b/java/res/values-uk/donottranslate-more-keys.xml
index 4e7910128e..7b05f4372c 100644
--- a/java/res/values-uk/donottranslate-more-keys.xml
+++ b/java/res/values-uk/donottranslate-more-keys.xml
@@ -18,6 +18,8 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="keylabel_for_slavic_yery">Ñ–</string>
-    <string name="more_keys_for_slavic_yery">Ñ—</string>
+    <!-- \u0456: "Ñ–" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
+    <string name="keylabel_for_slavic_yery">\u0456</string>
+    <!-- \u0457: "Ñ—" CYRILLIC SMALL LETTER YI -->
+    <string name="more_keys_for_slavic_yery">\u0457</string>
 </resources>
diff --git a/java/res/values-vi/donottranslate-more-keys.xml b/java/res/values-vi/donottranslate-more-keys.xml
index 9e2f6b8fde..4cfb21373c 100644
--- a/java/res/values-vi/donottranslate-more-keys.xml
+++ b/java/res/values-vi/donottranslate-more-keys.xml
@@ -18,11 +18,78 @@
 */
 -->
 <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_y">ỳ,ý,ỷ,ỹ,ỵ</string>
-    <string name="more_keys_for_d">Ä‘</string>
+    <!-- \u00e0: "à" LATIN SMALL LETTER A WITH GRAVE
+         \u00e1: "á" LATIN SMALL LETTER A WITH ACUTE
+         \u1ea3: "ả" LATIN SMALL LETTER A WITH HOOK ABOVE
+         \u00e3: "ã" LATIN SMALL LETTER A WITH TILDE
+         \u1ea1: "ạ" LATIN SMALL LETTER A WITH DOT BELOW
+         \u0103: "ă" LATIN SMALL LETTER A WITH BREVE
+         \u1eb1: "ằ" LATIN SMALL LETTER A WITH BREVE AND GRAVE
+         \u1eaf: "ắ" LATIN SMALL LETTER A WITH BREVE AND ACUTE
+         \u1eb3: "ẳ" LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
+         \u1eb5: "ẵ" LATIN SMALL LETTER A WITH BREVE AND TILDE
+         \u1eb7: "ặ" LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
+         \u00e2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         \u1ea7: "ầ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
+         \u1ea5: "ấ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
+         \u1ea9: "ẩ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+         \u1eab: "ẫ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
+         \u1ead: "ậ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW -->
+    <string name="more_keys_for_a">\u00e0,\u00e1,\u1ea3,\u00e3,\u1ea1,\u0103,\u1eb1,\u1eaf,\u1eb3,\u1eb5,\u1eb7,\u00e2,\u1ea7,\u1ea5,\u1ea9,\u1eab,\u1ead</string>
+    <!-- \u00e8: "è" LATIN SMALL LETTER E WITH GRAVE
+         \u00e9: "é" LATIN SMALL LETTER E WITH ACUTE
+         \u1ebb: "ẻ" LATIN SMALL LETTER E WITH HOOK ABOVE
+         \u1ebd: "ẽ" LATIN SMALL LETTER E WITH TILDE
+         \u1eb9: "ẹ" LATIN SMALL LETTER E WITH DOT BELOW
+         \u00ea: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         \u1ec1: "ề" LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
+         \u1ebf: "ế" LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
+         \u1ec3: "ể" LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+         \u1ec5: "á»…" LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
+         \u1ec7: "ệ" LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW -->
+    <string name="more_keys_for_e">\u00e8,\u00e9,\u1ebb,\u1ebd,\u1eb9,\u00ea,\u1ec1,\u1ebf,\u1ec3,\u1ec5,\u1ec7</string>
+    <!-- \u00ec: "ì" LATIN SMALL LETTER I WITH GRAVE
+         \u00ed: "í" LATIN SMALL LETTER I WITH ACUTE
+         \u1ec9: "ỉ" LATIN SMALL LETTER I WITH HOOK ABOVE
+         \u0129: "Ä©" LATIN SMALL LETTER I WITH TILDE
+         \u1ecb: "ị" LATIN SMALL LETTER I WITH DOT BELOW -->
+    <string name="more_keys_for_i">\u00ec,\u00ed,\u1ec9,\u0129,\u1ecb</string>
+    <!-- \u00f2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         \u00f3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         \u1ecf: "ỏ" LATIN SMALL LETTER O WITH HOOK ABOVE
+         \u00f5: "õ" LATIN SMALL LETTER O WITH TILDE
+         \u1ecd: "ọ" LATIN SMALL LETTER O WITH DOT BELOW
+         \u00f4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         \u1ed3: "ồ" LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
+         \u1ed1: "ố" LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
+         \u1ed5: "ổ" LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+         \u1ed7: "á»—" LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
+         \u1ed9: "á»™" LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+         \u01a1: "Æ¡" LATIN SMALL LETTER O WITH HORN
+         \u1edd: "ờ" LATIN SMALL LETTER O WITH HORN AND GRAVE
+         \u1edb: "á»›" LATIN SMALL LETTER O WITH HORN AND ACUTE
+         \u1edf: "ở" LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
+         \u1ee1: "ỡ" LATIN SMALL LETTER O WITH HORN AND TILDE
+         \u1ee3: "ợ" LATIN SMALL LETTER O WITH HORN AND DOT BELOW -->
+    <string name="more_keys_for_o">\u00f2,\u00f3,\u1ecf,\u00f5,\u1ecd,\u00f4,\u1ed3,\u1ed1,\u1ed5,\u1ed7,\u1ed9,\u01a1,\u1edd,\u1edb,\u1edf,\u1ee1,\u1ee3</string>
+    <!-- \u00f9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         \u00fa: "ú" LATIN SMALL LETTER U WITH ACUTE
+         \u1ee7: "ủ" LATIN SMALL LETTER U WITH HOOK ABOVE
+         \u0169: "Å©" LATIN SMALL LETTER U WITH TILDE
+         \u1ee5: "ụ" LATIN SMALL LETTER U WITH DOT BELOW
+         \u01b0: "Æ°" LATIN SMALL LETTER U WITH HORN
+         \u1eeb: "ừ" LATIN SMALL LETTER U WITH HORN AND GRAVE
+         \u1ee9: "ứ" LATIN SMALL LETTER U WITH HORN AND ACUTE
+         \u1eed: "á»­" LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
+         \u1eef: "ữ" LATIN SMALL LETTER U WITH HORN AND TILDE
+         \u1ef1: "á»±" LATIN SMALL LETTER U WITH HORN AND DOT BELOW -->
+    <string name="more_keys_for_u">\u00f9,\u00fa,\u1ee7,\u0169,\u1ee5,\u01b0,\u1eeb,\u1ee9,\u1eed,\u1eef,\u1ef1</string>
+    <!-- \u1ef3: "ỳ" LATIN SMALL LETTER Y WITH GRAVE
+         \u00fd: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         \u1ef7: "á»·" LATIN SMALL LETTER Y WITH HOOK ABOVE
+         \u1ef9: "ỹ" LATIN SMALL LETTER Y WITH TILDE
+         \u1ef5: "ỵ" LATIN SMALL LETTER Y WITH DOT BELOW -->
+    <string name="more_keys_for_y">\u1ef3,\u00fd,\u1ef7,\u1ef9,\u1ef5</string>
+    <!-- \u0111: "Ä‘" LATIN SMALL LETTER D WITH STROKE -->
+    <string name="more_keys_for_d">\u0111</string>
 </resources>
diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml
index 57a6d6bdac..17fd9a86df 100644
--- a/java/res/values/donottranslate-more-keys.xml
+++ b/java/res/values/donottranslate-more-keys.xml
@@ -40,20 +40,30 @@
     <string name="keylabel_for_scandinavia_row2_11"></string>
     <string name="more_keys_for_scandinavia_row2_10"></string>
     <string name="more_keys_for_scandinavia_row2_11"></string>
-    <string name="keylabel_for_slavic_shcha">щ</string>
-    <string name="keylabel_for_slavic_yery">Ñ‹</string>
-    <string name="keylabel_for_slavic_i">и</string>
+    <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+    <string name="keylabel_for_slavic_shcha">\u0449</string>
+    <!-- \u044b: "Ñ‹" CYRILLIC SMALL LETTER YERU -->
+    <string name="keylabel_for_slavic_yery">\u044b</string>
+    <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+    <string name="keylabel_for_slavic_i">\u0438</string>
     <string name="more_keys_for_slavic_u"></string>
     <string name="more_keys_for_slavic_ye"></string>
     <string name="more_keys_for_slavic_en"></string>
-    <string name="more_keys_for_slavic_ha">ÑŠ</string>
+    <!-- \u044a: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN -->
+    <string name="more_keys_for_slavic_ha">\u044a</string>
     <string name="more_keys_for_slavic_yery"></string>
     <string name="more_keys_for_slavic_o"></string>
-    <string name="more_keys_for_slavic_soft_sign">ÑŠ</string>
-    <string name="more_keys_for_currency_dollar">¢,£,€,¥,₱</string>
-    <string name="more_keys_for_currency_euro">¢,£,$,¥,₱</string>
-    <string name="more_keys_for_currency_pound">¢,$,€,¥,₱</string>
-    <string name="more_keys_for_currency_general">¢,$,€,£,¥,₱</string>
+    <!-- \u044a: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN -->
+    <string name="more_keys_for_slavic_soft_sign">\u044a</string>
+    <!-- \u00a2: "¢" CENT SIGN
+         \u00a3: "£" POUND SIGN
+         \u20ac: "€" EURO SIGN
+         \u00a5: "Â¥" YEN SIGN
+         \u20b1: "₱" PESO SIGN -->
+    <string name="more_keys_for_currency_dollar">\u00a2,\u00a3,\u20ac,\u00a5,\u20b1</string>
+    <string name="more_keys_for_currency_euro">\u00a2,\u00a3,$,\u00a5,\u20b1</string>
+    <string name="more_keys_for_currency_pound">\u00a2,$,\u20ac,\u00a5,\u20b1</string>
+    <string name="more_keys_for_currency_general">\u00a2,$,\u20ac,\u00a3,\u00a5,\u20b1</string>
     <string name="more_keys_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\|:-\\\\ ,:\'(|:\'( ,:-D|:-D "</string>
     <string name="more_keys_for_punctuation">"\\,,\?,!,:,-,\',\",(,),/,;,+,&amp;,\@"</string>
     <integer name="more_keys_keyboard_column_for_punctuation">7</integer>
@@ -81,16 +91,31 @@
     <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="more_keys_for_symbols_1">¹,½,⅓,¼,⅛</string>
-    <string name="more_keys_for_symbols_2">²,⅔</string>
-    <string name="more_keys_for_symbols_3">³,¾,⅜</string>
-    <string name="more_keys_for_symbols_4">⁴</string>
-    <string name="more_keys_for_symbols_5">⅝</string>
+    <!-- \u00b9: "¹" SUPERSCRIPT ONE
+         \u00bd: "½" VULGAR FRACTION ONE HALF
+         \u2153: "â…“" VULGAR FRACTION ONE THIRD
+         \u00bc: "¼" VULGAR FRACTION ONE QUARTER
+         \u215b: "â…›" VULGAR FRACTION ONE EIGHTH -->
+    <string name="more_keys_for_symbols_1">\u00b9,\u00bd,\u2153,\u00bc,\u215b</string>
+    <!-- \u00b2: "²" SUPERSCRIPT TWO
+         \u2154: "â…”" VULGAR FRACTION TWO THIRDS -->
+    <string name="more_keys_for_symbols_2">\u00b2,\u2154</string>
+    <!-- \u00b3: "³" SUPERSCRIPT THREE
+         \u00be: "¾" VULGAR FRACTION THREE QUARTERS
+         \u215c: "⅜" VULGAR FRACTION THREE EIGHTHS -->
+    <string name="more_keys_for_symbols_3">\u00b3,\u00be,\u215c</string>
+    <!-- \u2074: "⁴" SUPERSCRIPT FOUR -->
+    <string name="more_keys_for_symbols_4">\u2074</string>
+    <!-- \u215d: "⅝" VULGAR FRACTION FIVE EIGHTHS -->
+    <string name="more_keys_for_symbols_5">\u215d</string>
     <string name="more_keys_for_symbols_6"></string>
-    <string name="more_keys_for_symbols_7">â…ž</string>
+    <!-- \u215e: "â…ž" VULGAR FRACTION SEVEN EIGHTHS -->
+    <string name="more_keys_for_symbols_7">\u215e</string>
     <string name="more_keys_for_symbols_8"></string>
     <string name="more_keys_for_symbols_9"></string>
-    <string name="more_keys_for_symbols_0">ⁿ,∅</string>
+    <!-- \u207f: "ⁿ" SUPERSCRIPT LATIN SMALL LETTER N
+         \u2205: "∅" EMPTY SET -->
+    <string name="more_keys_for_symbols_0">\u207f,\u2205</string>
     <string name="keylabel_for_comma">,</string>
     <string name="keylabel_for_f1">,</string>
     <string name="keylabel_for_symbols_question">\?</string>
@@ -100,18 +125,29 @@
     <string name="more_keys_for_f1"></string>
     <string name="more_keys_for_f1_settings">\@icon/settingsKey|\@integer/key_settings</string>
     <string name="more_keys_for_f1_navigate">\@icon/tabKey|\@integer/key_tab</string>
-    <string name="more_keys_for_symbols_question">¿</string>
+    <!-- \u00bf: "¿" INVERTED QUESTION MARK -->
+    <string name="more_keys_for_symbols_question">\u00bf</string>
     <string name="more_keys_for_symbols_semicolon"></string>
-    <string name="more_keys_for_symbols_percent">‰</string>
+    <!-- \u2030: "‰" PER MILLE SIGN -->
+    <string name="more_keys_for_symbols_percent">\u2030</string>
     <string name="keylabel_for_apostrophe">\'</string>
     <string name="keylabel_for_dash">-</string>
     <string name="keyhintlabel_for_apostrophe">\"</string>
     <string name="keyhintlabel_for_dash">_</string>
     <string name="more_keys_for_apostrophe">\"</string>
     <string name="more_keys_for_dash">_</string>
-    <string name="more_keys_for_bullet">♪,♥,♠,♦,♣</string>
-    <string name="more_keys_for_star">†,‡,★</string>
-    <string name="more_keys_for_plus">±</string>
+    <!-- \u266a: "♪" EIGHTH NOTE
+         \u2665: "♥" BLACK HEART SUIT
+         \u2660: "â™ " BLACK SPADE SUIT
+         \u2666: "♦" BLACK DIAMOND SUIT
+         \u2663: "♣" BLACK CLUB SUIT -->
+    <string name="more_keys_for_bullet">\u266a,\u2665,\u2660,\u2666,\u2663</string>
+    <!-- \u2020: "†" DAGGER
+         \u2021: "‡" DOUBLE DAGGER
+         \u2605: "★" BLACK STAR -->
+    <string name="more_keys_for_star">\u2020,\u2021,\u2605</string>
+    <!-- \u00b1: "±" PLUS-MINUS SIGN -->
+    <string name="more_keys_for_plus">\u00b1</string>
     <!-- The all letters need to be mirrored are found at
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
     <integer name="keycode_for_left_parenthesis">0x0028</integer>
@@ -120,21 +156,21 @@
     <string name="more_keys_for_right_parenthesis">],},&gt;</string>
     <integer name="keycode_for_less_than">0x003c</integer>
     <integer name="keycode_for_greater_than">0x003e</integer>
-    <!-- \u2264: LESS-THAN OR EQUAL TO
-         \u2265: GREATER-THAN EQUAL TO
-         \u00ab: LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-         \u00bb: RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-         \u2039: SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-         \u203a: SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+    <!-- \u2264: "≤" LESS-THAN OR EQUAL TO
+         \u2265: "≥" GREATER-THAN EQUAL TO
+         \u00ab: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+         \u00bb: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+         \u2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+         \u203a: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
          The following characters don't need BIDI mirroring.
-         \u2018: LEFT SINGLE QUOTATION MARK
-         \u2019: RIGHT SINGLE QUOTATION MARK
-         \u201a: SINGLE LOW-9 QUOTATION MARK
-         \u201b: SINGLE HIGH-REVERSED-9 QUOTATION MARK
-         \u201c: LEFT DOUBLE QUOTATION MARK
-         \u201d: RIGHT DOUBLE QUOTATION MARK
-         \u201e: DOUBLE LOW-9 QUOTATION MARK
-         \u201f: DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+         \u2018: "‘" LEFT SINGLE QUOTATION MARK
+         \u2019: "’" RIGHT SINGLE QUOTATION MARK
+         \u201a: "‚" SINGLE LOW-9 QUOTATION MARK
+         \u201b: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+         \u201c: "“" LEFT DOUBLE QUOTATION MARK
+         \u201d: "”" RIGHT DOUBLE QUOTATION MARK
+         \u201e: "„" DOUBLE LOW-9 QUOTATION MARK
+         \u201f: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
     <string name="more_keys_for_less_than">\u2264,\u00ab,\u2039</string>
     <string name="more_keys_for_greater_than">\u2265,\u00bb,\u203a</string>
     <integer name="keycode_for_left_square_bracket">0x005b</integer>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index cd5e3d8ea8..a00dddfa39 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -32,18 +32,18 @@
     magic_space_swapping_symbols | magic_space_stripping_symbols |
             magic_space_neutral_symbols \ symbols_excluded_from_word_separators -->
     <!-- Symbol characters list that should switch back to the main layout -->
-    <!--  \u0022: Quotation mark (double quotation mark)
-          \u0027: Apostrophe (single quotation mark)
-          \u2018: Left single quotation mark
-          \u2019: Right single quotation mark
-          \u201a: Single low-9 quotation mark
-          \u201b: Single high-reversed-9 quotation mark
-          \u201c: Left double quotation mark
-          \u201d: Right double quotation mark
-          \u201e: Double low-9 quotation mark
-          \u201f: Double high-reversed-9 quotation mark
-          \u00ab: Left-pointing double angle quotation mark
-          \u00bb: Right-pointing double angle quotation mark  -->
+    <!-- \u0022: """ QUOTATION MARK (double quotation mark)
+         \u0027: "'" APOSTROPHE (single quotation mark)
+         \u2018: "‘" LEFT SINGLE QUOTATION MARK
+         \u2019: "’" RIGHT SINGLE QUOTATION MARK
+         \u201a: "‚" SINGLE LOW-9 QUOTATION MARK
+         \u201b: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+         \u201c: "“" LEFT DOUBLE QUOTATION MARK
+         \u201d: "”" RIGHT DOUBLE QUOTATION MARK
+         \u201e: "„" DOUBLE LOW-9 QUOTATION MARK
+         \u201f: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+         \u00ab: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+         \u00bb: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
     <!-- string name="layout_switch_back_symbols">\u0022\u0027\u2018\u2019\u201a\u201b\u201c\u201d\u201e\u201f\u00ab\u00bb</string> -->
     <string name="layout_switch_back_symbols"></string>
 
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
index 1f03968ee6..715ec6cf6e 100644
--- a/java/res/xml-sw600dp/rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -26,50 +26,53 @@
     <Row
         latin:keyWidth="8.0%p"
     >
-        <!-- \u0636: ARABIC LETTER DAD -->
+        <!-- \u0636: "ض" ARABIC LETTER DAD -->
         <Key
-            latin:keyLabel="ض" />
-        <!-- \u0635: ARABIC LETTER SAD -->
+            latin:keyLabel="\u0636" />
+        <!-- \u0635: "ص" ARABIC LETTER SAD -->
         <Key
-            latin:keyLabel="ص" />
-        <!-- \u062b: ARABIC LETTER THEH -->
+            latin:keyLabel="\u0635" />
+        <!-- \u062b: "Ø«" ARABIC LETTER THEH -->
         <Key
-            latin:keyLabel="Ø«" />
-        <!-- \u0642: ARABIC LETTER QAF
-             \u06a8: ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+            latin:keyLabel="\u062b" />
+        <!-- \u0642: "Ù‚" ARABIC LETTER QAF
+             \u06a8: "Ú¨" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u06a8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="Ù‚"
-            latin:moreKeys="Ú¨" />
-        <!-- \u0641: ARABIC LETTER FEH
-             \u06a4: ARABIC LETTER VEH
-             \u06a2: ARABIC LETTER FEH WITH DOT MOVED BELOW
-             \u06a5: ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+            latin:keyLabel="\u0642"
+            latin:moreKeys="\u06a8" />
+        <!-- \u0641: "ف" ARABIC LETTER FEH
+             \u06a4: "Ú¤" ARABIC LETTER VEH
+             \u06a2: "Ú¢" ARABIC LETTER FEH WITH DOT MOVED BELOW
+             \u06a5: "Ú¥" ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u06a2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u06a5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
         <Key
-            latin:keyLabel="ف"
+            latin:keyLabel="\u0641"
             latin:moreKeys="\u06a4,\u06a2,\u06a5" />
-        <!-- \u063a: ARABIC LETTER GHAIN -->
+        <!-- \u063a: "غ" ARABIC LETTER GHAIN -->
         <Key
-            latin:keyLabel="غ" />
-        <!-- \u0639: ARABIC LETTER AIN -->
+            latin:keyLabel="\u063a" />
+        <!-- \u0639: "ع" ARABIC LETTER AIN -->
         <Key
-            latin:keyLabel="ع" />
-        <!-- \u0647: ARABIC LETTER HEH
-             \ufeeb: ARABIC LETTER HEH INITIAL FORM
-             \u0647\u0640: ARABIC LETTER HEH + Zero width joiner -->
+            latin:keyLabel="\u0639" />
+        <!-- \u0647: "Ù‡" ARABIC LETTER HEH
+             \ufeeb: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+             \u0647\u200d: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
         <Key
-            latin:keyLabel="Ù‡"
-            latin:moreKeys="\ufeeb|\u0647\u200D" />
-        <!-- \u062e: ARABIC LETTER KHAH -->
+            latin:keyLabel="\u0647"
+            latin:moreKeys="\ufeeb|\u0647\u200d" />
+        <!-- \u062e: "Ø®" ARABIC LETTER KHAH -->
         <Key
-            latin:keyLabel="Ø®" />
-        <!-- \u062d: ARABIC LETTER HAH -->
+            latin:keyLabel="\u062e" />
+        <!-- \u062d: "Ø­" ARABIC LETTER HAH -->
         <Key
-            latin:keyLabel="Ø­" />
-        <!-- \u062c: ARABIC LETTER JEEM
-             \u0686: ARABIC LETTER TCHEH -->
+            latin:keyLabel="\u062d" />
+        <!-- \u062c: "ج" ARABIC LETTER JEEM
+             \u0686: "Ú†" ARABIC LETTER TCHEH -->
         <Key
-            latin:keyLabel="ج"
-            latin:moreKeys="Ú†" />
+            latin:keyLabel="\u062c"
+            latin:moreKeys="\u0686" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -78,65 +81,66 @@
     <Row
         latin:keyWidth="8.0%p"
     >
-        <!-- \u0634: ARABIC LETTER SHEEN
-             \u069c: ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- \u0634: "Ø´" ARABIC LETTER SHEEN
+             \u069c: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u069c ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="Ø´"
-            latin:moreKeys="ڜ"
+            latin:keyLabel="\u0634"
+            latin:moreKeys="\u069c"
             latin:keyXPos="3.0%p" />
-        <!-- \u0633: ARABIC LETTER SEEN -->
+        <!-- \u0633: "س" ARABIC LETTER SEEN -->
         <Key
-            latin:keyLabel="س" />
-        <!-- \u064a: ARABIC LETTER YEH
-             \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE
-             \u0649: ARABIC LETTER ALEF MAKSURA -->
+            latin:keyLabel="\u0633" />
+        <!-- \u064a: "ÙŠ" ARABIC LETTER YEH
+             \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+             \u0649: "Ù‰" ARABIC LETTER ALEF MAKSURA -->
         <Key
-            latin:keyLabel="ÙŠ"
+            latin:keyLabel="\u064a"
             latin:moreKeys="\u0626,\u0649" />
-        <!-- \u0628: ARABIC LETTER BEH
-             \u067e: ARABIC LETTER PEH -->
-        <Key
-            latin:keyLabel="ب"
-            latin:moreKeys="Ù¾" />
-        <!-- \u0644: ARABIC LETTER LAM
-             \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
-             \u0627: ARABIC LETTER ALEF
-             \ufef7: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
-             \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
-             \ufef9: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
-             \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
-             \ufef5: ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
-             \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
-        <Key
-            latin:keyLabel="Ù„"
+        <!-- \u0628: "ب" ARABIC LETTER BEH
+             \u067e: "Ù¾" ARABIC LETTER PEH -->
+        <Key
+            latin:keyLabel="\u0628"
+            latin:moreKeys="\u067e" />
+        <!-- \u0644: "Ù„" ARABIC LETTER LAM
+             \ufefb: "ï»»" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+             \u0627: "ا" ARABIC LETTER ALEF
+             \ufef7: "ï»·" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+             \u0623: "Ø£" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             \ufef9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+             \u0625: "Ø¥" ARABIC LETTER ALEF WITH HAMZA BELOW
+             \ufef5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+             \u0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+        <Key
+            latin:keyLabel="\u0644"
             latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
-        <!-- \u0627: ARABIC LETTER ALEF
-             \u0621: ARABIC LETTER HAMZA
-             \u0671: ARABIC LETTER ALEF WASLA
-             \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
-             \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
-             \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
-        <Key
-            latin:keyLabel="ا"
+        <!-- \u0627: "ا" ARABIC LETTER ALEF
+             \u0621: "Ø¡" ARABIC LETTER HAMZA
+             \u0671: "Ù±" ARABIC LETTER ALEF WASLA
+             \u0623: "Ø£" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             \u0625: "Ø¥" ARABIC LETTER ALEF WITH HAMZA BELOW
+             \u0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+        <Key
+            latin:keyLabel="\u0627"
             latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
-        <!-- \u062a: ARABIC LETTER TEH -->
+        <!-- \u062a: "ت" ARABIC LETTER TEH -->
         <Key
-            latin:keyLabel="ت" />
-        <!-- \u0646: ARABIC LETTER NOON -->
+            latin:keyLabel="\u062a" />
+        <!-- \u0646: "Ù†" ARABIC LETTER NOON -->
         <Key
-            latin:keyLabel="Ù†" />
-        <!-- \u0645: ARABIC LETTER MEEM -->
+            latin:keyLabel="\u0646" />
+        <!-- \u0645: "Ù…" ARABIC LETTER MEEM -->
         <Key
-            latin:keyLabel="Ù…" />
-        <!-- \u0643: ARABIC LETTER KAF
-             \u06af: ARABIC LETTER GAF
-             \u06a9: ARABIC LETTER KEHEH -->
+            latin:keyLabel="\u0645" />
+        <!-- \u0643: "Ùƒ" ARABIC LETTER KAF
+             \u06af: "Ú¯" ARABIC LETTER GAF
+             \u06a9: "Ú©" ARABIC LETTER KEHEH -->
         <Key
-            latin:keyLabel="Ùƒ"
+            latin:keyLabel="\u0643"
             latin:moreKeys="\u06af,\u06a9" />
-        <!-- \u0637: ARABIC LETTER TAH -->
+        <!-- \u0637: "Ø·" ARABIC LETTER TAH -->
         <Key
-            latin:keyLabel="Ø·" />
+            latin:keyLabel="\u0637" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-14.6%p"
@@ -147,41 +151,41 @@
     >
         <include
             latin:keyboardLayout="@xml/key_smiley" />
-        <!-- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE -->
+        <!-- \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="ئ" />
-        <!-- \u0621: ARABIC LETTER HAMZA -->
+            latin:keyLabel="\u0626" />
+        <!-- \u0621: "Ø¡" ARABIC LETTER HAMZA -->
         <Key
-            latin:keyLabel="Ø¡" />
-        <!-- \u0624: ARABIC LETTER WAW WITH HAMZA ABOVE -->
+            latin:keyLabel="\u0621" />
+        <!-- \u0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="ؤ" />
-        <!-- \u0631: ARABIC LETTER REH -->
+            latin:keyLabel="\u0624" />
+        <!-- \u0631: "ر" ARABIC LETTER REH -->
         <Key
-            latin:keyLabel="ر" />
-        <!-- \u0630: ARABIC LETTER THAL -->
+            latin:keyLabel="\u0631" />
+        <!-- \u0630: "Ø°" ARABIC LETTER THAL -->
         <Key
-            latin:keyLabel="Ø°" />
-        <!-- \u0649: ARABIC LETTER ALEF MAKSURA -->
+            latin:keyLabel="\u0630" />
+        <!-- \u0649: "Ù‰" ARABIC LETTER ALEF MAKSURA -->
         <Key
-            latin:keyLabel="Ù‰" />
-        <!-- \u0629: ARABIC LETTER TEH MARBUTA -->
+            latin:keyLabel="\u0649" />
+        <!-- \u0629: "Ø©" ARABIC LETTER TEH MARBUTA -->
         <Key
-            latin:keyLabel="Ø©" />
-        <!-- \u0648: ARABIC LETTER WAW -->
+            latin:keyLabel="\u0629" />
+        <!-- \u0648: "Ùˆ" ARABIC LETTER WAW -->
         <Key
-            latin:keyLabel="Ùˆ" />
-        <!-- \u0632: ARABIC LETTER ZAIN
-             \u0698: ARABIC LETTER JEH -->
+            latin:keyLabel="\u0648" />
+        <!-- \u0632: "ز" ARABIC LETTER ZAIN
+             \u0698: "Ú˜" ARABIC LETTER JEH -->
         <Key
-            latin:keyLabel="ز"
-            latin:moreKeys="Ú˜" />
-        <!-- \u0638: ARABIC LETTER ZAH -->
+            latin:keyLabel="\u0632"
+            latin:moreKeys="\u0698" />
+        <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
         <Key
-            latin:keyLabel="ظ" />
-        <!-- \u062f: ARABIC LETTER DAL -->
+            latin:keyLabel="\u0638" />
+        <!-- \u062f: "د" ARABIC LETTER DAL -->
         <Key
-            latin:keyLabel="د" />
+            latin:keyLabel="\u062f" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml
index 7a23ce9ff4..554766310c 100644
--- a/java/res/xml-sw600dp/rows_bulgarian.xml
+++ b/java/res/xml-sw600dp/rows_bulgarian.xml
@@ -26,29 +26,40 @@
     <Row
         latin:keyWidth="7.692%p"
     >
+        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="ч" />
+            latin:keyLabel="\u0447" />
+        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="ш" />
+            latin:keyLabel="\u0448" />
+        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="е" />
+            latin:keyLabel="\u0435" />
+        <!-- \u0440: "Ñ€" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="Ñ€" />
+            latin:keyLabel="\u0440" />
+        <!-- \u0442: "Ñ‚" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="Ñ‚" />
+            latin:keyLabel="\u0442" />
+        <!-- \u044a: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="ÑŠ" />
+            latin:keyLabel="\u044a" />
+        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="у" />
+            latin:keyLabel="\u0443" />
+        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
         <Key
-            latin:keyLabel="и"
+            latin:keyLabel="\u0438"
             latin:moreKeys="ѝ" />
+        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="о" />
+            latin:keyLabel="\u043e" />
+        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="п" />
+            latin:keyLabel="\u043f" />
+        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="я" />
+            latin:keyLabel="\u044f" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -56,29 +67,40 @@
     <Row
         latin:keyWidth="7.692%p"
     >
+        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="а"
+            latin:keyLabel="\u0430"
             latin:keyXPos="4.000%p" />
+        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="с" />
+            latin:keyLabel="\u0441" />
+        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="д" />
+            latin:keyLabel="\u0434" />
+        <!-- \u0444: "Ñ„" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="Ñ„" />
+            latin:keyLabel="\u0444" />
+        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="г" />
+            latin:keyLabel="\u0433" />
+        <!-- \u0445: "Ñ…" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="Ñ…" />
+            latin:keyLabel="\u0445" />
+        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="й" />
+            latin:keyLabel="\u0439" />
+        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="к" />
+            latin:keyLabel="\u043a" />
+        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="л" />
+            latin:keyLabel="\u043b" />
+        <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
         <Key
-            latin:keyLabel="щ" />
+            latin:keyLabel="\u0449" />
+        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="ь" />
+            latin:keyLabel="\u044c" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -89,22 +111,30 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.000%p" />
+        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="з" />
+            latin:keyLabel="\u0437" />
+        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="ж" />
+            latin:keyLabel="\u0436" />
+        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="ц" />
+            latin:keyLabel="\u0446" />
+        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="в" />
+            latin:keyLabel="\u0432" />
+        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="б" />
+            latin:keyLabel="\u0431" />
+        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="н" />
+            latin:keyLabel="\u043d" />
+        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="м" />
+            latin:keyLabel="\u043c" />
+        <!-- \u044e: "ÑŽ" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="ÑŽ" />
+            latin:keyLabel="\u044e" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <include
diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
index 812e2d6e0b..8a7d706a82 100644
--- a/java/res/xml-sw600dp/rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -28,22 +28,30 @@
     >
         <include
             latin:keyboardLayout="@xml/keys_apostrophe_dash" />
+        <!-- \u05e7: "ק" HEBREW LETTER QOF -->
         <Key
-            latin:keyLabel="ק" />
+            latin:keyLabel="\u05e7" />
+        <!-- \u05e8: "ר" HEBREW LETTER RESH -->
         <Key
-            latin:keyLabel="ר" />
+            latin:keyLabel="\u05e8" />
+        <!-- \u05d0: "א" HEBREW LETTER ALEF -->
         <Key
-            latin:keyLabel="א" />
+            latin:keyLabel="\u05d0" />
+        <!-- \u05d8: "ט" HEBREW LETTER TET -->
         <Key
-            latin:keyLabel="ט" />
+            latin:keyLabel="\u05d8" />
+        <!-- \u05d5: "ו" HEBREW LETTER VAV -->
         <Key
-            latin:keyLabel="ו" />
+            latin:keyLabel="\u05d5" />
+        <!-- \u05df: "ן" HEBREW LETTER FINAL NUN -->
         <Key
-            latin:keyLabel="ן" />
+            latin:keyLabel="\u05df" />
+        <!-- \u05dd: "ם" HEBREW LETTER FINAL MEM -->
         <Key
-            latin:keyLabel="ם" />
+            latin:keyLabel="\u05dd" />
+        <!-- \u05e4: "פ" HEBREW LETTER PE -->
         <Key
-            latin:keyLabel="פ" />
+            latin:keyLabel="\u05e4" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-12.000%p"
@@ -52,30 +60,40 @@
     <Row
         latin:keyWidth="9.0%p"
     >
+        <!-- \u05e9: "ש" HEBREW LETTER SHIN -->
         <Key
-            latin:keyLabel="ש"
+            latin:keyLabel="\u05e9"
             latin:keyXPos="4.500%p" />
+        <!-- \u05d3: "ד" HEBREW LETTER DALET -->
         <Key
-            latin:keyLabel="ד" />
+            latin:keyLabel="\u05d3" />
+        <!-- \u05d2: "×’" HEBREW LETTER GIMEL -->
         <Key
-            latin:keyLabel="×’"
+            latin:keyLabel="\u05d2"
             latin:moreKeys="ג׳" />
+        <!-- \u05db: "×›" HEBREW LETTER KAF -->
         <Key
-            latin:keyLabel="×›" />
+            latin:keyLabel="\u05db" />
+        <!-- \u05e2: "×¢" HEBREW LETTER AYIN -->
         <Key
-            latin:keyLabel="×¢" />
+            latin:keyLabel="\u05e2" />
+        <!-- \u05d9: "×™" HEBREW LETTER YOD -->
         <Key
-            latin:keyLabel="×™"
+            latin:keyLabel="\u05d9"
             latin:moreKeys="ײַ" />
+        <!-- \u05d7: "×—" HEBREW LETTER HET -->
         <Key
-            latin:keyLabel="×—"
+            latin:keyLabel="\u05d7"
             latin:moreKeys="ח׳" />
+        <!-- \u05dc: "ל" HEBREW LETTER LAMED -->
         <Key
-            latin:keyLabel="ל" />
+            latin:keyLabel="\u05dc" />
+        <!-- \u05da: "ך" HEBREW LETTER FINAL KAF -->
         <Key
-            latin:keyLabel="ך" />
+            latin:keyLabel="\u05da" />
+        <!-- \u05e3: "×£" HEBREW LETTER FINAL PE -->
         <Key
-            latin:keyLabel="×£" />
+            latin:keyLabel="\u05e3" />
     </Row>
     <Row
         latin:keyWidth="8.9%p"
@@ -83,27 +101,36 @@
         <include
             latin:keyboardLayout="@xml/key_smiley"
             latin:keyWidth="10.0%p" />
+        <!-- \u05d6: "×–" HEBREW LETTER ZAYIN -->
         <Key
-            latin:keyLabel="×–"
+            latin:keyLabel="\u05d6"
             latin:moreKeys="ז׳" />
+        <!-- \u05e1: "ס" HEBREW LETTER SAMEKH -->
         <Key
-            latin:keyLabel="ס" />
+            latin:keyLabel="\u05e1" />
+        <!-- \u05d1: "ב" HEBREW LETTER BET -->
         <Key
-            latin:keyLabel="ב" />
+            latin:keyLabel="\u05d1" />
+        <!-- \u05d4: "×”" HEBREW LETTER HE -->
         <Key
-            latin:keyLabel="×”" />
+            latin:keyLabel="\u05d4" />
+        <!-- \u05e0: "× " HEBREW LETTER NUN -->
         <Key
-            latin:keyLabel="× " />
+            latin:keyLabel="\u05e0" />
+        <!-- \u05de: "מ" HEBREW LETTER MEM -->
         <Key
-            latin:keyLabel="מ" />
+            latin:keyLabel="\u05de" />
+        <!-- \u05e6: "צ" HEBREW LETTER TSADI -->
         <Key
-            latin:keyLabel="צ"
+            latin:keyLabel="\u05e6"
             latin:moreKeys="צ׳" />
+        <!-- \u05ea: "ת" HEBREW LETTER TAV -->
         <Key
-            latin:keyLabel="ת"
+            latin:keyLabel="\u05ea"
             latin:moreKeys="ת׳" />
+        <!-- \u05e5: "×¥" HEBREW LETTER FINAL TSADI -->
         <Key
-            latin:keyLabel="×¥"
+            latin:keyLabel="\u05e5"
             latin:moreKeys="ץ׳" />
         <Key
             latin:keyStyle="enterKeyStyle"
diff --git a/java/res/xml-sw600dp/rows_serbian.xml b/java/res/xml-sw600dp/rows_serbian.xml
index ea4bb14661..8f2dc8da63 100644
--- a/java/res/xml-sw600dp/rows_serbian.xml
+++ b/java/res/xml-sw600dp/rows_serbian.xml
@@ -26,29 +26,40 @@
     <Row
         latin:keyWidth="8.0%p"
     >
+        <!-- \u0459: "Ñ™" CYRILLIC SMALL LETTER LJE -->
         <Key
-            latin:keyLabel="Ñ™"
+            latin:keyLabel="\u0459"
             latin:keyXPos="2.15%p" />
+        <!-- \u045a: "Ñš" CYRILLIC SMALL LETTER NJE -->
         <Key
-            latin:keyLabel="Ñš" />
+            latin:keyLabel="\u045a" />
+        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="е" />
+            latin:keyLabel="\u0435" />
+        <!-- \u0440: "Ñ€" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="Ñ€" />
+            latin:keyLabel="\u0440" />
+        <!-- \u0442: "Ñ‚" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="Ñ‚" />
+            latin:keyLabel="\u0442" />
+        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="з" />
+            latin:keyLabel="\u0437" />
+        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="у" />
+            latin:keyLabel="\u0443" />
+        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
         <Key
-            latin:keyLabel="и" />
+            latin:keyLabel="\u0438" />
+        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="о" />
+            latin:keyLabel="\u043e" />
+        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="п" />
+            latin:keyLabel="\u043f" />
+        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="ш" />
+            latin:keyLabel="\u0448" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -57,28 +68,39 @@
     <Row
         latin:keyWidth="7.9%p"
     >
+        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="а" />
+            latin:keyLabel="\u0430" />
+        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="с" />
+            latin:keyLabel="\u0441" />
+        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="д" />
+            latin:keyLabel="\u0434" />
+        <!-- \u0444: "Ñ„" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="Ñ„" />
+            latin:keyLabel="\u0444" />
+        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="г" />
+            latin:keyLabel="\u0433" />
+        <!-- \u0445: "Ñ…" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="Ñ…" />
+            latin:keyLabel="\u0445" />
+        <!-- \u0458: "ј" CYRILLIC SMALL LETTER JE -->
         <Key
-            latin:keyLabel="ј" />
+            latin:keyLabel="\u0458" />
+        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="к" />
+            latin:keyLabel="\u043a" />
+        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="л" />
+            latin:keyLabel="\u043b" />
+        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="ч" />
+            latin:keyLabel="\u0447" />
+        <!-- \u045b: "Ñ›" CYRILLIC SMALL LETTER TSHE -->
         <Key
-            latin:keyLabel="Ñ›" />
+            latin:keyLabel="\u045b" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-14.6%p"
@@ -90,24 +112,33 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="8.0%p" />
+        <!-- \u0455: "Ñ•" CYRILLIC SMALL LETTER DZE -->
         <Key
-            latin:keyLabel="Ñ•" />
+            latin:keyLabel="\u0455" />
+        <!-- \u045f: "ÑŸ" CYRILLIC SMALL LETTER DZHE -->
         <Key
-            latin:keyLabel="ÑŸ" />
+            latin:keyLabel="\u045f" />
+        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="ц" />
+            latin:keyLabel="\u0446" />
+        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="в" />
+            latin:keyLabel="\u0432" />
+        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="б" />
+            latin:keyLabel="\u0431" />
+        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="н" />
+            latin:keyLabel="\u043d" />
+        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="м" />
+            latin:keyLabel="\u043c" />
+        <!-- \u0452: "Ñ’" CYRILLIC SMALL LETTER DJE -->
         <Key
-            latin:keyLabel="Ñ’" />
+            latin:keyLabel="\u0452" />
+        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="ж" />
+            latin:keyLabel="\u0436" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <include
diff --git a/java/res/xml-sw600dp/rows_slavic.xml b/java/res/xml-sw600dp/rows_slavic.xml
index 020ea16a26..4ca15f6dd1 100644
--- a/java/res/xml-sw600dp/rows_slavic.xml
+++ b/java/res/xml-sw600dp/rows_slavic.xml
@@ -26,33 +26,44 @@
     <Row
         latin:keyWidth="7.60%p"
     >
+        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="й" />
+            latin:keyLabel="\u0439" />
+        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="ц" />
+            latin:keyLabel="\u0446" />
+        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="у"
+            latin:keyLabel="\u0443"
             latin:moreKeys="@string/more_keys_for_slavic_u" />
+        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="к" />
+            latin:keyLabel="\u043a" />
+        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="е"
+            latin:keyLabel="\u0435"
             latin:moreKeys="@string/more_keys_for_slavic_ye" />
+        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="н"
+            latin:keyLabel="\u043d"
             latin:moreKeys="@string/more_keys_for_slavic_en" />
+        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="г" />
+            latin:keyLabel="\u0433" />
+        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="ш" />
+            latin:keyLabel="\u0448" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_shcha" />
+        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="з" />
+            latin:keyLabel="\u0437" />
+        <!-- \u0445: "Ñ…" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="Ñ…" />
+            latin:keyLabel="\u0445" />
+        <!-- \u044a: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="ÑŠ" />
+            latin:keyLabel="\u044a" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -61,31 +72,41 @@
     <Row
         latin:keyWidth="7.60%p"
     >
+        <!-- \u0444: "Ñ„" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="Ñ„"
+            latin:keyLabel="\u0444"
             latin:keyXPos="2.25%p" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_yery"
             latin:moreKeys="@string/more_keys_for_slavic_yery" />
+        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="в" />
+            latin:keyLabel="\u0432" />
+        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="а" />
+            latin:keyLabel="\u0430" />
+        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="п" />
+            latin:keyLabel="\u043f" />
+        <!-- \u0440: "Ñ€" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="Ñ€" />
+            latin:keyLabel="\u0440" />
+        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="о"
+            latin:keyLabel="\u043e"
             latin:moreKeys="@string/more_keys_for_slavic_o" />
+        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="л" />
+            latin:keyLabel="\u043b" />
+        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="д" />
+            latin:keyLabel="\u0434" />
+        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="ж" />
+            latin:keyLabel="\u0436" />
+        <!-- \u044d: "э" CYRILLIC SMALL LETTER E -->
         <Key
-            latin:keyLabel="э" />
+            latin:keyLabel="\u044d" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-14.6%p"
@@ -96,24 +117,32 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle" />
+        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="я" />
+            latin:keyLabel="\u044f" />
+        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="ч" />
+            latin:keyLabel="\u0447" />
+        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="с" />
+            latin:keyLabel="\u0441" />
+        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="м" />
+            latin:keyLabel="\u043c" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_i" />
+        <!-- \u0442: "Ñ‚" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="Ñ‚" />
+            latin:keyLabel="\u0442" />
+        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="ь" />
+            latin:keyLabel="\u044c" />
+        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="б" />
+            latin:keyLabel="\u0431" />
+        <!-- \u044e: "ÑŽ" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="ÑŽ" />
+            latin:keyLabel="\u044e" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <include
diff --git a/java/res/xml-sw600dp/rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml
index 2ab94e8c5f..d7af5b1397 100644
--- a/java/res/xml-sw600dp/rows_spanish.xml
+++ b/java/res/xml-sw600dp/rows_spanish.xml
@@ -53,8 +53,9 @@
         <Key
             latin:keyLabel="l"
             latin:moreKeys="@string/more_keys_for_l" />
+        <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
         <Key
-            latin:keyLabel="ñ" />
+            latin:keyLabel="\u00f1" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-14.6%p"
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index a10d1740c6..960d3d0f56 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -34,23 +34,32 @@
             latin:keyLabel="`" />
         <Key
             latin:keyLabel="|" />
+        <!-- \u2022: "•" BULLET -->
         <Key
-            latin:keyLabel="•"
+            latin:keyLabel="\u2022"
             latin:moreKeys="@string/more_keys_for_bullet" />
+        <!-- \u221a: "√" SQUARE ROOT -->
         <Key
-            latin:keyLabel="√" />
+            latin:keyLabel="\u221a" />
+        <!-- \u03c0: "Ï€" GREEK SMALL LETTER PI
+             \u03a0: "Π" GREEK CAPITAL LETTER PI -->
         <Key
-            latin:keyLabel="Ï€"
-            latin:moreKeys="Π" />
+            latin:keyLabel="\u03c0"
+            latin:moreKeys="\u03a0" />
+        <!-- \u00f7: "÷" DIVISION SIGN -->
         <Key
-            latin:keyLabel="÷" />
+            latin:keyLabel="\u00f7" />
+        <!-- \u00d7: "×" MULTIPLICATION SIGN -->
         <Key
-            latin:keyLabel="×" />
+            latin:keyLabel="\u00d7" />
+        <!-- \u00a7: "§" SECTION SIGN
+             \u00b6: "¶" PILCROW SIGN -->
         <Key
-            latin:keyLabel="§"
-            latin:moreKeys="¶" />
+            latin:keyLabel="\u00a7"
+            latin:moreKeys="\u00b6" />
+        <!-- \u0394: "Δ" GREEK CAPITAL LETTER DELTA -->
         <Key
-            latin:keyLabel="Δ" />
+            latin:keyLabel="\u0394" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -59,8 +68,9 @@
     <Row
         latin:keyWidth="9.0%p"
     >
+        <!-- \u00a3: "£" POUND SIGN -->
         <Key
-            latin:keyLabel="£"
+            latin:keyLabel="\u00a3"
             latin:keyXPos="4.5%p" />
         <Key
             latin:keyStyle="moreCurrency1KeyStyle" />
@@ -68,15 +78,24 @@
             latin:keyStyle="moreCurrency2KeyStyle" />
         <Key
             latin:keyStyle="moreCurrency3KeyStyle" />
+        <!-- \u2191: "↑" UPWARDS ARROW
+             \u2193: "↓" DOWNWARDS ARROW
+             \u2190: "←" LEFTWARDS ARROW
+             \u2192: "→" RIGHTWARDS ARROW -->
         <Key
             latin:keyLabel="^"
-            latin:moreKeys="↑,↓,←,→" />
-        <Key
-            latin:keyLabel="°"
-            latin:moreKeys="′,″" />
-        <Key
-            latin:keyLabel="±"
-            latin:moreKeys="∞" />
+            latin:moreKeys="\u2191,\u2193,\u2190,\u2192" />
+        <!-- \u00b0: "°" DEGREE SIGN
+             \u2032: "′" PRIME
+             \u2033: "″" DOUBLE PRIME -->
+        <Key
+            latin:keyLabel="\u00b0"
+            latin:moreKeys="\u2032,\u2033" />
+        <!-- \u00b1: "±" PLUS-MINUS SIGN
+             \u221e: "∞" INFINITY -->
+        <Key
+            latin:keyLabel="\u00b1"
+            latin:moreKeys="\u221e" />
         <include
             latin:keyboardLayout="@xml/keys_curly_brackets" />
         <Key
@@ -92,20 +111,26 @@
             latin:keyWidth="10.0%p" />
         <Key
             latin:keyLabel="\\" />
+        <!-- \u00a9: "©" COPYRIGHT SIGN -->
         <Key
-            latin:keyLabel="©" />
+            latin:keyLabel="\u00a9" />
+        <!-- \u00ae: "®" REGISTERED SIGN -->
         <Key
-            latin:keyLabel="®" />
+            latin:keyLabel="\u00ae" />
+        <!-- \u2122: "â„¢" TRADE MARK SIGN -->
         <Key
-            latin:keyLabel="â„¢" />
+            latin:keyLabel="\u2122" />
+        <!-- \u2105: "â„…" CARE OF -->
         <Key
-            latin:keyLabel="â„…" />
+            latin:keyLabel="\u2105" />
         <include
             latin:keyboardLayout="@xml/keys_square_brackets" />
+        <!-- \u00a1: "¡" INVERTED EXCLAMATION MARK -->
         <Key
-            latin:keyLabel="¡" />
+            latin:keyLabel="\u00a1" />
+        <!-- \u00bf: "¿" INVERTED QUESTION MARK -->
         <Key
-            latin:keyLabel="¿" />
+            latin:keyLabel="\u00bf" />
     </Row>
     <Row
         latin:keyWidth="8.9%p"
diff --git a/java/res/xml-sw768dp/rows_arabic.xml b/java/res/xml-sw768dp/rows_arabic.xml
index baced66c3a..8720217667 100644
--- a/java/res/xml-sw768dp/rows_arabic.xml
+++ b/java/res/xml-sw768dp/rows_arabic.xml
@@ -30,50 +30,53 @@
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="7.500%p" />
-        <!-- \u0636: ARABIC LETTER DAD -->
+        <!-- \u0636: "ض" ARABIC LETTER DAD -->
         <Key
-            latin:keyLabel="ض" />
-        <!-- \u0635: ARABIC LETTER SAD -->
+            latin:keyLabel="\u0636" />
+        <!-- \u0635: "ص" ARABIC LETTER SAD -->
         <Key
-            latin:keyLabel="ص" />
-        <!-- \u062b: ARABIC LETTER THEH -->
+            latin:keyLabel="\u0635" />
+        <!-- \u062b: "Ø«" ARABIC LETTER THEH -->
         <Key
-            latin:keyLabel="Ø«" />
-        <!-- \u0642: ARABIC LETTER QAF
-             \u06a8: ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+            latin:keyLabel="\u062b" />
+        <!-- \u0642: "Ù‚" ARABIC LETTER QAF
+             \u06a8: "Ú¨" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u06a8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="Ù‚"
-            latin:moreKeys="Ú¨" />
-        <!-- \u0641: ARABIC LETTER FEH
-             \u06a4: ARABIC LETTER VEH
-             \u06a2: ARABIC LETTER FEH WITH DOT MOVED BELOW
-             \u06a5: ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+            latin:keyLabel="\u0642"
+            latin:moreKeys="\u06a8" />
+        <!-- \u0641: "ف" ARABIC LETTER FEH
+             \u06a4: "Ú¤" ARABIC LETTER VEH
+             \u06a2: "Ú¢" ARABIC LETTER FEH WITH DOT MOVED BELOW
+             \u06a5: "Ú¥" ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u06a2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u06a5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
         <Key
-            latin:keyLabel="ف"
+            latin:keyLabel="\u0641"
             latin:moreKeys="\u06a4,\u06a2,\u06a5" />
-        <!-- \u063a: ARABIC LETTER GHAIN -->
+        <!-- \u063a: "غ" ARABIC LETTER GHAIN -->
         <Key
-            latin:keyLabel="غ" />
-        <!-- \u0639: ARABIC LETTER AIN -->
+            latin:keyLabel="\u063a" />
+        <!-- \u0639: "ع" ARABIC LETTER AIN -->
         <Key
-            latin:keyLabel="ع" />
-        <!-- \u0647: ARABIC LETTER HEH
-             \ufeeb: ARABIC LETTER HEH INITIAL FORM
-             \u0647\u0640: ARABIC LETTER HEH + Zero width joiner -->
+            latin:keyLabel="\u0639" />
+        <!-- \u0647: "Ù‡" ARABIC LETTER HEH
+             \ufeeb: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+             \u0647\u200d: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
         <Key
-            latin:keyLabel="Ù‡"
-            latin:moreKeys="\ufeeb|\u0647\u200D" />
-        <!-- \u062e: ARABIC LETTER KHAH -->
+            latin:keyLabel="\u0647"
+            latin:moreKeys="\ufeeb|\u0647\u200d" />
+        <!-- \u062e: "Ø®" ARABIC LETTER KHAH -->
         <Key
-            latin:keyLabel="Ø®" />
-        <!-- \u062d: ARABIC LETTER HAH -->
+            latin:keyLabel="\u062e" />
+        <!-- \u062d: "Ø­" ARABIC LETTER HAH -->
         <Key
-            latin:keyLabel="Ø­" />
-        <!-- \u062c: ARABIC LETTER JEEM
-             \u0686: ARABIC LETTER TCHEH -->
+            latin:keyLabel="\u062d" />
+        <!-- \u062c: "ج" ARABIC LETTER JEEM
+             \u0686: "Ú†" ARABIC LETTER TCHEH -->
         <Key
-            latin:keyLabel="ج"
-            latin:moreKeys="Ú†" />
+            latin:keyLabel="\u062c"
+            latin:moreKeys="\u0686" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-11.500%p"
@@ -86,63 +89,64 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="9.375%p" />
-        <!-- \u0634: ARABIC LETTER SHEEN
-             \u069c: ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- \u0634: "Ø´" ARABIC LETTER SHEEN
+             \u069c: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u069c ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="Ø´"
-            latin:moreKeys="ڜ" />
-        <!-- \u0633: ARABIC LETTER SEEN -->
+            latin:keyLabel="\u0634"
+            latin:moreKeys="\u069c" />
+        <!-- \u0633: "س" ARABIC LETTER SEEN -->
         <Key
-            latin:keyLabel="س" />
-        <!-- \u064a: ARABIC LETTER YEH
-             \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE
-             \u0649: ARABIC LETTER ALEF MAKSURA -->
+            latin:keyLabel="\u0633" />
+        <!-- \u064a: "ÙŠ" ARABIC LETTER YEH
+             \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+             \u0649: "Ù‰" ARABIC LETTER ALEF MAKSURA -->
         <Key
-            latin:keyLabel="ÙŠ"
+            latin:keyLabel="\u064a"
             latin:moreKeys="\u0626,\u0649" />
-        <!-- \u0628: ARABIC LETTER BEH
-             \u067e: ARABIC LETTER PEH -->
-        <Key
-            latin:keyLabel="ب"
-            latin:moreKeys="Ù¾" />
-        <!-- \u0644: ARABIC LETTER LAM
-             \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
-             \u0627: ARABIC LETTER ALEF
-             \ufef7: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
-             \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
-             \ufef9: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
-             \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
-             \ufef5: ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
-             \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
-        <Key
-            latin:keyLabel="Ù„"
+        <!-- \u0628: "ب" ARABIC LETTER BEH
+             \u067e: "Ù¾" ARABIC LETTER PEH -->
+        <Key
+            latin:keyLabel="\u0628"
+            latin:moreKeys="\u067e" />
+        <!-- \u0644: "Ù„" ARABIC LETTER LAM
+             \ufefb: "ï»»" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+             \u0627: "ا" ARABIC LETTER ALEF
+             \ufef7: "ï»·" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+             \u0623: "Ø£" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             \ufef9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+             \u0625: "Ø¥" ARABIC LETTER ALEF WITH HAMZA BELOW
+             \ufef5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+             \u0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+        <Key
+            latin:keyLabel="\u0644"
             latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
-        <!-- \u0627: ARABIC LETTER ALEF
-             \u0621: ARABIC LETTER HAMZA
-             \u0671: ARABIC LETTER ALEF WASLA
-             \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
-             \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
-             \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
-        <Key
-            latin:keyLabel="ا"
+        <!-- \u0627: "ا" ARABIC LETTER ALEF
+             \u0621: "Ø¡" ARABIC LETTER HAMZA
+             \u0671: "Ù±" ARABIC LETTER ALEF WASLA
+             \u0623: "Ø£" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             \u0625: "Ø¥" ARABIC LETTER ALEF WITH HAMZA BELOW
+             \u0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+        <Key
+            latin:keyLabel="\u0627"
             latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
-        <!-- \u062a: ARABIC LETTER TEH -->
+        <!-- \u062a: "ت" ARABIC LETTER TEH -->
         <Key
-            latin:keyLabel="ت" />
-        <!-- \u0646: ARABIC LETTER NOON -->
+            latin:keyLabel="\u062a" />
+        <!-- \u0646: "Ù†" ARABIC LETTER NOON -->
         <Key
-            latin:keyLabel="Ù†" />
-        <!-- \u0645: ARABIC LETTER MEEM -->
+            latin:keyLabel="\u0646" />
+        <!-- \u0645: "Ù…" ARABIC LETTER MEEM -->
         <Key
-            latin:keyLabel="Ù…" />
-        <!-- \u0643: ARABIC LETTER KAF
-             \u06af: ARABIC LETTER GAF -->
+            latin:keyLabel="\u0645" />
+        <!-- \u0643: "Ùƒ" ARABIC LETTER KAF
+             \u06af: "Ú¯" ARABIC LETTER GAF -->
         <Key
-            latin:keyLabel="Ùƒ"
-            latin:moreKeys="Ú¯" />
-        <!-- \u0637: ARABIC LETTER TAH -->
+            latin:keyLabel="\u0643"
+            latin:moreKeys="\u06af" />
+        <!-- \u0637: "Ø·" ARABIC LETTER TAH -->
         <Key
-            latin:keyLabel="Ø·" />
+            latin:keyLabel="\u0637" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-9.375%p"
@@ -151,42 +155,42 @@
     <Row
         latin:keyWidth="7.375%p"
     >
-        <!-- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE -->
+        <!-- \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="ئ"
+            latin:keyLabel="\u0626"
             latin:keyXPos="12.750%p" />
-        <!-- \u0621: ARABIC LETTER HAMZA -->
+        <!-- \u0621: "Ø¡" ARABIC LETTER HAMZA -->
         <Key
-            latin:keyLabel="Ø¡" />
-        <!-- \u0624: ARABIC LETTER WAW WITH HAMZA ABOVE -->
+            latin:keyLabel="\u0621" />
+        <!-- \u0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="ؤ" />
-        <!-- \u0631: ARABIC LETTER REH -->
+            latin:keyLabel="\u0624" />
+        <!-- \u0631: "ر" ARABIC LETTER REH -->
         <Key
-            latin:keyLabel="ر" />
-        <!-- \u0630: ARABIC LETTER THAL -->
+            latin:keyLabel="\u0631" />
+        <!-- \u0630: "Ø°" ARABIC LETTER THAL -->
         <Key
-            latin:keyLabel="Ø°" />
-        <!-- \u0649: ARABIC LETTER ALEF MAKSURA -->
+            latin:keyLabel="\u0630" />
+        <!-- \u0649: "Ù‰" ARABIC LETTER ALEF MAKSURA -->
         <Key
-            latin:keyLabel="Ù‰" />
-        <!-- \u0629: ARABIC LETTER TEH MARBUTA -->
+            latin:keyLabel="\u0649" />
+        <!-- \u0629: "Ø©" ARABIC LETTER TEH MARBUTA -->
         <Key
-            latin:keyLabel="Ø©" />
-        <!-- \u0648: ARABIC LETTER WAW -->
+            latin:keyLabel="\u0629" />
+        <!-- \u0648: "Ùˆ" ARABIC LETTER WAW -->
         <Key
-            latin:keyLabel="Ùˆ" />
-        <!-- \u0632: ARABIC LETTER ZAIN
-             \u0698: ARABIC LETTER JEH -->
+            latin:keyLabel="\u0648" />
+        <!-- \u0632: "ز" ARABIC LETTER ZAIN
+             \u0698: "Ú˜" ARABIC LETTER JEH -->
         <Key
-            latin:keyLabel="ز"
-            latin:moreKeys="Ú˜" />
-        <!-- \u0638: ARABIC LETTER ZAH -->
+            latin:keyLabel="\u0632"
+            latin:moreKeys="\u0698" />
+        <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
         <Key
-            latin:keyLabel="ظ" />
-        <!-- \u062f: ARABIC LETTER DAL -->
+            latin:keyLabel="\u0638" />
+        <!-- \u062f: "د" ARABIC LETTER DAL -->
         <Key
-            latin:keyLabel="د" />
+            latin:keyLabel="\u062f" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw768dp/rows_bulgarian.xml b/java/res/xml-sw768dp/rows_bulgarian.xml
index d67a0d1fab..844744eee0 100644
--- a/java/res/xml-sw768dp/rows_bulgarian.xml
+++ b/java/res/xml-sw768dp/rows_bulgarian.xml
@@ -29,29 +29,40 @@
         <Key
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft" />
+        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="ч" />
+            latin:keyLabel="\u0447" />
+        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="ш" />
+            latin:keyLabel="\u0448" />
+        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="е" />
+            latin:keyLabel="\u0435" />
+        <!-- \u0440: "Ñ€" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="Ñ€" />
+            latin:keyLabel="\u0440" />
+        <!-- \u0442: "Ñ‚" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="Ñ‚" />
+            latin:keyLabel="\u0442" />
+        <!-- \u044a: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="ÑŠ" />
+            latin:keyLabel="\u044a" />
+        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="у" />
+            latin:keyLabel="\u0443" />
+        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
         <Key
-            latin:keyLabel="и"
+            latin:keyLabel="\u0438"
             latin:moreKeys="ѝ" />
+        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="о" />
+            latin:keyLabel="\u043e" />
+        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="п" />
+            latin:keyLabel="\u043f" />
+        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="я" />
+            latin:keyLabel="\u044f" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -63,28 +74,39 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="9.375%p" />
+        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="а" />
+            latin:keyLabel="\u0430" />
+        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="с" />
+            latin:keyLabel="\u0441" />
+        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="д" />
+            latin:keyLabel="\u0434" />
+        <!-- \u0444: "Ñ„" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="Ñ„" />
+            latin:keyLabel="\u0444" />
+        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="г" />
+            latin:keyLabel="\u0433" />
+        <!-- \u0445: "Ñ…" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="Ñ…" />
+            latin:keyLabel="\u0445" />
+        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="й" />
+            latin:keyLabel="\u0439" />
+        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="к" />
+            latin:keyLabel="\u043a" />
+        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="л" />
+            latin:keyLabel="\u043b" />
+        <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
         <Key
-            latin:keyLabel="щ" />
+            latin:keyLabel="\u0449" />
+        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="ь" />
+            latin:keyLabel="\u044c" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -95,22 +117,30 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="14.375%p" />
+        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="з" />
+            latin:keyLabel="\u0437" />
+        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="ж" />
+            latin:keyLabel="\u0436" />
+        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="ц" />
+            latin:keyLabel="\u0446" />
+        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="в" />
+            latin:keyLabel="\u0432" />
+        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="б" />
+            latin:keyLabel="\u0431" />
+        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="н" />
+            latin:keyLabel="\u043d" />
+        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="м" />
+            latin:keyLabel="\u043c" />
+        <!-- \u044e: "ÑŽ" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="ÑŽ" />
+            latin:keyLabel="\u044e" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
diff --git a/java/res/xml-sw768dp/rows_hebrew.xml b/java/res/xml-sw768dp/rows_hebrew.xml
index 61c5eae909..a2090ae484 100644
--- a/java/res/xml-sw768dp/rows_hebrew.xml
+++ b/java/res/xml-sw768dp/rows_hebrew.xml
@@ -32,22 +32,30 @@
             latin:keyWidth="7.969%p" />
         <include
             latin:keyboardLayout="@xml/keys_apostrophe_dash" />
+        <!-- \u05e7: "ק" HEBREW LETTER QOF -->
         <Key
-            latin:keyLabel="ק" />
+            latin:keyLabel="\u05e7" />
+        <!-- \u05e8: "ר" HEBREW LETTER RESH -->
         <Key
-            latin:keyLabel="ר" />
+            latin:keyLabel="\u05e8" />
+        <!-- \u05d0: "א" HEBREW LETTER ALEF -->
         <Key
-            latin:keyLabel="א" />
+            latin:keyLabel="\u05d0" />
+        <!-- \u05d8: "ט" HEBREW LETTER TET -->
         <Key
-            latin:keyLabel="ט" />
+            latin:keyLabel="\u05d8" />
+        <!-- \u05d5: "ו" HEBREW LETTER VAV -->
         <Key
-            latin:keyLabel="ו" />
+            latin:keyLabel="\u05d5" />
+        <!-- \u05df: "ן" HEBREW LETTER FINAL NUN -->
         <Key
-            latin:keyLabel="ן" />
+            latin:keyLabel="\u05df" />
+        <!-- \u05dd: "ם" HEBREW LETTER FINAL MEM -->
         <Key
-            latin:keyLabel="ם" />
+            latin:keyLabel="\u05dd" />
+        <!-- \u05e4: "פ" HEBREW LETTER PE -->
         <Key
-            latin:keyLabel="פ" />
+            latin:keyLabel="\u05e4" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-12.000%p"
@@ -60,55 +68,74 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="11.172%p" />
+        <!-- \u05e9: "ש" HEBREW LETTER SHIN -->
         <Key
-            latin:keyLabel="ש" />
+            latin:keyLabel="\u05e9" />
+        <!-- \u05d3: "ד" HEBREW LETTER DALET -->
         <Key
-            latin:keyLabel="ד" />
+            latin:keyLabel="\u05d3" />
+        <!-- \u05d2: "×’" HEBREW LETTER GIMEL -->
         <Key
-            latin:keyLabel="×’"
+            latin:keyLabel="\u05d2"
             latin:moreKeys="ג׳" />
+        <!-- \u05db: "×›" HEBREW LETTER KAF -->
         <Key
-            latin:keyLabel="×›" />
+            latin:keyLabel="\u05db" />
+        <!-- \u05e2: "×¢" HEBREW LETTER AYIN -->
         <Key
-            latin:keyLabel="×¢" />
+            latin:keyLabel="\u05e2" />
+        <!-- \u05d9: "×™" HEBREW LETTER YOD -->
         <Key
-            latin:keyLabel="×™"
+            latin:keyLabel="\u05d9"
             latin:moreKeys="ײַ" />
+        <!-- \u05d7: "×—" HEBREW LETTER HET -->
         <Key
-            latin:keyLabel="×—"
+            latin:keyLabel="\u05d7"
             latin:moreKeys="ח׳" />
+        <!-- \u05dc: "ל" HEBREW LETTER LAMED -->
         <Key
-            latin:keyLabel="ל" />
+            latin:keyLabel="\u05dc" />
+        <!-- \u05da: "ך" HEBREW LETTER FINAL KAF -->
         <Key
-            latin:keyLabel="ך" />
+            latin:keyLabel="\u05da" />
+        <!-- \u05e3: "×£" HEBREW LETTER FINAL PE -->
         <Key
-            latin:keyLabel="×£" />
+            latin:keyLabel="\u05e3" />
     </Row>
     <Row
         latin:keyWidth="8.047%p"
     >
+        <!-- \u05d6: "×–" HEBREW LETTER ZAYIN -->
         <Key
-            latin:keyLabel="×–"
+            latin:keyLabel="\u05d6"
             latin:moreKeys="ז׳"
             latin:keyXPos="13.829%p" />
+        <!-- \u05e1: "ס" HEBREW LETTER SAMEKH -->
         <Key
-            latin:keyLabel="ס" />
+            latin:keyLabel="\u05e1" />
+        <!-- \u05d1: "ב" HEBREW LETTER BET -->
         <Key
-            latin:keyLabel="ב" />
+            latin:keyLabel="\u05d1" />
+        <!-- \u05d4: "×”" HEBREW LETTER HE -->
         <Key
-            latin:keyLabel="×”" />
+            latin:keyLabel="\u05d4" />
+        <!-- \u05e0: "× " HEBREW LETTER NUN -->
         <Key
-            latin:keyLabel="× " />
+            latin:keyLabel="\u05e0" />
+        <!-- \u05de: "מ" HEBREW LETTER MEM -->
         <Key
-            latin:keyLabel="מ" />
+            latin:keyLabel="\u05de" />
+        <!-- \u05e6: "צ" HEBREW LETTER TSADI -->
         <Key
-            latin:keyLabel="צ"
+            latin:keyLabel="\u05e6"
             latin:moreKeys="צ׳" />
+        <!-- \u05ea: "ת" HEBREW LETTER TAV -->
         <Key
-            latin:keyLabel="ת"
+            latin:keyLabel="\u05ea"
             latin:moreKeys="ת׳" />
+        <!-- \u05e5: "×¥" HEBREW LETTER FINAL TSADI -->
         <Key
-            latin:keyLabel="×¥"
+            latin:keyLabel="\u05e5"
             latin:moreKeys="ץ׳" />
         <Key
             latin:keyStyle="enterKeyStyle"
diff --git a/java/res/xml-sw768dp/rows_serbian.xml b/java/res/xml-sw768dp/rows_serbian.xml
index 6659755830..89556ddbdf 100644
--- a/java/res/xml-sw768dp/rows_serbian.xml
+++ b/java/res/xml-sw768dp/rows_serbian.xml
@@ -29,32 +29,45 @@
         <Key
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft" />
+        <!-- \u0459: "Ñ™" CYRILLIC SMALL LETTER LJE -->
         <Key
-            latin:keyLabel="Ñ™" />
+            latin:keyLabel="\u0459" />
+        <!-- \u045a: "Ñš" CYRILLIC SMALL LETTER NJE -->
         <Key
-            latin:keyLabel="Ñš" />
+            latin:keyLabel="\u045a" />
+        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="е" />
+            latin:keyLabel="\u0435" />
+        <!-- \u0440: "Ñ€" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="Ñ€" />
+            latin:keyLabel="\u0440" />
+        <!-- \u0442: "Ñ‚" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="Ñ‚" />
+            latin:keyLabel="\u0442" />
+        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="з" />
+            latin:keyLabel="\u0437" />
+        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="у" />
+            latin:keyLabel="\u0443" />
+        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
         <Key
-            latin:keyLabel="и" />
+            latin:keyLabel="\u0438" />
+        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="о" />
+            latin:keyLabel="\u043e" />
+        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="п" />
+            latin:keyLabel="\u043f" />
+        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="ш" />
+            latin:keyLabel="\u0448" />
+        <!-- \u0452: "Ñ’" CYRILLIC SMALL LETTER DJE -->
         <Key
-            latin:keyLabel="Ñ’" />
+            latin:keyLabel="\u0452" />
+        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="ж"
+            latin:keyLabel="\u0436"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -64,28 +77,39 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="11.172%p" />
+        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="а" />
+            latin:keyLabel="\u0430" />
+        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="с" />
+            latin:keyLabel="\u0441" />
+        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="д" />
+            latin:keyLabel="\u0434" />
+        <!-- \u0444: "Ñ„" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="Ñ„" />
+            latin:keyLabel="\u0444" />
+        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="г" />
+            latin:keyLabel="\u0433" />
+        <!-- \u0445: "Ñ…" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="Ñ…" />
+            latin:keyLabel="\u0445" />
+        <!-- \u0458: "ј" CYRILLIC SMALL LETTER JE -->
         <Key
-            latin:keyLabel="ј" />
+            latin:keyLabel="\u0458" />
+        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="к" />
+            latin:keyLabel="\u043a" />
+        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="л" />
+            latin:keyLabel="\u043b" />
+        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="ч" />
+            latin:keyLabel="\u0447" />
+        <!-- \u045b: "Ñ›" CYRILLIC SMALL LETTER TSHE -->
         <Key
-            latin:keyLabel="Ñ›" />
+            latin:keyLabel="\u045b" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-9.219%p"
@@ -97,20 +121,27 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="13.829%p" />
+        <!-- \u0455: "Ñ•" CYRILLIC SMALL LETTER DZE -->
         <Key
-            latin:keyLabel="Ñ•" />
+            latin:keyLabel="\u0455" />
+        <!-- \u045f: "ÑŸ" CYRILLIC SMALL LETTER DZHE -->
         <Key
-            latin:keyLabel="ÑŸ" />
+            latin:keyLabel="\u045f" />
+        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="ц" />
+            latin:keyLabel="\u0446" />
+        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="в" />
+            latin:keyLabel="\u0432" />
+        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="б" />
+            latin:keyLabel="\u0431" />
+        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="н" />
+            latin:keyLabel="\u043d" />
+        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="м" />
+            latin:keyLabel="\u043c" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
diff --git a/java/res/xml-sw768dp/rows_slavic.xml b/java/res/xml-sw768dp/rows_slavic.xml
index 58d5a75fc1..deca884d28 100644
--- a/java/res/xml-sw768dp/rows_slavic.xml
+++ b/java/res/xml-sw768dp/rows_slavic.xml
@@ -29,33 +29,44 @@
         <Key
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft" />
+        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="й" />
+            latin:keyLabel="\u0439" />
+        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="ц" />
+            latin:keyLabel="\u0446" />
+        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="у"
+            latin:keyLabel="\u0443"
             latin:moreKeys="@string/more_keys_for_slavic_u" />
+        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="к" />
+            latin:keyLabel="\u043a" />
+        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="е"
+            latin:keyLabel="\u0435"
             latin:moreKeys="@string/more_keys_for_slavic_ye" />
+        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="н"
+            latin:keyLabel="\u043d"
             latin:moreKeys="@string/more_keys_for_slavic_en" />
+        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="г" />
+            latin:keyLabel="\u0433" />
+        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="ш" />
+            latin:keyLabel="\u0448" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_shcha" />
+        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="з" />
+            latin:keyLabel="\u0437" />
+        <!-- \u0445: "Ñ…" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="Ñ…" />
+            latin:keyLabel="\u0445" />
+        <!-- \u044a: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="ÑŠ" />
+            latin:keyLabel="\u044a" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -67,30 +78,40 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="9.375%p" />
+        <!-- \u0444: "Ñ„" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="Ñ„" />
+            latin:keyLabel="\u0444" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_yery"
             latin:moreKeys="@string/more_keys_for_slavic_yery" />
+        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="в" />
+            latin:keyLabel="\u0432" />
+        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="а" />
+            latin:keyLabel="\u0430" />
+        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="п" />
+            latin:keyLabel="\u043f" />
+        <!-- \u0440: "Ñ€" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="Ñ€" />
+            latin:keyLabel="\u0440" />
+        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="о"
+            latin:keyLabel="\u043e"
             latin:moreKeys="@string/more_keys_for_slavic_o" />
+        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="л" />
+            latin:keyLabel="\u043b" />
+        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="д" />
+            latin:keyLabel="\u0434" />
+        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="ж" />
+            latin:keyLabel="\u0436" />
+        <!-- \u044d: "э" CYRILLIC SMALL LETTER E -->
         <Key
-            latin:keyLabel="э" />
+            latin:keyLabel="\u044d" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-9.375%p"
@@ -102,24 +123,32 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="12.750%p" />
+        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="я" />
+            latin:keyLabel="\u044f" />
+        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="ч" />
+            latin:keyLabel="\u0447" />
+        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="с" />
+            latin:keyLabel="\u0441" />
+        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="м" />
+            latin:keyLabel="\u043c" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_i" />
+        <!-- \u0442: "Ñ‚" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="Ñ‚" />
+            latin:keyLabel="\u0442" />
+        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="ь" />
+            latin:keyLabel="\u044c" />
+        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="б" />
+            latin:keyLabel="\u0431" />
+        <!-- \u044e: "ÑŽ" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="ÑŽ" />
+            latin:keyLabel="\u044e" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
diff --git a/java/res/xml-sw768dp/rows_spanish.xml b/java/res/xml-sw768dp/rows_spanish.xml
index 864c435a20..210c38d860 100644
--- a/java/res/xml-sw768dp/rows_spanish.xml
+++ b/java/res/xml-sw768dp/rows_spanish.xml
@@ -56,8 +56,9 @@
         <Key
             latin:keyLabel="l"
             latin:moreKeys="@string/more_keys_for_l" />
+        <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
         <Key
-            latin:keyLabel="ñ" />
+            latin:keyLabel="\u00f1" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-15.704%p"
diff --git a/java/res/xml-sw768dp/rows_symbols_shift.xml b/java/res/xml-sw768dp/rows_symbols_shift.xml
index e88f78633c..ced62f3836 100644
--- a/java/res/xml-sw768dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw768dp/rows_symbols_shift.xml
@@ -38,23 +38,32 @@
             latin:keyLabel="`" />
         <Key
             latin:keyLabel="|" />
+        <!-- \u2022: "•" BULLET -->
         <Key
-            latin:keyLabel="•"
+            latin:keyLabel="\u2022"
             latin:moreKeys="@string/more_keys_for_bullet" />
+        <!-- \u221a: "√" SQUARE ROOT -->
         <Key
-            latin:keyLabel="√" />
+            latin:keyLabel="\u221a" />
+        <!-- \u03c0: "Ï€" GREEK SMALL LETTER PI
+             \u03a0: "Π" GREEK CAPITAL LETTER PI -->
         <Key
-            latin:keyLabel="Ï€"
-            latin:moreKeys="Π" />
+            latin:keyLabel="\u03c0"
+            latin:moreKeys="\u03a0" />
+        <!-- \u00f7: "÷" DIVISION SIGN -->
         <Key
-            latin:keyLabel="÷" />
+            latin:keyLabel="\u00f7" />
+        <!-- \u00d7: "×" MULTIPLICATION SIGN -->
         <Key
-            latin:keyLabel="×" />
+            latin:keyLabel="\u00d7" />
+        <!-- \u00a7: "§" SECTION SIGN
+             \u00b6: "¶" PILCROW SIGN -->
         <Key
-            latin:keyLabel="§"
-            latin:moreKeys="¶" />
+            latin:keyLabel="\u00a7"
+            latin:moreKeys="\u00b6" />
+        <!-- \u0394: "Δ" GREEK CAPITAL LETTER DELTA -->
         <Key
-            latin:keyLabel="Δ" />
+            latin:keyLabel="\u0394" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-9.219%p"
@@ -75,15 +84,24 @@
             latin:keyStyle="moreCurrency3KeyStyle" />
         <Key
             latin:keyStyle="moreCurrency4KeyStyle" />
+        <!-- \u2191: "↑" UPWARDS ARROW
+             \u2193: "↓" DOWNWARDS ARROW
+             \u2190: "←" LEFTWARDS ARROW
+             \u2192: "→" RIGHTWARDS ARROW -->
         <Key
             latin:keyLabel="^"
-            latin:moreKeys="↑,↓,←,→" />
-        <Key
-            latin:keyLabel="°"
-            latin:moreKeys="′,″" />
-        <Key
-            latin:keyLabel="±"
-            latin:moreKeys="∞" />
+            latin:moreKeys="\u2191,\u2193,\u2190,\u2192" />
+        <!-- \u00b0: "°" DEGREE SIGN
+             \u2032: "′" PRIME
+             \u2033: "″" DOUBLE PRIME -->
+        <Key
+            latin:keyLabel="\u00b0"
+            latin:moreKeys="\u2032,\u2033" />
+        <!-- \u00b1: "±" PLUS-MINUS SIGN
+             \u221e: "∞" INFINITY -->
+        <Key
+            latin:keyLabel="\u00b1"
+            latin:moreKeys="\u221e" />
         <include
             latin:keyboardLayout="@xml/keys_curly_brackets" />
         <Key
@@ -99,20 +117,26 @@
             latin:keyWidth="13.829%p" />
         <Key
             latin:keyLabel="\\" />
+        <!-- \u00a9: "©" COPYRIGHT SIGN -->
         <Key
-            latin:keyLabel="©" />
+            latin:keyLabel="\u00a9" />
+        <!-- \u00ae: "®" REGISTERED SIGN -->
         <Key
-            latin:keyLabel="®" />
+            latin:keyLabel="\u00ae" />
+        <!-- \u2122: "â„¢" TRADE MARK SIGN -->
         <Key
-            latin:keyLabel="â„¢" />
+            latin:keyLabel="\u2122" />
+        <!-- \u2105: "â„…" CARE OF -->
         <Key
-            latin:keyLabel="â„…" />
+            latin:keyLabel="\u2105" />
         <include
             latin:keyboardLayout="@xml/keys_square_brackets" />
+        <!-- \u00a1: "¡" INVERTED EXCLAMATION MARK -->
         <Key
-            latin:keyLabel="¡" />
+            latin:keyLabel="\u00a1" />
+        <!-- \u00bf: "¿" INVERTED QUESTION MARK -->
         <Key
-            latin:keyLabel="¿" />
+            latin:keyLabel="\u00bf" />
         <Key
             latin:keyStyle="backFromMoreSymbolKeyStyle"
             latin:keyXPos="-13.750%p"
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index dd13b7175a..78d5d02974 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -35,14 +35,16 @@
                 <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
                     <!-- latin:keyLabelFlags="hasPopupHint" -->
                     <!-- latin:moreKeys="‟" -->
+                <!-- \u201e: "„" DOUBLE LOW-9 QUOTATION MARK -->
                 <Key
-                    latin:keyLabel="„"
+                    latin:keyLabel="\u201e"
                     latin:backgroundType="functional" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="50%p" />
+                <!-- \u2026: "…" HORIZONTAL ELLIPSIS -->
                 <Key
-                    latin:keyLabel="…"
+                    latin:keyLabel="\u2026"
                     latin:backgroundType="functional" />
                 <Key
                     latin:keyStyle="enterKeyStyle"
@@ -58,15 +60,17 @@
                 <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
                     <!-- latin:keyLabelFlags="hasPopupHint" -->
                     <!-- latin:moreKeys="‟" -->
+                <!-- \u201e: "„" DOUBLE LOW-9 QUOTATION MARK -->
                 <Key
-                    latin:keyLabel="„"
+                    latin:keyLabel="\u201e"
                     latin:keyWidth="9.2%p"
                     latin:backgroundType="functional" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="35.83%p" />
+                <!-- \u2026: "…" HORIZONTAL ELLIPSIS -->
                 <Key
-                    latin:keyLabel="…"
+                    latin:keyLabel="\u2026"
                     latin:keyWidth="9.2%p"
                     latin:backgroundType="functional" />
                 <Key
diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml
index 2dcd831c2f..449b240418 100644
--- a/java/res/xml/rows_arabic.xml
+++ b/java/res/xml/rows_arabic.xml
@@ -26,163 +26,177 @@
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u0636: ARABIC LETTER DAD -->
+        <!-- \u0636: "ض" ARABIC LETTER DAD
+             \u0661: "Ù¡" ARABIC-INDIC DIGIT ONE -->
         <Key
-            latin:keyLabel="ض"
+            latin:keyLabel="\u0636"
             latin:keyHintLabel="1"
-            latin:additionalMoreKeys="1,Ù¡" />
-        <!-- \u0635: ARABIC LETTER SAD -->
+            latin:additionalMoreKeys="1,\u0661" />
+        <!-- \u0635: "ص" ARABIC LETTER SAD
+             \u0662: "Ù¢" ARABIC-INDIC DIGIT TWO -->
         <Key
-            latin:keyLabel="ص"
+            latin:keyLabel="\u0635"
             latin:keyHintLabel="2"
-            latin:additionalMoreKeys="2,Ù¢" />
-        <!-- \u0642: ARABIC LETTER QAF
-             \u06a8: ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+            latin:additionalMoreKeys="2,\u0662" />
+        <!-- \u0642: "Ù‚" ARABIC LETTER QAF
+             \u06a8: "Ú¨" ARABIC LETTER QAF WITH THREE DOTS ABOVE
+             \u0663: "Ù£" ARABIC-INDIC DIGIT THREE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u06a8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="Ù‚"
+            latin:keyLabel="\u0642"
             latin:keyHintLabel="3"
-            latin:additionalMoreKeys="3,Ù£"
+            latin:additionalMoreKeys="3,\u0663"
             latin:moreKeys="\u06a8" />
-        <!-- \u0641: ARABIC LETTER FEH
-             \u06a4: ARABIC LETTER VEH
-             \u06a2: ARABIC LETTER FEH WITH DOT MOVED BELOW
-             \u06a5: ARABIC LETTER FEH WITH THREE DOTS BELOW -->
-        <Key
-            latin:keyLabel="ف"
+        <!-- \u0641: "ف" ARABIC LETTER FEH
+             \u06a4: "Ú¤" ARABIC LETTER VEH
+             \u06a2: "Ú¢" ARABIC LETTER FEH WITH DOT MOVED BELOW
+             \u06a5: "Ú¥" ARABIC LETTER FEH WITH THREE DOTS BELOW
+             \u0664: "Ù¤" ARABIC-INDIC DIGIT FOUR -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u06a2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u06a5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+        <Key
+            latin:keyLabel="\u0641"
             latin:keyHintLabel="4"
-            latin:additionalMoreKeys="4,Ù¤"
+            latin:additionalMoreKeys="4,\u0664"
             latin:moreKeys="\u06a4,\u06a2,\u06a5" />
-        <!-- \u063a: ARABIC LETTER GHAIN -->
+        <!-- \u063a: "غ" ARABIC LETTER GHAIN
+             \u0665: "Ù¥" ARABIC-INDIC DIGIT FIVE -->
         <Key
-            latin:keyLabel="غ"
+            latin:keyLabel="\u063a"
             latin:keyHintLabel="5"
-            latin:additionalMoreKeys="5,Ù¥" />
-        <!-- \u0639: ARABIC LETTER AIN -->
+            latin:additionalMoreKeys="5,\u0665" />
+        <!-- \u0639: "ع" ARABIC LETTER AIN
+             \u0666: "Ù¦" ARABIC-INDIC DIGIT SIX -->
         <Key
-            latin:keyLabel="ع"
+            latin:keyLabel="\u0639"
             latin:keyHintLabel="6"
-            latin:additionalMoreKeys="6,Ù¦" />
-        <!-- \u0647: ARABIC LETTER HEH
-             \ufeeb: ARABIC LETTER HEH INITIAL FORM
-             \u0647\u0640: ARABIC LETTER HEH + Zero width joiner -->
+            latin:additionalMoreKeys="6,\u0666" />
+        <!-- \u0647: "Ù‡" ARABIC LETTER HEH
+             \ufeeb: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+             \u0647\u200d: ARABIC LETTER HEH + ZERO WIDTH JOINER
+             \u0667: "Ù§" ARABIC-INDIC DIGIT SEVEN -->
         <Key
-            latin:keyLabel="Ù‡"
+            latin:keyLabel="\u0647"
             latin:keyHintLabel="7"
-            latin:additionalMoreKeys="7,Ù§"
-            latin:moreKeys="\ufeeb|\u0647\u200D" />
-        <!-- \u062e: ARABIC LETTER KHAH -->
+            latin:additionalMoreKeys="7,\u0667"
+            latin:moreKeys="\ufeeb|\u0647\u200d" />
+        <!-- \u062e: "Ø®" ARABIC LETTER KHAH
+             \u0668: "Ù¨" ARABIC-INDIC DIGIT EIGHT -->
         <Key
-            latin:keyLabel="Ø®"
+            latin:keyLabel="\u062e"
             latin:keyHintLabel="8"
-            latin:additionalMoreKeys="8,Ù¨" />
-        <!-- \u062d: ARABIC LETTER HAH -->
+            latin:additionalMoreKeys="8,\u0668" />
+        <!-- \u062d: "Ø­" ARABIC LETTER HAH
+             \u0669: "Ù©" ARABIC-INDIC DIGIT NINE -->
         <Key
-            latin:keyLabel="Ø­"
+            latin:keyLabel="\u062d"
             latin:keyHintLabel="9"
-            latin:additionalMoreKeys="9,Ù©" />
-        <!-- \u062c: ARABIC LETTER JEEM
-             \u0686: ARABIC LETTER TCHEH -->
+            latin:additionalMoreKeys="9,\u0669" />
+        <!-- \u062c: "ج" ARABIC LETTER JEEM
+             \u0686: "Ú†" ARABIC LETTER TCHEH
+             \u0660: "Ù " ARABIC-INDIC DIGIT ZERO -->
         <Key
-            latin:keyLabel="ج"
+            latin:keyLabel="\u062c"
             latin:keyHintLabel="0"
-            latin:additionalMoreKeys="0,Ù "
+            latin:additionalMoreKeys="0,\u0660"
             latin:moreKeys="\u0686"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u0634: ARABIC LETTER SHEEN
-             \u069c: ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- \u0634: "Ø´" ARABIC LETTER SHEEN
+             \u069c: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of \u069c ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="Ø´"
-            latin:moreKeys="ڜ" />
-        <!-- \u0633: ARABIC LETTER SEEN -->
+            latin:keyLabel="\u0634"
+            latin:moreKeys="\u069c" />
+        <!-- \u0633: "س" ARABIC LETTER SEEN -->
         <Key
-            latin:keyLabel="س" />
-        <!-- \u064a: ARABIC LETTER YEH
-             \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE
-             \u0649: ARABIC LETTER ALEF MAKSURA -->
+            latin:keyLabel="\u0633" />
+        <!-- \u064a: "ÙŠ" ARABIC LETTER YEH
+             \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+             \u0649: "Ù‰" ARABIC LETTER ALEF MAKSURA -->
         <Key
-            latin:keyLabel="ÙŠ"
+            latin:keyLabel="\u064a"
             latin:moreKeys="\u0626,\u0649" />
-        <!-- \u0628: ARABIC LETTER BEH
-             \u067e: ARABIC LETTER PEH -->
-        <Key
-            latin:keyLabel="ب"
-            latin:moreKeys="Ù¾" />
-        <!-- \u0644: ARABIC LETTER LAM
-             \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
-             \u0627: ARABIC LETTER ALEF
-             \ufef7: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
-             \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
-             \ufef9: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
-             \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
-             \ufef5: ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
-             \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
-        <Key
-            latin:keyLabel="Ù„"
+        <!-- \u0628: "ب" ARABIC LETTER BEH
+             \u067e: "Ù¾" ARABIC LETTER PEH -->
+        <Key
+            latin:keyLabel="\u0628"
+            latin:moreKeys="\u067e" />
+        <!-- \u0644: "Ù„" ARABIC LETTER LAM
+             \ufefb: "ï»»" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+             \u0627: "ا" ARABIC LETTER ALEF
+             \ufef7: "ï»·" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+             \u0623: "Ø£" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             \ufef9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+             \u0625: "Ø¥" ARABIC LETTER ALEF WITH HAMZA BELOW
+             \ufef5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+             \u0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+        <Key
+            latin:keyLabel="\u0644"
             latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
-        <!-- \u0627: ARABIC LETTER ALEF
-             \u0621: ARABIC LETTER HAMZA
-             \u0671: ARABIC LETTER ALEF WASLA
-             \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
-             \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
-             \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
-        <Key
-            latin:keyLabel="ا"
+        <!-- \u0627: "ا" ARABIC LETTER ALEF
+             \u0621: "Ø¡" ARABIC LETTER HAMZA
+             \u0671: "Ù±" ARABIC LETTER ALEF WASLA
+             \u0623: "Ø£" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             \u0625: "Ø¥" ARABIC LETTER ALEF WITH HAMZA BELOW
+             \u0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+        <Key
+            latin:keyLabel="\u0627"
             latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
-        <!-- \u062a: ARABIC LETTER TEH
-             \u062b: ARABIC LETTER THEH -->
+        <!-- \u062a: "ت" ARABIC LETTER TEH
+             \u062b: "ﺙ" ARABIC LETTER THEH -->
         <Key
-            latin:keyLabel="ت"
-            latin:moreKeys="Ø«" />
-        <!-- \u0646: ARABIC LETTER NOON -->
+            latin:keyLabel="\u062a"
+            latin:moreKeys="\u062b" />
+        <!-- \u0646: "Ù†" ARABIC LETTER NOON -->
         <Key
-            latin:keyLabel="Ù†" />
-        <!-- \u0645: ARABIC LETTER MEEM -->
+            latin:keyLabel="\u0646" />
+        <!-- \u0645: "Ù…" ARABIC LETTER MEEM -->
         <Key
-            latin:keyLabel="Ù…" />
-        <!-- \u0643: ARABIC LETTER KAF
-             \u06af: ARABIC LETTER GAF
-             \u06a9: ARABIC LETTER KEHEH -->
+            latin:keyLabel="\u0645" />
+        <!-- \u0643: "Ùƒ" ARABIC LETTER KAF
+             \u06af: "Ú¯" ARABIC LETTER GAF
+             \u06a9: "Ú©" ARABIC LETTER KEHEH -->
         <Key
-            latin:keyLabel="Ùƒ"
+            latin:keyLabel="\u0643"
             latin:moreKeys="\u06af,\u06a9"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u0638: ARABIC LETTER ZAH -->
+        <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
         <Key
-            latin:keyLabel="ظ"
+            latin:keyLabel="\u0638"
             latin:keyXPos="5.0%p" />
-        <!-- \u0637: ARABIC LETTER TAH -->
+        <!-- \u0637: "Ø·" ARABIC LETTER TAH -->
         <Key
-            latin:keyLabel="Ø·" />
-        <!-- \u0630: ARABIC LETTER THAL -->
+            latin:keyLabel="\u0637" />
+        <!-- \u0630: "Ø°" ARABIC LETTER THAL -->
         <Key
-            latin:keyLabel="Ø°" />
-        <!-- \u062f: ARABIC LETTER DAL -->
+            latin:keyLabel="\u0630" />
+        <!-- \u062f: "د" ARABIC LETTER DAL -->
         <Key
-            latin:keyLabel="د" />
-        <!-- \u0632: ARABIC LETTER ZAIN
-             \u0698: ARABIC LETTER JEH -->
+            latin:keyLabel="\u062f" />
+        <!-- \u0632: "ز" ARABIC LETTER ZAIN
+             \u0698: "Ú˜" ARABIC LETTER JEH -->
         <Key
-            latin:keyLabel="ز"
-            latin:moreKeys="Ú˜" />
-        <!-- \u0631: ARABIC LETTER REH -->
+            latin:keyLabel="\u0632"
+            latin:moreKeys="\u0698" />
+        <!-- \u0631: "ر" ARABIC LETTER REH -->
         <Key
-            latin:keyLabel="ر" />
-        <!-- \u0629: ARABIC LETTER TEH MARBUTA -->
+            latin:keyLabel="\u0631" />
+        <!-- \u0629: "Ø©" ARABIC LETTER TEH MARBUTA -->
         <Key
-            latin:keyLabel="Ø©" />
-        <!-- \u0648: ARABIC LETTER WAW
-             \u0624: ARABIC LETTER WAW WITH HAMZA ABOVE -->
+            latin:keyLabel="\u0629" />
+        <!-- \u0648: "Ùˆ" ARABIC LETTER WAW
+             \u0624: "ﺅ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="Ùˆ"
-            latin:moreKeys="ؤ" />
+            latin:keyLabel="\u0648"
+            latin:moreKeys="\u0624" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
diff --git a/java/res/xml/rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
index 2eac93a7e7..3a8da0485e 100644
--- a/java/res/xml/rows_bulgarian.xml
+++ b/java/res/xml/rows_bulgarian.xml
@@ -26,76 +26,99 @@
     <Row
         latin:keyWidth="9.091%p"
     >
+        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="ч"
+            latin:keyLabel="\u0447"
             latin:keyHintLabel="1"
             latin:additionalMoreKeys="1" />
+        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="ш"
+            latin:keyLabel="\u0448"
             latin:keyHintLabel="2"
             latin:additionalMoreKeys="2" />
+        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="е"
+            latin:keyLabel="\u0435"
             latin:keyHintLabel="3"
             latin:additionalMoreKeys="3" />
+        <!-- \u0440: "Ñ€" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="Ñ€"
+            latin:keyLabel="\u0440"
             latin:keyHintLabel="4"
             latin:additionalMoreKeys="4" />
+        <!-- \u0442: "Ñ‚" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="Ñ‚"
+            latin:keyLabel="\u0442"
             latin:keyHintLabel="5"
             latin:additionalMoreKeys="5" />
+        <!-- \u044a: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="ÑŠ"
+            latin:keyLabel="\u044a"
             latin:keyHintLabel="6"
             latin:additionalMoreKeys="6" />
+        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="у"
+            latin:keyLabel="\u0443"
             latin:keyHintLabel="7"
             latin:additionalMoreKeys="7" />
+        <!-- \u0438: "и" CYRILLIC SMALL LETTER I
+             \u045d: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
         <Key
-            latin:keyLabel="и"
+            latin:keyLabel="\u0438"
             latin:keyHintLabel="8"
             latin:additionalMoreKeys="8"
-            latin:moreKeys="ѝ" />
+            latin:moreKeys="\u045d" />
+        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="о"
+            latin:keyLabel="\u043e"
             latin:keyHintLabel="9"
             latin:additionalMoreKeys="9" />
+        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="п"
+            latin:keyLabel="\u043f"
             latin:keyHintLabel="0"
             latin:additionalMoreKeys="0" />
+        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="я"
+            latin:keyLabel="\u044f"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
             latin:keyWidth="9.091%p"
     >
+        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="а" />
+            latin:keyLabel="\u0430" />
+        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="с" />
+            latin:keyLabel="\u0441" />
+        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="д" />
+            latin:keyLabel="\u0434" />
+        <!-- \u0444: "Ñ„" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="Ñ„" />
+            latin:keyLabel="\u0444" />
+        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="г" />
+            latin:keyLabel="\u0433" />
+        <!-- \u0445: "Ñ…" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="Ñ…" />
+            latin:keyLabel="\u0445" />
+        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="й" />
+            latin:keyLabel="\u0439" />
+        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="к" />
+            latin:keyLabel="\u043a" />
+        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="л" />
+            latin:keyLabel="\u043b" />
+        <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
         <Key
-            latin:keyLabel="щ" />
+            latin:keyLabel="\u0449" />
+        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="ь"
+            latin:keyLabel="\u044c"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -104,22 +127,30 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="13.636%p" />
+        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="з" />
+            latin:keyLabel="\u0437" />
+        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="ж" />
+            latin:keyLabel="\u0436" />
+        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="ц" />
+            latin:keyLabel="\u0446" />
+        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="в" />
+            latin:keyLabel="\u0432" />
+        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="б" />
+            latin:keyLabel="\u0431" />
+        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="н" />
+            latin:keyLabel="\u043d" />
+        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="м" />
+            latin:keyLabel="\u043c" />
+        <!-- \u044e: "ÑŽ" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="ÑŽ" />
+            latin:keyLabel="\u044e" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_hebrew.xml b/java/res/xml/rows_hebrew.xml
index a64a09dbcf..ca18a0c23c 100644
--- a/java/res/xml/rows_hebrew.xml
+++ b/java/res/xml/rows_hebrew.xml
@@ -26,23 +26,31 @@
     <Row
         latin:keyWidth="10%p"
     >
+        <!-- \u05e7: "ק" HEBREW LETTER QOF -->
         <Key
-            latin:keyLabel="ק"
+            latin:keyLabel="\u05e7"
             latin:keyXPos="5%p" />
+        <!-- \u05e8: "ר" HEBREW LETTER RESH -->
         <Key
-            latin:keyLabel="ר" />
+            latin:keyLabel="\u05e8" />
+        <!-- \u05d0: "א" HEBREW LETTER ALEF -->
         <Key
-            latin:keyLabel="א" />
+            latin:keyLabel="\u05d0" />
+        <!-- \u05d8: "ט" HEBREW LETTER TET -->
         <Key
-            latin:keyLabel="ט" />
+            latin:keyLabel="\u05d8" />
+        <!-- \u05d5: "ו" HEBREW LETTER VAV -->
         <Key
-            latin:keyLabel="ו" />
+            latin:keyLabel="\u05d5" />
+        <!-- \u05df: "ן" HEBREW LETTER FINAL NUN -->
         <Key
-            latin:keyLabel="ן" />
+            latin:keyLabel="\u05df" />
+        <!-- \u05dd: "ם" HEBREW LETTER FINAL MEM -->
         <Key
-            latin:keyLabel="ם" />
+            latin:keyLabel="\u05dd" />
+        <!-- \u05e4: "פ" HEBREW LETTER PE -->
         <Key
-            latin:keyLabel="פ" />
+            latin:keyLabel="\u05e4" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
@@ -51,57 +59,83 @@
     <Row
         latin:keyWidth="10%p"
     >
+        <!-- \u05e9: "ש" HEBREW LETTER SHIN -->
         <Key
-            latin:keyLabel="ש" />
+            latin:keyLabel="\u05e9" />
+        <!-- \u05d3: "ד" HEBREW LETTER DALET -->
         <Key
-            latin:keyLabel="ד" />
+            latin:keyLabel="\u05d3" />
+        <!-- \u05d2: "×’" HEBREW LETTER GIMEL
+             \u05d2\u05f3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="×’"
-            latin:moreKeys="ג׳" />
+            latin:keyLabel="\u05d2"
+            latin:moreKeys="\u05d2\u05f3" />
+        <!-- \u05db: "×›" HEBREW LETTER KAF -->
         <Key
-            latin:keyLabel="×›" />
+            latin:keyLabel="\u05db" />
+        <!-- \u05e2: "×¢" HEBREW LETTER AYIN -->
         <Key
-            latin:keyLabel="×¢" />
+            latin:keyLabel="\u05e2" />
+        <!-- \u05d9: "×™" HEBREW LETTER YOD
+             \u05f2\u05b7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
         <Key
-            latin:keyLabel="×™"
-            latin:moreKeys="ײַ" />
+            latin:keyLabel="\u05d9"
+            latin:moreKeys="\u05f2\u05b7" />
+        <!-- \u05d7: "×—" HEBREW LETTER HET
+             \u05d7\u05f3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="×—"
-            latin:moreKeys="ח׳" />
+            latin:keyLabel="\u05d7"
+            latin:moreKeys="\u05d7\u05f3" />
+        <!-- \u05dc: "ל" HEBREW LETTER LAMED -->
         <Key
-            latin:keyLabel="ל" />
+            latin:keyLabel="\u05dc" />
+        <!-- \u05da: "ך" HEBREW LETTER FINAL KAF -->
         <Key
-            latin:keyLabel="ך" />
+            latin:keyLabel="\u05da" />
+        <!-- \u05e3: "×£" HEBREW LETTER FINAL PE -->
         <Key
-            latin:keyLabel="×£"
+            latin:keyLabel="\u05e3"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="10%p"
     >
+        <!-- \u05d6: "×–" HEBREW LETTER ZAYIN
+             \u05d6\u05f3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="×–"
-            latin:moreKeys="ז׳"
+            latin:keyLabel="\u05d6"
+            latin:moreKeys="\u05d6\u05f3"
             latin:keyXPos="5%p" />
+        <!-- \u05e1: "ס" HEBREW LETTER SAMEKH -->
         <Key
-            latin:keyLabel="ס" />
+            latin:keyLabel="\u05e1" />
+        <!-- \u05d1: "ב" HEBREW LETTER BET -->
         <Key
-            latin:keyLabel="ב" />
+            latin:keyLabel="\u05d1" />
+        <!-- \u05d4: "×”" HEBREW LETTER HE -->
         <Key
-            latin:keyLabel="×”" />
+            latin:keyLabel="\u05d4" />
+        <!-- \u05e0: "× " HEBREW LETTER NUN -->
         <Key
-            latin:keyLabel="× " />
+            latin:keyLabel="\u05e0" />
+        <!-- \u05de: "מ" HEBREW LETTER MEM -->
         <Key
-            latin:keyLabel="מ" />
+            latin:keyLabel="\u05de" />
+        <!-- \u05e6: "צ" HEBREW LETTER TSADI
+             \u05e6\u05f3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="צ"
-            latin:moreKeys="צ׳" />
+            latin:keyLabel="\u05e6"
+            latin:moreKeys="\u05e6\u05f3" />
+        <!-- \u05ea: "ת" HEBREW LETTER TAV
+             \u05ea\u05f3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="ת"
-            latin:moreKeys="ת׳" />
+            latin:keyLabel="\u05ea"
+            latin:moreKeys="\u05ea\u05f3" />
+        <!-- \u05e5: "×¥" HEBREW LETTER FINAL TSADI
+             \u05e5\u05f3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="×¥"
-            latin:moreKeys="ץ׳" />
+            latin:keyLabel="\u05e5"
+            latin:moreKeys="\u05e5\u05f3" />
         <!-- Here is 5%p space -->
     </Row>
     <include
diff --git a/java/res/xml/rows_serbian.xml b/java/res/xml/rows_serbian.xml
index d2203ce9cb..5591ced368 100644
--- a/java/res/xml/rows_serbian.xml
+++ b/java/res/xml/rows_serbian.xml
@@ -26,75 +26,97 @@
     <Row
         latin:keyWidth="9.091%p"
     >
+        <!-- \u0459: "Ñ™" CYRILLIC SMALL LETTER LJE -->
         <Key
-            latin:keyLabel="Ñ™"
+            latin:keyLabel="\u0459"
             latin:keyHintLabel="1"
             latin:additionalMoreKeys="1" />
+        <!-- \u045a: "Ñš" CYRILLIC SMALL LETTER NJE -->
         <Key
-            latin:keyLabel="Ñš"
+            latin:keyLabel="\u045a"
             latin:keyHintLabel="2"
             latin:additionalMoreKeys="2" />
+        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="е"
+            latin:keyLabel="\u0435"
             latin:keyHintLabel="3"
             latin:additionalMoreKeys="3" />
+        <!-- \u0440: "Ñ€" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="Ñ€"
+            latin:keyLabel="\u0440"
             latin:keyHintLabel="4"
             latin:additionalMoreKeys="4" />
+        <!-- \u0442: "Ñ‚" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="Ñ‚"
+            latin:keyLabel="\u0442"
             latin:keyHintLabel="5"
             latin:additionalMoreKeys="5" />
+        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="з"
+            latin:keyLabel="\u0437"
             latin:keyHintLabel="6"
             latin:additionalMoreKeys="6" />
+        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="у"
+            latin:keyLabel="\u0443"
             latin:keyHintLabel="7"
             latin:additionalMoreKeys="7" />
+        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
         <Key
-            latin:keyLabel="и"
+            latin:keyLabel="\u0438"
             latin:keyHintLabel="8"
             latin:additionalMoreKeys="8" />
+        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="о"
+            latin:keyLabel="\u043e"
             latin:keyHintLabel="9"
             latin:additionalMoreKeys="9" />
+        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="п"
+            latin:keyLabel="\u043f"
             latin:keyHintLabel="0"
             latin:additionalMoreKeys="0" />
+        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="ш"
+            latin:keyLabel="\u0448"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
     >
+        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="а" />
+            latin:keyLabel="\u0430" />
+        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="с" />
+            latin:keyLabel="\u0441" />
+        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="д" />
+            latin:keyLabel="\u0434" />
+        <!-- \u0444: "Ñ„" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="Ñ„" />
+            latin:keyLabel="\u0444" />
+        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="г" />
+            latin:keyLabel="\u0433" />
+        <!-- \u0445: "Ñ…" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="Ñ…" />
+            latin:keyLabel="\u0445" />
+        <!-- \u0458: "ј" CYRILLIC SMALL LETTER JE -->
         <Key
-            latin:keyLabel="ј" />
+            latin:keyLabel="\u0458" />
+        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="к" />
+            latin:keyLabel="\u043a" />
+        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="л" />
+            latin:keyLabel="\u043b" />
+        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="ч" />
+            latin:keyLabel="\u0447" />
+        <!-- \u045b: "Ñ›" CYRILLIC SMALL LETTER TSHE -->
         <Key
-            latin:keyLabel="Ñ›"
+            latin:keyLabel="\u045b"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -103,24 +125,33 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
+        <!-- \u0455: "Ñ•" CYRILLIC SMALL LETTER DZE -->
         <Key
-            latin:keyLabel="Ñ•" />
+            latin:keyLabel="\u0455" />
+        <!-- \u045f: "ÑŸ" CYRILLIC SMALL LETTER DZHE -->
         <Key
-            latin:keyLabel="ÑŸ" />
+            latin:keyLabel="\u045f" />
+        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="ц" />
+            latin:keyLabel="\u0446" />
+        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="в" />
+            latin:keyLabel="\u0432" />
+        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="б" />
+            latin:keyLabel="\u0431" />
+        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="н" />
+            latin:keyLabel="\u043d" />
+        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="м" />
+            latin:keyLabel="\u043c" />
+        <!-- \u0452: "Ñ’" CYRILLIC SMALL LETTER DJE -->
         <Key
-            latin:keyLabel="Ñ’" />
+            latin:keyLabel="\u0452" />
+        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="ж" />
+            latin:keyLabel="\u0436" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_slavic.xml b/java/res/xml/rows_slavic.xml
index 71e442c7cd..4472f8efd5 100644
--- a/java/res/xml/rows_slavic.xml
+++ b/java/res/xml/rows_slavic.xml
@@ -26,81 +26,101 @@
     <Row
         latin:keyWidth="9.091%p"
     >
+        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="й"
+            latin:keyLabel="\u0439"
             latin:keyHintLabel="1"
             latin:additionalMoreKeys="1" />
+        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="ц"
+            latin:keyLabel="\u0446"
             latin:keyHintLabel="2"
             latin:additionalMoreKeys="2" />
+        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="у"
+            latin:keyLabel="\u0443"
             latin:keyHintLabel="3"
             latin:additionalMoreKeys="3"
             latin:moreKeys="@string/more_keys_for_slavic_u" />
+        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="к"
+            latin:keyLabel="\u043a"
             latin:keyHintLabel="4"
             latin:additionalMoreKeys="4" />
+        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="е"
+            latin:keyLabel="\u0435"
             latin:keyHintLabel="5"
             latin:additionalMoreKeys="5"
             latin:moreKeys="@string/more_keys_for_slavic_ye" />
+        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="н"
+            latin:keyLabel="\u043d"
             latin:keyHintLabel="6"
             latin:additionalMoreKeys="6"
             latin:moreKeys="@string/more_keys_for_slavic_en" />
+        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="г"
+            latin:keyLabel="\u0433"
             latin:keyHintLabel="7"
             latin:additionalMoreKeys="7" />
+        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="ш"
+            latin:keyLabel="\u0448"
             latin:keyHintLabel="8"
             latin:additionalMoreKeys="8" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_shcha"
             latin:keyHintLabel="9"
             latin:additionalMoreKeys="9" />
+        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="з"
+            latin:keyLabel="\u0437"
             latin:keyHintLabel="0"
             latin:additionalMoreKeys="0" />
+        <!-- \u0445: "Ñ…" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="Ñ…"
+            latin:keyLabel="\u0445"
             latin:moreKeys="@string/more_keys_for_slavic_ha"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
             latin:keyWidth="9.091%p"
     >
+        <!-- \u0444: "Ñ„" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="Ñ„" />
+            latin:keyLabel="\u0444" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_yery"
             latin:moreKeys="@string/more_keys_for_slavic_yery" />
+        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="в" />
+            latin:keyLabel="\u0432" />
+        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="а" />
+            latin:keyLabel="\u0430" />
+        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="п" />
+            latin:keyLabel="\u043f" />
+        <!-- \u0440: "Ñ€" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="Ñ€" />
+            latin:keyLabel="\u0440" />
+        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="о"
+            latin:keyLabel="\u043e"
             latin:moreKeys="@string/more_keys_for_slavic_o" />
+        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="л" />
+            latin:keyLabel="\u043b" />
+        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="д" />
+            latin:keyLabel="\u0434" />
+        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="ж" />
+            latin:keyLabel="\u0436" />
+        <!-- \u044d: "э" CYRILLIC SMALL LETTER E -->
         <Key
-            latin:keyLabel="э"
+            latin:keyLabel="\u044d"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -109,25 +129,33 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
+        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="я" />
+            latin:keyLabel="\u044f" />
+        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="ч" />
+            latin:keyLabel="\u0447" />
+        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="с" />
+            latin:keyLabel="\u0441" />
+        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="м" />
+            latin:keyLabel="\u043c" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_i" />
+        <!-- \u0442: "Ñ‚" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="Ñ‚" />
+            latin:keyLabel="\u0442" />
+        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="ь"
+            latin:keyLabel="\u044c"
             latin:moreKeys="@string/more_keys_for_slavic_soft_sign" />
+        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="б" />
+            latin:keyLabel="\u0431" />
+        <!-- \u044e: "ÑŽ" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="ÑŽ" />
+            latin:keyLabel="\u044e" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_spanish.xml b/java/res/xml/rows_spanish.xml
index 4b4cb9d1f6..5fc2a00b9d 100644
--- a/java/res/xml/rows_spanish.xml
+++ b/java/res/xml/rows_spanish.xml
@@ -52,8 +52,9 @@
         <Key
             latin:keyLabel="l"
             latin:moreKeys="@string/more_keys_for_l" />
+        <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
         <Key
-            latin:keyLabel="ñ" />
+            latin:keyLabel="\u00f1" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty3" />
diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
index 828bd0624c..168fc9ef98 100644
--- a/java/res/xml/rows_symbols_shift.xml
+++ b/java/res/xml/rows_symbols_shift.xml
@@ -34,18 +34,23 @@
             latin:keyLabel="`" />
         <Key
             latin:keyLabel="|" />
+        <!-- \u2022: "•" BULLET -->
         <Key
-            latin:keyLabel="•"
+            latin:keyLabel="\u2022"
             latin:moreKeys="@string/more_keys_for_bullet" />
+        <!-- \u221a: "√" SQUARE ROOT -->
         <Key
-            latin:keyLabel="√" />
+            latin:keyLabel="\u221a" />
+        <!-- \u03c0: "Ï€" GREEK SMALL LETTER PI -->
         <Key
-            latin:keyLabel="Ï€"
+            latin:keyLabel="\u03c0"
             latin:moreKeys="Π" />
+        <!-- \u00f7: "÷" DIVISION SIGN -->
         <Key
-            latin:keyLabel="÷" />
+            latin:keyLabel="\u00f7" />
+        <!-- \u00d7: "×" MULTIPLICATION SIGN -->
         <Key
-            latin:keyLabel="×" />
+            latin:keyLabel="\u00d7" />
         <include
             latin:keyboardLayout="@xml/keys_curly_brackets" />
     </Row>
@@ -60,17 +65,27 @@
             latin:keyStyle="moreCurrency2KeyStyle" />
         <Key
             latin:keyStyle="moreCurrency3KeyStyle" />
+        <!-- \u00b0: "°" DEGREE SIGN
+             \u2032: "′" PRIME
+             \u2033: "″" DOUBLE PRIME -->
         <Key
-            latin:keyLabel="°"
-            latin:moreKeys="′,″" />
+            latin:keyLabel="\u00b0"
+            latin:moreKeys="\u2032,\u2033" />
+        <!-- \u2191: "↑" UPWARDS ARROW
+             \u2193: "↓" DOWNWARDS ARROW
+             \u2190: "←" LEFTWARDS ARROW
+             \u2192: "→" RIGHTWARDS ARROW -->
         <Key
             latin:keyLabel="^"
-            latin:moreKeys="↑,↓,←,→" />
+            latin:moreKeys="\u2191,\u2193,\u2190,\u2192" />
         <Key
             latin:keyLabel="_" />
+        <!-- \u2260: "≠" NOT EQUAL TO
+             \u2248: "≈" ALMOST EQUAL TO
+             \u221e: "∞" INFINITY -->
         <Key
             latin:keyLabel="="
-            latin:moreKeys="≠,≈,∞" />
+            latin:moreKeys="\u2260,\u2248,\u221e" />
         <include
             latin:keyboardLayout="@xml/keys_square_brackets" />
     </Row>
@@ -81,15 +96,20 @@
             latin:keyStyle="backFromMoreSymbolKeyStyle"
             latin:keyWidth="15%p"
             latin:visualInsetsRight="1%p" />
+        <!-- \u2122: "â„¢" TRADE MARK SIGN -->
         <Key
-            latin:keyLabel="â„¢" />
+            latin:keyLabel="\u2122" />
+        <!-- \u00ae: "®" REGISTERED SIGN -->
         <Key
-            latin:keyLabel="®" />
+            latin:keyLabel="\u00ae" />
+        <!-- \u00a9: "©" COPYRIGHT SIGN -->
         <Key
-            latin:keyLabel="©" />
+            latin:keyLabel="\u00a9" />
+        <!-- \u00b6: "¶" PILCROW SIGN
+             \u00a7: "§" SECTION SIGN -->
         <Key
-            latin:keyLabel="¶"
-            latin:moreKeys="§" />
+            latin:keyLabel="\u00b6"
+            latin:moreKeys="\u00a7" />
         <Key
             latin:keyLabel="\\" />
         <include
-- 
GitLab