diff --git a/java/res/drawable/background_voice.xml b/java/res/drawable/background_voice.xml
index 3b6137d..49a4191 100644
--- a/java/res/drawable/background_voice.xml
+++ b/java/res/drawable/background_voice.xml
@@ -22,4 +22,4 @@
         android:startColor="#ff000000"
         android:endColor="#ff000e29"
         android:angle="90" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/java/res/drawable/btn_center.xml b/java/res/drawable/btn_center.xml
index 9998b56..3ac2129 100644
--- a/java/res/drawable/btn_center.xml
+++ b/java/res/drawable/btn_center.xml
@@ -37,4 +37,4 @@
         android:drawable="@drawable/btn_center_default" />
     <item
         android:drawable="@drawable/btn_center_default" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/java/res/values-ar/donottranslate-more-keys.xml b/java/res/values-ar/donottranslate-more-keys.xml
index e294e95..bb36af2 100644
--- a/java/res/values-ar/donottranslate-more-keys.xml
+++ b/java/res/values-ar/donottranslate-more-keys.xml
@@ -18,48 +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 -->
+    <!-- U+060C: "،" ARABIC COMMA
+         U+061B: "؛" ARABIC SEMICOLON
+         U+061F: "؟" ARABIC QUESTION MARK -->
+    <!-- U+0650: "ِ" ARABIC KASRA
+         U+064E: "َ" ARABIC FATHA
+         U+064B: "ً" ARABIC FATHATAN
+         U+0640: "ـ" ARABIC TATWEEL
+         U+064D: "ٍ" ARABIC KASRATAN
+         U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF
+         U+0656: "ٖ" ARABIC SUBSCRIPT ALEF
+         U+0654: "ٔ" ARABIC HAMZA ABOVE
+         U+0655: "ٕ" ARABIC HAMZA BELOW -->
+    <!-- U+0651: "ّ" ARABIC SHADDA
+         U+0652: "ْ" ARABIC SUKUN
+         U+064C: "ٌ" ARABIC DAMMATAN
+         U+0653: "ٓ" ARABIC MADDAH ABOVE
+         U+064F: "ُ" 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>
+    <string name="more_keys_for_punctuation">"&#x060C;,&#x061B;,&#x061F;,!,:,-,/,\',\",&#x0640;&#x0640;&#x0640;|&#x0640;,&#x064E;,&#x0650;,&#x064B;,&#x064D;,&#x0670;,&#x0656;,&#x0655;,&#x0654;,&#x0653;,&#x0652;,&#x0651;,&#x064C;,&#x064F;"</string>
     <integer name="more_keys_keyboard_column_for_punctuation">9</integer>
-    <string name="keyhintlabel_for_punctuation">\u064b</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="keyhintlabel_for_punctuation">&#x064B;</string>
+    <!-- U+0661: "١" ARABIC-INDIC DIGIT ONE -->
+    <string name="keylabel_for_symbols_1">&#x0661;</string>
+    <!-- U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
+    <string name="keylabel_for_symbols_2">&#x0662;</string>
+    <!-- U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
+    <string name="keylabel_for_symbols_3">&#x0663;</string>
+    <!-- U+0664: "٤" ARABIC-INDIC DIGIT FOUR -->
+    <string name="keylabel_for_symbols_4">&#x0664;</string>
+    <!-- U+0665: "٥" ARABIC-INDIC DIGIT FIVE -->
+    <string name="keylabel_for_symbols_5">&#x0665;</string>
+    <!-- U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
+    <string name="keylabel_for_symbols_6">&#x0666;</string>
+    <!-- U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
+    <string name="keylabel_for_symbols_7">&#x0667;</string>
+    <!-- U+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
+    <string name="keylabel_for_symbols_8">&#x0668;</string>
+    <!-- U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
+    <string name="keylabel_for_symbols_9">&#x0669;</string>
+    <!-- U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
+    <string name="keylabel_for_symbols_0">&#x0660;</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>
@@ -69,99 +69,99 @@
     <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 -->
-    <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 -->
-    <string name="keylabel_for_symbols_percent">\u066a</string>
+    <!-- U+066B: "٫" ARABIC DECIMAL SEPARATOR
+         U+066C: "٬" ARABIC THOUSANDS SEPARATOR -->
+    <string name="additional_more_keys_for_symbols_0">0,&#x066B;,&#x066C;</string>
+    <string name="keylabel_for_comma">&#x060C;</string>
+    <string name="keylabel_for_f1">&#x060C;</string>
+    <string name="keylabel_for_symbols_question">&#x061F;</string>
+    <string name="keylabel_for_symbols_semicolon">&#x061B;</string>
+    <!-- U+066A: "٪" ARABIC PERCENT SIGN -->
+    <string name="keylabel_for_symbols_percent">&#x066A;</string>
     <string name="more_keys_for_comma">,</string>
     <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>
     <string name="more_keys_for_symbols_semicolon">;</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>
+    <!-- U+2030: "‰" PER MILLE SIGN -->
+    <string name="more_keys_for_symbols_percent">%,&#x2030;</string>
+    <!-- U+060C: "،" ARABIC COMMA
+         U+061B: "؛" ARABIC SEMICOLON
+         U+061F: "؟" ARABIC QUESTION MARK -->
+    <string name="keylabel_for_apostrophe">&#x060C;</string>
     <string name="keylabel_for_dash">"."</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 -->
+    <string name="keyhintlabel_for_apostrophe">&#x061F;</string>
+    <string name="keyhintlabel_for_dash">&#x064B;</string>
+    <string name="more_keys_for_apostrophe">"&#x061F;,&#x061B;,!,:,-,/,\',\""</string>
+    <!-- U+0651: "ّ" ARABIC SHADDA
+         U+0652: "ْ" ARABIC SUKUN
+         U+064C: "ٌ" ARABIC DAMMATAN
+         U+0653: "ٓ" ARABIC MADDAH ABOVE
+         U+064F: "ُ" ARABIC DAMMA -->
+    <!-- U+0650: "ِ" ARABIC KASRA
+         U+064E: "َ" ARABIC FATHA
+         U+064B: "ً" ARABIC FATHATAN
+         U+0640: "ـ" ARABIC TATWEEL
+         U+064D: "ٍ" ARABIC KASRATAN -->
+    <!-- U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF
+         U+0656: "ٖ" ARABIC SUBSCRIPT ALEF
+         U+0654: "ٔ" ARABIC HAMZA ABOVE
+         U+0655: "ٕ" 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>
-    <!-- \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>
+    <string name="more_keys_for_dash">"&#x0651;,&#x0652;,&#x064C;,&#x0653;,&#x064F;,&#x0650;,&#x064E;,&#x064B;,&#x0640;&#x0640;&#x0640;|&#x0640;,&#x064D;,&#x0654;,&#x0656;,&#x0655;,&#x0670;"</string>
+    <!-- U+266A: "♪" EIGHTH NOTE -->
+    <string name="more_keys_for_bullet">&#x266A;</string>
+    <!-- U+2605: "★" BLACK STAR
+         U+066D: "٭" ARABIC FIVE POINTED STAR -->
+    <string name="more_keys_for_star">&#x2605;,&#x066D;</string>
     <!-- The all letters need to be mirrored are found at
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
-    <!-- 0x0029: ")" RIGHT PARENTHESIS -->
+    <!-- U+0029: ")" RIGHT PARENTHESIS -->
     <integer name="keycode_for_left_parenthesis">0x0029</integer>
-    <!-- 0x0028: "(" LEFT PARENTHESIS -->
+    <!-- U+0028: "(" LEFT PARENTHESIS -->
     <integer name="keycode_for_right_parenthesis">0x0028</integer>
-    <!-- \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
+    <!-- U+FD3E: "﴾" ORNATE LEFT PARENTHESIS
+         U+FD3F: "﴿" ORNATE RIGHT PARENTHESIS -->
+    <!-- TODO: DroidSansArabic lacks the glyph of U+FD3E ORNATE LEFT PARENTHESIS -->
+    <!-- TODO: DroidSansArabic lacks the glyph of U+FD3F ORNATE RIGHT PARENTHESIS -->
+    <string name="more_keys_for_left_parenthesis">[|],{|},&lt;|&gt;,&#xFD3E;|&#xFD3F;</string>
+    <string name="more_keys_for_right_parenthesis">]|[,}|{,&gt;|&lt;,&#xFD3F;|&#xFD3E;</string>
+    <!-- U+003E: ">" GREATER-THAN SIGN -->
+    <integer name="keycode_for_less_than">0x003E</integer>
+    <!-- U+003C: "<" LESS-THAN SIGN -->
+    <integer name="keycode_for_greater_than">0x003C</integer>
+    <!-- U+2264: "≤" LESS-THAN OR EQUAL TO
+         U+2265: "≥" GREATER-THAN EQUAL TO
+         U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+         U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+         U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+         U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
          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 -->
-    <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>
-    <!-- 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> -->
+         U+2018: "‘" LEFT SINGLE QUOTATION MARK
+         U+2019: "’" RIGHT SINGLE QUOTATION MARK
+         U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
+         U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+         U+201C: "“" LEFT DOUBLE QUOTATION MARK
+         U+201D: "”" RIGHT DOUBLE QUOTATION MARK
+         U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
+         U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+    <string name="more_keys_for_less_than">&#x2264;|&#x2265;,&#x00AB;|&#x00BB;,&#x2039;|&#x203A;</string>
+    <string name="more_keys_for_greater_than">&#x2265;|&#x2264;,&#x00BB;|&#x00AB;,&#x203A;|&#x2039;</string>
+    <!-- U+005D: "]" RIGHT SQUARE BRACKET -->
+    <integer name="keycode_for_left_square_bracket">0x005D</integer>
+    <!-- U+005B: "[" LEFT SQUARE BRACKET -->
+    <integer name="keycode_for_right_square_bracket">0x005B</integer>
+    <!-- U+007D: "}" RIGHT CURLY BRACKET -->
+    <integer name="keycode_for_left_curly_bracket">0x007D</integer>
+    <!-- U+007B: "{" LEFT CURLY BRACKET -->
+    <integer name="keycode_for_right_curly_bracket">0x007B</integer>
+    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+    <!-- <string name="more_keys_for_double_quote">&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;,&#x00BB;</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>
-    <!-- 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> -->
+    <string name="more_keys_for_double_quote">&#x201D;,&#x00AB;|&#x00BB;,&#x201C;,&#x00BB;|&#x00AB;</string>
+    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+    <!-- <string name="more_keys_for_tablet_double_quote">&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;,&#x00BB;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</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>
+    <string name="more_keys_for_tablet_double_quote">&#x201D;,&#x00AB;|&#x00BB;,&#x201C;,&#x00BB;|&#x00AB;,&#x2019;,&#x201A;,&#x2018;,&#x201B;</string>
 </resources>
diff --git a/java/res/values-ar/donottranslate.xml b/java/res/values-ar/donottranslate.xml
index 968a730..57de253 100644
--- a/java/res/values-ar/donottranslate.xml
+++ b/java/res/values-ar/donottranslate.xml
@@ -21,7 +21,5 @@
     <!-- 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>
+    <string name="suggested_punctuations">!,?,\\,,:,;,\",(|),)|(,\',-,/,@,_</string>
 </resources>
diff --git a/java/res/values-be/donottranslate-more-keys.xml b/java/res/values-be/donottranslate-more-keys.xml
index 0110de0..0917f11 100644
--- a/java/res/values-be/donottranslate-more-keys.xml
+++ b/java/res/values-be/donottranslate-more-keys.xml
@@ -18,8 +18,8 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+045E: "ў" CYRILLIC SMALL LETTER SHORT U -->
+    <string name="keylabel_for_slavic_shcha">&#x045E;</string>
+    <!-- U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
+    <string name="keylabel_for_slavic_i">&#x0456;</string>
 </resources>
diff --git a/java/res/values-ca/donottranslate-more-keys.xml b/java/res/values-ca/donottranslate-more-keys.xml
index 68d7f90..baa23bf 100644
--- a/java/res/values-ca/donottranslate-more-keys.xml
+++ b/java/res/values-ca/donottranslate-more-keys.xml
@@ -18,56 +18,56 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
+    <string name="more_keys_for_a">&#x00E0;,&#x00E1;,&#x00E4;,&#x00E2;,&#x00E3;,&#x00E5;,&#x0105;,&#x00E6;,&#x0101;,&#x00AA;</string>
+    <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">&#x00E8;,&#x00E9;,&#x00EB;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
+    <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
+    <!-- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
+         U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
+    <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x00F6;,&#x00F4;,&#x00F5;,&#x00F8;,&#x0153;,&#x014D;,&#x00BA;</string>
+    <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
+    <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
+    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
+    <!-- U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT
+         U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
+    <string name="more_keys_for_l">&#x0140;,&#x0142;</string>
 </resources>
diff --git a/java/res/values-cs/donottranslate-more-keys.xml b/java/res/values-cs/donottranslate-more-keys.xml
index 475b589..9af6794 100644
--- a/java/res/values-cs/donottranslate-more-keys.xml
+++ b/java/res/values-cs/donottranslate-more-keys.xml
@@ -18,70 +18,70 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+011B: "ě" LATIN SMALL LETTER E WITH CARON
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">&#x00E9;,&#x011B;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
+    <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">&#x00ED;,&#x00EE;,&#x00EF;,&#x00EC;,&#x012F;,&#x012B;</string>
+    <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FA;,&#x016F;,&#x00FB;,&#x00FC;,&#x00F9;,&#x016B;</string>
+    <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
+         U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE -->
+    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;</string>
+    <!-- U+0148: "ň" LATIN SMALL LETTER N WITH CARON
+         U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x0148;,&#x00F1;,&#x0144;</string>
+    <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
+         U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">&#x010D;,&#x00E7;,&#x0107;</string>
+    <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON -->
+    <string name="more_keys_for_d">&#x010F;</string>
+    <!-- U+0159: "ř" LATIN SMALL LETTER R WITH CARON -->
+    <string name="more_keys_for_r">&#x0159;</string>
+    <!-- U+0165: "ť" LATIN SMALL LETTER T WITH CARON -->
+    <string name="more_keys_for_t">&#x0165;</string>
+    <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
+         U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
+         U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
+    <string name="more_keys_for_z">&#x017E;,&#x017A;,&#x017C;</string>
 </resources>
diff --git a/java/res/values-da/donottranslate-more-keys.xml b/java/res/values-da/donottranslate-more-keys.xml
index 84dc1bf..739ab09 100644
--- a/java/res/values-da/donottranslate-more-keys.xml
+++ b/java/res/values-da/donottranslate-more-keys.xml
@@ -18,54 +18,54 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">&#x00E1;,&#x00E4;,&#x00E0;,&#x00E2;,&#x00E3;,&#x0101;</string>
+    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS -->
+    <string name="more_keys_for_e">&#x00E9;,&#x00EB;</string>
+    <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS -->
+    <string name="more_keys_for_i">&#x00ED;,&#x00EF;</string>
+    <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">&#x00F3;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x014D;</string>
+    <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00FB;,&#x00F9;,&#x016B;</string>
+    <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">&#x00DF;,&#x015B;,&#x0161;</string>
+    <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <!-- U+00F0: "ð" LATIN SMALL LETTER ETH -->
+    <string name="more_keys_for_d">&#x00F0;</string>
+    <!-- U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
+    <string name="more_keys_for_l">&#x0142;</string>
+    <!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
+    <string name="keylabel_for_scandinavia_row1_11">&#x00E5;</string>
+    <!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
+    <string name="keylabel_for_scandinavia_row2_10">&#x00E6;</string>
+    <!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="keylabel_for_scandinavia_row2_11">&#x00F8;</string>
+    <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+    <string name="more_keys_for_scandinavia_row2_10">&#x00E4;</string>
+    <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+    <string name="more_keys_for_scandinavia_row2_11">&#x00F6;</string>
 </resources>
diff --git a/java/res/values-de/donottranslate-more-keys.xml b/java/res/values-de/donottranslate-more-keys.xml
index b8dca39..562e574 100644
--- a/java/res/values-de/donottranslate-more-keys.xml
+++ b/java/res/values-de/donottranslate-more-keys.xml
@@ -18,37 +18,37 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">&#x00E4;,&#x00E2;,&#x00E0;,&#x00E1;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <!-- U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE -->
+    <string name="more_keys_for_e">&#x0117;</string>
+    <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">&#x00F6;,&#x00F4;,&#x00F2;,&#x00F3;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
+    <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">&#x00DF;,&#x015B;,&#x0161;</string>
+    <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
 </resources>
diff --git a/java/res/values-en/additional-proximitychars.xml b/java/res/values-en/additional-proximitychars.xml
index 0e12767..a5ff4a9 100644
--- a/java/res/values-en/additional-proximitychars.xml
+++ b/java/res/values-en/additional-proximitychars.xml
@@ -59,4 +59,4 @@
         <item></item>
     </string-array>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/res/values-es/donottranslate-more-keys.xml b/java/res/values-es/donottranslate-more-keys.xml
index 644229a..ec8b6e4 100644
--- a/java/res/values-es/donottranslate-more-keys.xml
+++ b/java/res/values-es/donottranslate-more-keys.xml
@@ -18,54 +18,56 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
+    <string name="more_keys_for_a">&#x00E1;,&#x00E0;,&#x00E4;,&#x00E2;,&#x00E3;,&#x00E5;,&#x0105;,&#x00E6;,&#x0101;,&#x00AA;</string>
+    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EB;,&#x00EA;,&#x0119;,&#x0117;,&#x0113;</string>
+    <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
+    <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
+         U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
+    <string name="more_keys_for_o">&#x00F3;,&#x00F2;,&#x00F6;,&#x00F4;,&#x00F5;,&#x00F8;,&#x0153;,&#x014D;,&#x00BA;</string>
+    <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
+    <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
+    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
+    <!-- U+00BF: "¿" INVERTED QUESTION MARK
+         U+00A1: "¡" INVERTED EXCLAMATION MARK -->
+    <string name="more_keys_for_punctuation">"\\,,\?,!,&#x00BF;,&#x00A1;,:,-,\',\",),(,/,;,+,&amp;,\@"</string>
 </resources>
diff --git a/java/res/values-et/donottranslate-more-keys.xml b/java/res/values-et/donottranslate-more-keys.xml
index 833c716..be66b42 100644
--- a/java/res/values-et/donottranslate-more-keys.xml
+++ b/java/res/values-et/donottranslate-more-keys.xml
@@ -18,98 +18,97 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK -->
+    <string name="more_keys_for_a">&#x00E4;,&#x0101;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E5;,&#x00E6;,&#x0105;</string>
+    <!-- U+0113: "ē" LATIN SMALL LETTER E WITH MACRON
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+011B: "ě" LATIN SMALL LETTER E WITH CARON -->
+    <string name="more_keys_for_e">&#x0113;,&#x00E8;,&#x0117;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0119;,&#x011B;</string>
+    <!-- U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+    <string name="more_keys_for_i">&#x012B;,&#x00EC;,&#x012F;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0131;</string>
+    <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_o">&#x00F6;,&#x00F5;,&#x00F2;,&#x00F3;,&#x00F4;,&#x0153;,&#x0151;,&#x00F8;</string>
+    <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON
+         U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+         U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+    <string name="more_keys_for_u">&#x00FC;,&#x016B;,&#x0173;,&#x00F9;,&#x00FA;,&#x00FB;,&#x016F;,&#x0171;</string>
+    <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
+         U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
+    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;,&#x015F;</string>
+    <!-- U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+         U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x0146;,&#x00F1;,&#x0144;,&#x0144;</string>
+    <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
+         U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">&#x010D;,&#x00E7;,&#x0107;</string>
+    <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON -->
+    <string name="more_keys_for_d">&#x010F;</string>
+    <!-- U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
+         U+0159: "ř" LATIN SMALL LETTER R WITH CARON
+         U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE -->
+    <string name="more_keys_for_r">&#x0157;,&#x0159;,&#x0155;</string>
+    <!-- U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
+         U+0165: "ť" LATIN SMALL LETTER T WITH CARON -->
+    <string name="more_keys_for_t">&#x0163;,&#x0165;</string>
+    <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
+         U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+         U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+    <string name="more_keys_for_z">&#x017E;,&#x017C;,&#x017A;</string>
+    <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
+    <string name="more_keys_for_k">&#x0137;</string>
+    <!-- U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+         U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
+         U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+         U+013E: "ľ" LATIN SMALL LETTER L WITH CARON -->
+    <string name="more_keys_for_l">&#x013C;,&#x0142;,&#x013A;,&#x013E;</string>
+    <!-- U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
+         U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE -->
+    <string name="more_keys_for_g">&#x0123;,&#x011F;</string>
+    <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row1_11">&#x00FC;</string>
+    <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_10">&#x00F6;</string>
+    <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_11">&#x00E4;</string>
+    <!-- U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE -->
+    <string name="more_keys_for_scandinavia_row2_10">&#x00F5;</string>
 </resources>
diff --git a/java/res/values-fi/donottranslate-more-keys.xml b/java/res/values-fi/donottranslate-more-keys.xml
index af8b00e..9b5fa78 100644
--- a/java/res/values-fi/donottranslate-more-keys.xml
+++ b/java/res/values-fi/donottranslate-more-keys.xml
@@ -18,39 +18,39 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E6: "æ" LATIN SMALL LETTER AE
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">&#x00E6;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x0101;</string>
+    <!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">&#x00F8;,&#x00F4;,&#x00F2;,&#x00F3;,&#x00F5;,&#x0153;,&#x014D;</string>
+    <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
+    <string name="more_keys_for_u">&#x00FC;</string>
+    <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
+         U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE -->
+    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;</string>
+    <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
+         U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
+         U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
+    <string name="more_keys_for_z">&#x017E;,&#x017A;,&#x017C;</string>
+    <!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
+    <string name="keylabel_for_scandinavia_row1_11">&#x00E5;</string>
+    <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_10">&#x00F6;</string>
+    <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_11">&#x00E4;</string>
+    <!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_scandinavia_row2_10">&#x00F8;</string>
+    <!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
+    <string name="more_keys_for_scandinavia_row2_11">&#x00E6;</string>
 </resources>
diff --git a/java/res/values-fr/donottranslate-more-keys.xml b/java/res/values-fr/donottranslate-more-keys.xml
index ac731af..7b11a18 100644
--- a/java/res/values-fr/donottranslate-more-keys.xml
+++ b/java/res/values-fr/donottranslate-more-keys.xml
@@ -18,51 +18,51 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
+    <string name="more_keys_for_a">&#x00E0;,&#x00E2;,%,&#x00E6;,&#x00E1;,&#x00E4;,&#x00E3;,&#x00E5;,&#x0101;,&#x00AA;</string>
+    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,%,&#x0119;,&#x0117;,&#x0113;</string>
+    <!-- U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">&#x00EE;,%,&#x00EF;,&#x00EC;,&#x00ED;,&#x012F;,&#x012B;</string>
+    <!-- U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
+         U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
+    <string name="more_keys_for_o">&#x00F4;,&#x0153;,%,&#x00F6;,&#x00F2;,&#x00F3;,&#x00F5;,&#x00F8;,&#x014D;,&#x00BA;</string>
+    <!-- U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00F9;,&#x00FB;,%,&#x00FC;,&#x00FA;,&#x016B;</string>
+    <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
+    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
+    <!-- U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">%,&#x00FF;</string>
 </resources>
diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml
index 695750f..0f8f6c3 100644
--- a/java/res/values-fr/donottranslate.xml
+++ b/java/res/values-fr/donottranslate.xml
@@ -19,11 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Symbols that should be swapped with a magic space -->
-    <string name="magic_space_swapping_symbols">.,\u0022)]}</string>
+    <string name="magic_space_swapping_symbols">.,\")]}</string>
     <!-- Symbols that should strip a magic space -->
-    <string name="magic_space_stripping_symbols">\u0009\u0020\u0027\n-/_</string>
+    <string name="magic_space_stripping_symbols">&#x0009;&#x0020;\'\n-/_</string>
     <!-- Symbols that should promote magic spaces into real space -->
     <string name="magic_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</string>
     <!-- Symbols that do NOT separate words -->
-    <string name="symbols_excluded_from_word_separators">\u0027</string>
+    <string name="symbols_excluded_from_word_separators">\'</string>
 </resources>
diff --git a/java/res/values-hr/donottranslate-more-keys.xml b/java/res/values-hr/donottranslate-more-keys.xml
index 9ec04f7..9b4005d 100644
--- a/java/res/values-hr/donottranslate-more-keys.xml
+++ b/java/res/values-hr/donottranslate-more-keys.xml
@@ -18,22 +18,21 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
-    <!-- \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>
+    <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+00DF: "ß" LATIN SMALL LETTER SHARP S -->
+    <string name="more_keys_for_s">&#x0161;,&#x015B;,&#x00DF;</string>
+    <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
+    <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
+         U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
+         U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
+    <string name="more_keys_for_z">&#x017E;,&#x017A;,&#x017C;</string>
+    <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
+    <string name="more_keys_for_c">&#x010D;,&#x0107;,&#x00E7;</string>
+    <!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
+    <string name="more_keys_for_d">&#x0111;</string>
 </resources>
diff --git a/java/res/values-hu/donottranslate-more-keys.xml b/java/res/values-hu/donottranslate-more-keys.xml
index b707c53..4825910 100644
--- a/java/res/values-hu/donottranslate-more-keys.xml
+++ b/java/res/values-hu/donottranslate-more-keys.xml
@@ -18,45 +18,45 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
+    <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">&#x00ED;,&#x00EE;,&#x00EF;,&#x00EC;,&#x012F;,&#x012B;</string>
+    <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">&#x00F3;,&#x00F6;,&#x0151;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x0171;,&#x00FB;,&#x00F9;,&#x016B;</string>
 </resources>
diff --git a/java/res/values-it/donottranslate-more-keys.xml b/java/res/values-it/donottranslate-more-keys.xml
index 01a4c5f..17dd031 100644
--- a/java/res/values-it/donottranslate-more-keys.xml
+++ b/java/res/values-it/donottranslate-more-keys.xml
@@ -18,45 +18,45 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
+    <string name="more_keys_for_a">&#x00E0;,&#x00E1;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;,&#x00AA;</string>
+    <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
+    <!-- U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x012F;,&#x012B;</string>
+    <!-- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
+         U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
+    <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x00F4;,&#x00F6;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;,&#x00BA;</string>
+    <!-- U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00F9;,&#x00FA;,&#x00FB;,&#x00FC;,&#x016B;</string>
 </resources>
diff --git a/java/res/values-iw/donottranslate-more-keys.xml b/java/res/values-iw/donottranslate-more-keys.xml
index 32dc111..865aac6 100644
--- a/java/res/values-iw/donottranslate-more-keys.xml
+++ b/java/res/values-iw/donottranslate-more-keys.xml
@@ -18,54 +18,54 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+2605: "★" BLACK STAR -->
+    <string name="more_keys_for_star">&#x2605;</string>
+    <!-- U+00B1: "±" PLUS-MINUS SIGN
+         U+FB29: "﬩" HEBREW LETTER ALTERNATIVE PLUS SIGN -->
+    <string name="more_keys_for_plus">&#x00B1;,&#xFB29;</string>
     <!-- The all letters need to be mirrored are found at
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
-    <!-- 0x0029: ")" RIGHT PARENTHESIS -->
+    <!-- U+0029: ")" RIGHT PARENTHESIS -->
     <integer name="keycode_for_left_parenthesis">0x0029</integer>
-    <!-- 0x0028: "(" LEFT PARENTHESIS -->
+    <!-- U+0028: "(" 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
+    <!-- U+003E: ">" GREATER-THAN SIGN -->
+    <integer name="keycode_for_less_than">0x003E</integer>
+    <!-- U+003C: "<" LESS-THAN SIGN -->
+    <integer name="keycode_for_greater_than">0x003C</integer>
+    <!-- U+2264: "≤" LESS-THAN OR EQUAL TO
+         U+2265: "≥" GREATER-THAN EQUAL TO
+         U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+         U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+         U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+         U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
          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 -->
-    <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> -->
+         U+2018: "‘" LEFT SINGLE QUOTATION MARK
+         U+2019: "’" RIGHT SINGLE QUOTATION MARK
+         U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
+         U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+         U+201C: "“" LEFT DOUBLE QUOTATION MARK
+         U+201D: "”" RIGHT DOUBLE QUOTATION MARK
+         U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
+         U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+    <string name="more_keys_for_less_than">&#x2264;|&#x2265;,&#x00AB;|&#x00BB;,&#x2039;|&#x203A;</string>
+    <string name="more_keys_for_greater_than">&#x2265;|&#x2264;,&#x00BB;|&#x00AB;,&#x203A;|&#x2039;</string>
+    <!-- U+005D: "]" RIGHT SQUARE BRACKET -->
+    <integer name="keycode_for_left_square_bracket">0x005D</integer>
+    <!-- U+005B: "[" LEFT SQUARE BRACKET -->
+    <integer name="keycode_for_right_square_bracket">0x005B</integer>
+    <!-- U+007D: "}" RIGHT CURLY BRACKET -->
+    <integer name="keycode_for_left_curly_bracket">0x007D</integer>
+    <!-- U+007B: "{" LEFT CURLY BRACKET -->
+    <integer name="keycode_for_right_curly_bracket">0x007B</integer>
+    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+    <!-- <string name="more_keys_for_double_quote">&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;,&#x00BB;</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. -->
-    <!-- <string name="more_keys_for_tablet_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb,\u2018,\u2019,\u201a,\u201b</string> -->
+    <string name="more_keys_for_double_quote">&#x201D;,&#x00AB;|&#x00BB;,&#x201C;,&#x00BB;|&#x00AB;</string>
+    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+    <!-- <string name="more_keys_for_tablet_double_quote">&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;,&#x00BB;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</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>
+    <string name="more_keys_for_tablet_double_quote">&#x201D;,&#x00AB;|&#x00BB;,&#x201C;,&#x00BB;|&#x00AB;,&#x2019;,&#x201A;,&#x2018;,&#x201B;</string>
 </resources>
diff --git a/java/res/values-iw/donottranslate.xml b/java/res/values-iw/donottranslate.xml
index a9aad4e..57de253 100644
--- a/java/res/values-iw/donottranslate.xml
+++ b/java/res/values-iw/donottranslate.xml
@@ -21,5 +21,5 @@
     <!-- 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 -->
-    <string name="suggested_punctuations">!,?,\\,,:,;,\u0022,(|),)|(,\u0027,-,/,@,_</string>
+    <string name="suggested_punctuations">!,?,\\,,:,;,\",(|),)|(,\',-,/,@,_</string>
 </resources>
diff --git a/java/res/values-ky/donottranslate-more-keys.xml b/java/res/values-ky/donottranslate-more-keys.xml
index 563a199..8246209 100644
--- a/java/res/values-ky/donottranslate-more-keys.xml
+++ b/java/res/values-ky/donottranslate-more-keys.xml
@@ -18,10 +18,10 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+04AF: "ү" CYRILLIC SMALL LETTER STRAIGHT U -->
+    <string name="more_keys_for_slavic_u">&#x04AF;</string>
+    <!-- U+04A3: "ң" CYRILLIC SMALL LETTER EN WITH DESCENDER -->
+    <string name="more_keys_for_slavic_en">&#x04A3;</string>
+    <!-- U+04E9: "ө" CYRILLIC SMALL LETTER BARRED O -->
+    <string name="more_keys_for_slavic_o">&#x04E9;</string>
 </resources>
diff --git a/java/res/values-lt/donottranslate-more-keys.xml b/java/res/values-lt/donottranslate-more-keys.xml
index ec45081..1491d95 100644
--- a/java/res/values-lt/donottranslate-more-keys.xml
+++ b/java/res/values-lt/donottranslate-more-keys.xml
@@ -18,90 +18,90 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+00E6: "æ" LATIN SMALL LETTER AE -->
+    <string name="more_keys_for_a">&#x0105;,&#x00E4;,&#x0101;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E5;,&#x00E6;</string>
+    <!-- U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+011B: "ě" LATIN SMALL LETTER E WITH CARON -->
+    <string name="more_keys_for_e">&#x0117;,&#x0119;,&#x0113;,&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x011B;</string>
+    <!-- U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+    <string name="more_keys_for_i">&#x012F;,&#x012B;,&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0131;</string>
+    <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_o">&#x00F6;,&#x00F5;,&#x00F2;,&#x00F3;,&#x00F4;,&#x0153;,&#x0151;,&#x00F8;</string>
+    <!-- U+016B: "ū" LATIN SMALL LETTER U WITH MACRON
+         U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+         U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+    <string name="more_keys_for_u">&#x016B;,&#x0173;,&#x00FC;,&#x016B;,&#x00F9;,&#x00FA;,&#x00FB;,&#x016F;,&#x0171;</string>
+    <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
+         U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
+    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;,&#x015F;</string>
+    <!-- U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+         U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x0146;,&#x00F1;,&#x0144;,&#x0144;</string>
+    <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
+         U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">&#x010D;,&#x00E7;,&#x0107;</string>
+    <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON -->
+    <string name="more_keys_for_d">&#x010F;</string>
+    <!-- U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
+         U+0159: "ř" LATIN SMALL LETTER R WITH CARON
+         U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE -->
+    <string name="more_keys_for_r">&#x0157;,&#x0159;,&#x0155;</string>
+    <!-- U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
+         U+0165: "ť" LATIN SMALL LETTER T WITH CARON -->
+    <string name="more_keys_for_t">&#x0163;,&#x0165;</string>
+    <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
+         U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+         U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+    <string name="more_keys_for_z">&#x017E;,&#x017C;,&#x017A;</string>
+    <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
+    <string name="more_keys_for_k">&#x0137;</string>
+    <!-- U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+         U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
+         U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+         U+013E: "ľ" LATIN SMALL LETTER L WITH CARON -->
+    <string name="more_keys_for_l">&#x013C;,&#x0142;,&#x013A;,&#x013E;</string>
+    <!-- U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
+         U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE -->
+    <string name="more_keys_for_g">&#x0123;,&#x011F;</string>
 </resources>
diff --git a/java/res/values-lv/donottranslate-more-keys.xml b/java/res/values-lv/donottranslate-more-keys.xml
index 7d3a3d8..d0a4448 100644
--- a/java/res/values-lv/donottranslate-more-keys.xml
+++ b/java/res/values-lv/donottranslate-more-keys.xml
@@ -18,89 +18,89 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK -->
+    <string name="more_keys_for_a">&#x0101;,&#x00E0;,&#x00E1;,&#x00E2;,&#x00E3;,&#x00E4;,&#x00E5;,&#x00E6;,&#x0105;</string>
+    <!-- U+0113: "ē" LATIN SMALL LETTER E WITH MACRON
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+011B: "ě" LATIN SMALL LETTER E WITH CARON -->
+    <string name="more_keys_for_e">&#x0113;,&#x0117;,&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0119;,&#x011B;</string>
+    <!-- U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+    <string name="more_keys_for_i">&#x012B;,&#x012F;,&#x00EC;,&#x00ED;,&#x00EE;,&#x00EF;,&#x0131;</string>
+    <!-- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x00F4;,&#x00F5;,&#x00F6;,&#x0153;,&#x0151;,&#x00F8;</string>
+    <!-- U+016B: "ū" LATIN SMALL LETTER U WITH MACRON
+         U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+         U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+    <string name="more_keys_for_u">&#x016B;,&#x0173;,&#x00F9;,&#x00FA;,&#x00FB;,&#x00FC;,&#x016F;,&#x0171;</string>
+    <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
+         U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
+    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;,&#x015F;</string>
+    <!-- U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+         U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x0146;,&#x00F1;,&#x0144;,&#x0144;</string>
+    <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
+         U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">&#x010D;,&#x00E7;,&#x0107;</string>
+    <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON -->
+    <string name="more_keys_for_d">&#x010F;</string>
+    <!-- U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
+         U+0159: "ř" LATIN SMALL LETTER R WITH CARON
+         U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE -->
+    <string name="more_keys_for_r">&#x0157;,&#x0159;,&#x0155;</string>
+    <!-- U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
+         U+0165: "ť" LATIN SMALL LETTER T WITH CARON -->
+    <string name="more_keys_for_t">&#x0163;,&#x0165;</string>
+    <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
+         U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+         U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+    <string name="more_keys_for_z">&#x017E;,&#x017C;,&#x017A;</string>
+    <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
+    <string name="more_keys_for_k">&#x0137;</string>
+    <!-- U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+         U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
+         U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+         U+013E: "ľ" LATIN SMALL LETTER L WITH CARON -->
+    <string name="more_keys_for_l">&#x013C;,&#x0142;,&#x013A;,&#x013E;</string>
+    <!-- U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
+         U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE -->
+    <string name="more_keys_for_g">&#x0123;,&#x011F;</string>
 </resources>
diff --git a/java/res/values-nb/donottranslate-more-keys.xml b/java/res/values-nb/donottranslate-more-keys.xml
index c3d1288..7248d98 100644
--- a/java/res/values-nb/donottranslate-more-keys.xml
+++ b/java/res/values-nb/donottranslate-more-keys.xml
@@ -18,43 +18,43 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">&#x00E0;,&#x00E4;,&#x00E1;,&#x00E2;,&#x00E3;,&#x0101;</string>
+    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;,&#x0117;,&#x0113;</string>
+    <!-- U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">&#x00F4;,&#x00F2;,&#x00F3;,&#x00F6;,&#x00F5;,&#x0153;,&#x014D;</string>
+    <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
+    <!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
+    <string name="keylabel_for_scandinavia_row1_11">&#x00E5;</string>
+    <!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="keylabel_for_scandinavia_row2_10">&#x00F8;</string>
+    <!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
+    <string name="keylabel_for_scandinavia_row2_11">&#x00E6;</string>
+    <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+    <string name="more_keys_for_scandinavia_row2_10">&#x00F6;</string>
+    <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+    <string name="more_keys_for_scandinavia_row2_11">&#x00E4;</string>
 </resources>
diff --git a/java/res/values-nl/donottranslate-more-keys.xml b/java/res/values-nl/donottranslate-more-keys.xml
index 6310cbc..4f5cbee 100644
--- a/java/res/values-nl/donottranslate-more-keys.xml
+++ b/java/res/values-nl/donottranslate-more-keys.xml
@@ -18,46 +18,46 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">&#x00E1;,&#x00E4;,&#x00E2;,&#x00E0;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">&#x00E9;,&#x00EB;,&#x00EA;,&#x00E8;,&#x0119;,&#x0117;,&#x0113;</string>
+    <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">&#x00ED;,&#x00EF;,&#x00EC;,&#x00EE;,&#x012F;,&#x012B;</string>
+    <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00FB;,&#x00F9;,&#x016B;</string>
+    <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x00F1;,&#x0144;</string>
 </resources>
diff --git a/java/res/values-pl/donottranslate-more-keys.xml b/java/res/values-pl/donottranslate-more-keys.xml
index 51477c3..0f8a59b 100644
--- a/java/res/values-pl/donottranslate-more-keys.xml
+++ b/java/res/values-pl/donottranslate-more-keys.xml
@@ -18,48 +18,48 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">&#x0105;,&#x00E1;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>
+    <!-- U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
+    <string name="more_keys_for_e">&#x0119;,&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0117;,&#x0113;</string>
+    <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">&#x00F3;,&#x00F6;,&#x00F4;,&#x00F2;,&#x00F5;,&#x0153;,&#x00F8;,&#x014D;</string>
+    <!-- U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">&#x015B;,&#x00DF;,&#x0161;</string>
+    <!-- U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
+         U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
+    <string name="more_keys_for_n">&#x0144;,&#x00F1;</string>
+    <!-- U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
+    <string name="more_keys_for_c">&#x0107;,&#x00E7;,&#x010D;</string>
+    <!-- U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+         U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
+         U+017E: "ž" LATIN SMALL LETTER Z WITH CARON -->
+    <string name="more_keys_for_z">&#x017C;,&#x017A;,&#x017E;</string>
+    <!-- U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
+    <string name="more_keys_for_l">&#x0142;</string>
 </resources>
diff --git a/java/res/values-pt/donottranslate-more-keys.xml b/java/res/values-pt/donottranslate-more-keys.xml
index cc476d6..0c9065f 100644
--- a/java/res/values-pt/donottranslate-more-keys.xml
+++ b/java/res/values-pt/donottranslate-more-keys.xml
@@ -18,48 +18,48 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
+    <string name="more_keys_for_a">&#x00E1;,&#x00E3;,&#x00E0;,&#x00E2;,&#x00E4;,&#x00E5;,&#x00E6;,&#x00AA;</string>
+    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS -->
+    <string name="more_keys_for_e">&#x00E9;,&#x00EA;,&#x00E8;,&#x0119;,&#x0117;,&#x0113;,&#x00EB;</string>
+    <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">&#x00ED;,&#x00EE;,&#x00EC;,&#x00EF;,&#x012F;,&#x012B;</string>
+    <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
+         U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
+    <string name="more_keys_for_o">&#x00F3;,&#x00F5;,&#x00F4;,&#x00F2;,&#x00F6;,&#x0153;,&#x00F8;,&#x014D;,&#x00BA;</string>
+    <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FA;,&#x00FC;,&#x00F9;,&#x00FB;,&#x016B;</string>
+    <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+010D: "č" LATIN SMALL LETTER C WITH CARON
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">&#x00E7;,&#x010D;,&#x0107;</string>
 </resources>
diff --git a/java/res/values-rm/donottranslate-more-keys.xml b/java/res/values-rm/donottranslate-more-keys.xml
index 22af05f..aa0d7f8 100644
--- a/java/res/values-rm/donottranslate-more-keys.xml
+++ b/java/res/values-rm/donottranslate-more-keys.xml
@@ -18,12 +18,12 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x00F6;,&#x00F4;,&#x00F5;,&#x0153;,&#x00F8;</string>
 </resources>
diff --git a/java/res/values-ro/donottranslate-more-keys.xml b/java/res/values-ro/donottranslate-more-keys.xml
index 4497f66..44613cf 100644
--- a/java/res/values-ro/donottranslate-more-keys.xml
+++ b/java/res/values-ro/donottranslate-more-keys.xml
@@ -18,28 +18,28 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+0103: "ă" LATIN SMALL LETTER A WITH BREVE
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->
+    <string name="more_keys_for_a">&#x00E2;,&#x00E3;,&#x0103;,&#x00E0;,&#x00E1;,&#x00E4;,&#x00E6;,&#x00E5;,&#x0101;</string>
+    <!-- U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">&#x00EE;,&#x00EF;,&#x00EC;,&#x00ED;,&#x012F;,&#x012B;</string>
+    <!-- U+0219: "ș" LATIN SMALL LETTER S WITH COMMA BELOW
+         U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">&#x0219;,&#x00DF;,&#x015B;,&#x0161;</string>
+    <!-- U+021B: "ț" LATIN SMALL LETTER T WITH COMMA BELOW -->
+    <string name="more_keys_for_t">&#x021B;</string>
 </resources>
diff --git a/java/res/values-ru/donottranslate-more-keys.xml b/java/res/values-ru/donottranslate-more-keys.xml
index 6b6c2b3..45c4551 100644
--- a/java/res/values-ru/donottranslate-more-keys.xml
+++ b/java/res/values-ru/donottranslate-more-keys.xml
@@ -18,6 +18,6 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \u0451: "ё" CYRILLIC SMALL LETTER IO -->
-    <string name="more_keys_for_slavic_ye">\u0451</string>
+    <!-- U+0451: "ё" CYRILLIC SMALL LETTER IO -->
+    <string name="more_keys_for_slavic_ye">&#x0451;</string>
 </resources>
diff --git a/java/res/values-sk/donottranslate-more-keys.xml b/java/res/values-sk/donottranslate-more-keys.xml
index 31c5984..f6e1e8d 100644
--- a/java/res/values-sk/donottranslate-more-keys.xml
+++ b/java/res/values-sk/donottranslate-more-keys.xml
@@ -18,90 +18,90 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
+         U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
+         U+00E6: "æ" LATIN SMALL LETTER AE
+         U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK -->
+    <string name="more_keys_for_a">&#x00E1;,&#x00E4;,&#x0101;,&#x00E0;,&#x00E2;,&#x00E3;,&#x00E5;,&#x00E6;,&#x0105;</string>
+    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+011B: "ě" LATIN SMALL LETTER E WITH CARON
+         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON
+         U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK -->
+    <string name="more_keys_for_e">&#x00E9;,&#x011B;,&#x0113;,&#x0117;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;</string>
+    <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+0131: "ı" LATIN SMALL LETTER DOTLESS I -->
+    <string name="more_keys_for_i">&#x00ED;,&#x012B;,&#x012F;,&#x00EC;,&#x00EE;,&#x00EF;,&#x0131;</string>
+    <!-- U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_o">&#x00F4;,&#x00F3;,&#x00F6;,&#x00F2;,&#x00F5;,&#x0153;,&#x0151;,&#x00F8;</string>
+    <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
+         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON
+         U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+    <string name="more_keys_for_u">&#x00FA;,&#x016F;,&#x00FC;,&#x016B;,&#x0173;,&#x00F9;,&#x00FB;,&#x0171;</string>
+    <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON
+         U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
+    <string name="more_keys_for_s">&#x0161;,&#x00DF;,&#x015B;,&#x015F;</string>
+    <!-- U+0148: "ň" LATIN SMALL LETTER N WITH CARON
+         U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+         U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
+         U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
+    <string name="more_keys_for_n">&#x0148;,&#x0146;,&#x00F1;,&#x0144;,&#x0144;</string>
+    <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
+         U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">&#x010D;,&#x00E7;,&#x0107;</string>
+    <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
+    <string name="more_keys_for_y">&#x00FD;,&#x00FF;</string>
+    <!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON -->
+    <string name="more_keys_for_d">&#x010F;</string>
+    <!-- U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
+         U+0159: "ř" LATIN SMALL LETTER R WITH CARON
+         U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA -->
+    <string name="more_keys_for_r">&#x0155;,&#x0159;,&#x0157;</string>
+    <!-- U+0165: "ť" LATIN SMALL LETTER T WITH CARON
+         U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA -->
+    <string name="more_keys_for_t">&#x0165;,&#x0163;</string>
+    <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
+         U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+         U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE -->
+    <string name="more_keys_for_z">&#x017E;,&#x017C;,&#x017A;</string>
+    <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA -->
+    <string name="more_keys_for_k">&#x0137;</string>
+    <!-- U+013E: "ľ" LATIN SMALL LETTER L WITH CARON
+         U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+         U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+         U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
+    <string name="more_keys_for_l">&#x013E;,&#x013A;,&#x013C;,&#x0142;</string>
+    <!-- U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
+         U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE -->
+    <string name="more_keys_for_g">&#x0123;,&#x011F;</string>
 </resources>
diff --git a/java/res/values-sl/donottranslate-more-keys.xml b/java/res/values-sl/donottranslate-more-keys.xml
index 6890ac7..ccff2ac 100644
--- a/java/res/values-sl/donottranslate-more-keys.xml
+++ b/java/res/values-sl/donottranslate-more-keys.xml
@@ -18,13 +18,13 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">&#x0161;</string>
+    <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
+    <string name="more_keys_for_c">&#x010D;,&#x0107;</string>
+    <!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
+    <string name="more_keys_for_d">&#x0111;</string>
+    <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON -->
+    <string name="more_keys_for_z">&#x017E;</string>
 </resources>
diff --git a/java/res/values-sv/donottranslate-more-keys.xml b/java/res/values-sv/donottranslate-more-keys.xml
index 94bcfa0..e3662df 100644
--- a/java/res/values-sv/donottranslate-more-keys.xml
+++ b/java/res/values-sv/donottranslate-more-keys.xml
@@ -18,37 +18,37 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+         U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK -->
+    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0119;</string>
+    <!-- U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">&#x0153;,&#x00F4;,&#x00F2;,&#x00F3;,&#x00F5;,&#x014D;</string>
+    <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
+    <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">&#x00DF;,&#x015B;,&#x0161;</string>
+    <!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
+    <string name="keylabel_for_scandinavia_row1_11">&#x00E5;</string>
+    <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_10">&#x00F6;</string>
+    <!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
+    <string name="keylabel_for_scandinavia_row2_11">&#x00E4;</string>
+    <!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
+    <string name="more_keys_for_scandinavia_row2_10">&#x00F8;</string>
+    <!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
+    <string name="more_keys_for_scandinavia_row2_11">&#x00E6;</string>
 </resources>
diff --git a/java/res/values-tr/donottranslate-more-keys.xml b/java/res/values-tr/donottranslate-more-keys.xml
index 12315e4..1161811 100644
--- a/java/res/values-tr/donottranslate-more-keys.xml
+++ b/java/res/values-tr/donottranslate-more-keys.xml
@@ -18,40 +18,40 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX -->
+    <string name="more_keys_for_a">&#x00E2;</string>
+    <!-- U+0131: "ı" LATIN SMALL LETTER DOTLESS I
+         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
+    <string name="more_keys_for_i">&#x0131;,&#x00EE;,&#x00EF;,&#x00EC;,&#x00ED;,&#x012F;,&#x012B;</string>
+    <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+0153: "œ" LATIN SMALL LIGATURE OE
+         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON -->
+    <string name="more_keys_for_o">&#x00F6;,&#x00F4;,&#x0153;,&#x00F2;,&#x00F3;,&#x00F5;,&#x00F8;,&#x014D;</string>
+    <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
+    <string name="more_keys_for_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
+    <!-- U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
+         U+00DF: "ß" LATIN SMALL LETTER SHARP S
+         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
+         U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
+    <string name="more_keys_for_s">&#x015F;,&#x00DF;,&#x015B;,&#x0161;</string>
+    <!-- U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE -->
+    <string name="more_keys_for_g">&#x011F;</string>
+    <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+         U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
+    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
 </resources>
diff --git a/java/res/values-uk/donottranslate-more-keys.xml b/java/res/values-uk/donottranslate-more-keys.xml
index 7b05f43..3208a66 100644
--- a/java/res/values-uk/donottranslate-more-keys.xml
+++ b/java/res/values-uk/donottranslate-more-keys.xml
@@ -18,8 +18,8 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
+    <string name="keylabel_for_slavic_yery">&#x0456;</string>
+    <!-- U+0457: "ї" CYRILLIC SMALL LETTER YI -->
+    <string name="more_keys_for_slavic_yery">&#x0457;</string>
 </resources>
diff --git a/java/res/values-vi/donottranslate-more-keys.xml b/java/res/values-vi/donottranslate-more-keys.xml
index 4cfb213..6ef1c6b 100644
--- a/java/res/values-vi/donottranslate-more-keys.xml
+++ b/java/res/values-vi/donottranslate-more-keys.xml
@@ -18,78 +18,78 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- \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>
+    <!-- U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
+         U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+         U+1EA3: "ả" LATIN SMALL LETTER A WITH HOOK ABOVE
+         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+         U+1EA1: "ạ" LATIN SMALL LETTER A WITH DOT BELOW
+         U+0103: "ă" LATIN SMALL LETTER A WITH BREVE
+         U+1EB1: "ằ" LATIN SMALL LETTER A WITH BREVE AND GRAVE
+         U+1EAF: "ắ" LATIN SMALL LETTER A WITH BREVE AND ACUTE
+         U+1EB3: "ẳ" LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
+         U+1EB5: "ẵ" LATIN SMALL LETTER A WITH BREVE AND TILDE
+         U+1EB7: "ặ" LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
+         U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+         U+1EA7: "ầ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
+         U+1EA5: "ấ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
+         U+1EA9: "ẩ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+         U+1EAB: "ẫ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
+         U+1EAD: "ậ" LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW -->
+    <string name="more_keys_for_a">&#x00E0;,&#x00E1;,&#x1EA3;,&#x00E3;,&#x1EA1;,&#x0103;,&#x1EB1;,&#x1EAF;,&#x1EB3;,&#x1EB5;,&#x1EB7;,&#x00E2;,&#x1EA7;,&#x1EA5;,&#x1EA9;,&#x1EAB;,&#x1EAD;</string>
+    <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+         U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+         U+1EBB: "ẻ" LATIN SMALL LETTER E WITH HOOK ABOVE
+         U+1EBD: "ẽ" LATIN SMALL LETTER E WITH TILDE
+         U+1EB9: "ẹ" LATIN SMALL LETTER E WITH DOT BELOW
+         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+         U+1EC1: "ề" LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
+         U+1EBF: "ế" LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
+         U+1EC3: "ể" LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+         U+1EC5: "ễ" LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
+         U+1EC7: "ệ" LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW -->
+    <string name="more_keys_for_e">&#x00E8;,&#x00E9;,&#x1EBB;,&#x1EBD;,&#x1EB9;,&#x00EA;,&#x1EC1;,&#x1EBF;,&#x1EC3;,&#x1EC5;,&#x1EC7;</string>
+    <!-- U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+         U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
+         U+1EC9: "ỉ" LATIN SMALL LETTER I WITH HOOK ABOVE
+         U+0129: "ĩ" LATIN SMALL LETTER I WITH TILDE
+         U+1ECB: "ị" LATIN SMALL LETTER I WITH DOT BELOW -->
+    <string name="more_keys_for_i">&#x00EC;,&#x00ED;,&#x1EC9;,&#x0129;,&#x1ECB;</string>
+    <!-- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+         U+1ECF: "ỏ" LATIN SMALL LETTER O WITH HOOK ABOVE
+         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+         U+1ECD: "ọ" LATIN SMALL LETTER O WITH DOT BELOW
+         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+         U+1ED3: "ồ" LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
+         U+1ED1: "ố" LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
+         U+1ED5: "ổ" LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+         U+1ED7: "ỗ" LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
+         U+1ED9: "ộ" LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+         U+01A1: "ơ" LATIN SMALL LETTER O WITH HORN
+         U+1EDD: "ờ" LATIN SMALL LETTER O WITH HORN AND GRAVE
+         U+1EDB: "ớ" LATIN SMALL LETTER O WITH HORN AND ACUTE
+         U+1EDF: "ở" LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
+         U+1EE1: "ỡ" LATIN SMALL LETTER O WITH HORN AND TILDE
+         U+1EE3: "ợ" LATIN SMALL LETTER O WITH HORN AND DOT BELOW -->
+    <string name="more_keys_for_o">&#x00F2;,&#x00F3;,&#x1ECF;,&#x00F5;,&#x1ECD;,&#x00F4;,&#x1ED3;,&#x1ED1;,&#x1ED5;,&#x1ED7;,&#x1ED9;,&#x01A1;,&#x1EDD;,&#x1EDB;,&#x1EDF;,&#x1EE1;,&#x1EE3;</string>
+    <!-- U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+         U+1EE7: "ủ" LATIN SMALL LETTER U WITH HOOK ABOVE
+         U+0169: "ũ" LATIN SMALL LETTER U WITH TILDE
+         U+1EE5: "ụ" LATIN SMALL LETTER U WITH DOT BELOW
+         U+01B0: "ư" LATIN SMALL LETTER U WITH HORN
+         U+1EEB: "ừ" LATIN SMALL LETTER U WITH HORN AND GRAVE
+         U+1EE9: "ứ" LATIN SMALL LETTER U WITH HORN AND ACUTE
+         U+1EED: "ử" LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
+         U+1EEF: "ữ" LATIN SMALL LETTER U WITH HORN AND TILDE
+         U+1EF1: "ự" LATIN SMALL LETTER U WITH HORN AND DOT BELOW -->
+    <string name="more_keys_for_u">&#x00F9;,&#x00FA;,&#x1EE7;,&#x0169;,&#x1EE5;,&#x01B0;,&#x1EEB;,&#x1EE9;,&#x1EED;,&#x1EEF;,&#x1EF1;</string>
+    <!-- U+1EF3: "ỳ" LATIN SMALL LETTER Y WITH GRAVE
+         U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
+         U+1EF7: "ỷ" LATIN SMALL LETTER Y WITH HOOK ABOVE
+         U+1EF9: "ỹ" LATIN SMALL LETTER Y WITH TILDE
+         U+1EF5: "ỵ" LATIN SMALL LETTER Y WITH DOT BELOW -->
+    <string name="more_keys_for_y">&#x1EF3;,&#x00FD;,&#x1EF7;,&#x1EF9;,&#x1EF5;</string>
+    <!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
+    <string name="more_keys_for_d">&#x0111;</string>
 </resources>
diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml
index 17fd9a8..c04e6d0 100644
--- a/java/res/values/donottranslate-more-keys.xml
+++ b/java/res/values/donottranslate-more-keys.xml
@@ -40,30 +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>
-    <!-- \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>
+    <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+    <string name="keylabel_for_slavic_shcha">&#x0449;</string>
+    <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
+    <string name="keylabel_for_slavic_yery">&#x044B;</string>
+    <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
+    <string name="keylabel_for_slavic_i">&#x0438;</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>
-    <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-    <string name="more_keys_for_slavic_ha">\u044a</string>
+    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+    <string name="more_keys_for_slavic_ha">&#x044A;</string>
     <string name="more_keys_for_slavic_yery"></string>
     <string name="more_keys_for_slavic_o"></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>
+    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+    <string name="more_keys_for_slavic_soft_sign">&#x044A;</string>
+    <!-- U+00A2: "¢" CENT SIGN
+         U+00A3: "£" POUND SIGN
+         U+20AC: "€" EURO SIGN
+         U+00A5: "¥" YEN SIGN
+         U+20B1: "₱" PESO SIGN -->
+    <string name="more_keys_for_currency_dollar">&#x00A2;,&#x00A3;,&#x20AC;,&#x00A5;,&#x20B1;</string>
+    <string name="more_keys_for_currency_euro">&#x00A2;,&#x00A3;,$,&#x00A5;,&#x20B1;</string>
+    <string name="more_keys_for_currency_pound">&#x00A2;,$,&#x20AC;,&#x00A5;,&#x20B1;</string>
+    <string name="more_keys_for_currency_general">&#x00A2;,$,&#x20AC;,&#x00A3;,&#x00A5;,&#x20B1;</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>
@@ -91,31 +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>
-    <!-- \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>
+    <!-- U+00B9: "¹" SUPERSCRIPT ONE
+         U+00BD: "½" VULGAR FRACTION ONE HALF
+         U+2153: "⅓" VULGAR FRACTION ONE THIRD
+         U+00BC: "¼" VULGAR FRACTION ONE QUARTER
+         U+215B: "⅛" VULGAR FRACTION ONE EIGHTH -->
+    <string name="more_keys_for_symbols_1">&#x00B9;,&#x00BD;,&#x2153;,&#x00BC;,&#x215B;</string>
+    <!-- U+00B2: "²" SUPERSCRIPT TWO
+         U+2154: "⅔" VULGAR FRACTION TWO THIRDS -->
+    <string name="more_keys_for_symbols_2">&#x00B2;,&#x2154;</string>
+    <!-- U+00B3: "³" SUPERSCRIPT THREE
+         U+00BE: "¾" VULGAR FRACTION THREE QUARTERS
+         U+215C: "⅜" VULGAR FRACTION THREE EIGHTHS -->
+    <string name="more_keys_for_symbols_3">&#x00B3;,&#x00BE;,&#x215C;</string>
+    <!-- U+2074: "⁴" SUPERSCRIPT FOUR -->
+    <string name="more_keys_for_symbols_4">&#x2074;</string>
+    <!-- U+215D: "⅝" VULGAR FRACTION FIVE EIGHTHS -->
+    <string name="more_keys_for_symbols_5">&#x215D;</string>
     <string name="more_keys_for_symbols_6"></string>
-    <!-- \u215e: "⅞" VULGAR FRACTION SEVEN EIGHTHS -->
-    <string name="more_keys_for_symbols_7">\u215e</string>
+    <!-- U+215E: "⅞" VULGAR FRACTION SEVEN EIGHTHS -->
+    <string name="more_keys_for_symbols_7">&#x215E;</string>
     <string name="more_keys_for_symbols_8"></string>
     <string name="more_keys_for_symbols_9"></string>
-    <!-- \u207f: "ⁿ" SUPERSCRIPT LATIN SMALL LETTER N
-         \u2205: "∅" EMPTY SET -->
-    <string name="more_keys_for_symbols_0">\u207f,\u2205</string>
+    <!-- U+207F: "ⁿ" SUPERSCRIPT LATIN SMALL LETTER N
+         U+2205: "∅" EMPTY SET -->
+    <string name="more_keys_for_symbols_0">&#x207F;,&#x2205;</string>
     <string name="keylabel_for_comma">,</string>
     <string name="keylabel_for_f1">,</string>
     <string name="keylabel_for_symbols_question">\?</string>
@@ -125,66 +125,74 @@
     <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>
-    <!-- \u00bf: "¿" INVERTED QUESTION MARK -->
-    <string name="more_keys_for_symbols_question">\u00bf</string>
+    <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
+    <string name="more_keys_for_symbols_question">&#x00BF;</string>
     <string name="more_keys_for_symbols_semicolon"></string>
-    <!-- \u2030: "‰" PER MILLE SIGN -->
-    <string name="more_keys_for_symbols_percent">\u2030</string>
+    <!-- U+2030: "‰" PER MILLE SIGN -->
+    <string name="more_keys_for_symbols_percent">&#x2030;</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>
-    <!-- \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>
+    <!-- U+266A: "♪" EIGHTH NOTE
+         U+2665: "♥" BLACK HEART SUIT
+         U+2660: "♠" BLACK SPADE SUIT
+         U+2666: "♦" BLACK DIAMOND SUIT
+         U+2663: "♣" BLACK CLUB SUIT -->
+    <string name="more_keys_for_bullet">&#x266A;,&#x2665;,&#x2660;,&#x2666;,&#x2663;</string>
+    <!-- U+2020: "†" DAGGER
+         U+2021: "‡" DOUBLE DAGGER
+         U+2605: "★" BLACK STAR -->
+    <string name="more_keys_for_star">&#x2020;,&#x2021;,&#x2605;</string>
+    <!-- U+00B1: "±" PLUS-MINUS SIGN -->
+    <string name="more_keys_for_plus">&#x00B1;</string>
     <!-- The all letters need to be mirrored are found at
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
+    <!-- U+0028: "(" LEFT PARENTHESIS -->
     <integer name="keycode_for_left_parenthesis">0x0028</integer>
+    <!-- U+0029: ")" RIGHT PARENTHESIS -->
     <integer name="keycode_for_right_parenthesis">0x0029</integer>
     <string name="more_keys_for_left_parenthesis">[,{,&lt;</string>
     <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
+    <!-- U+003C: "<" LESS-THAN SIGN -->
+    <integer name="keycode_for_less_than">0x003C</integer>
+    <!-- U+003E: ">" GREATER-THAN SIGN -->
+    <integer name="keycode_for_greater_than">0x003E</integer>
+    <!-- U+2264: "≤" LESS-THAN OR EQUAL TO
+         U+2265: "≥" GREATER-THAN EQUAL TO
+         U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+         U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+         U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+         U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
          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 -->
-    <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>
-    <integer name="keycode_for_right_square_bracket">0x005d</integer>
-    <integer name="keycode_for_left_curly_bracket">0x007b</integer>
-    <integer name="keycode_for_right_curly_bracket">0x007d</integer>
+         U+2018: "‘" LEFT SINGLE QUOTATION MARK
+         U+2019: "’" RIGHT SINGLE QUOTATION MARK
+         U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
+         U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+         U+201C: "“" LEFT DOUBLE QUOTATION MARK
+         U+201D: "”" RIGHT DOUBLE QUOTATION MARK
+         U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
+         U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+    <string name="more_keys_for_less_than">&#x2264;,&#x00AB;,&#x2039;</string>
+    <string name="more_keys_for_greater_than">&#x2265;,&#x00BB;,&#x203A;</string>
+    <!-- U+005B: "[" LEFT SQUARE BRACKET -->
+    <integer name="keycode_for_left_square_bracket">0x005B</integer>
+    <!-- U+005D: "]" RIGHT SQUARE BRACKET -->
+    <integer name="keycode_for_right_square_bracket">0x005D</integer>
+    <!-- U+007B: "{" LEFT CURLY BRACKET -->
+    <integer name="keycode_for_left_curly_bracket">0x007B</integer>
+    <!-- U+007D: "}" RIGHT CURLY BRACKET -->
+    <integer name="keycode_for_right_curly_bracket">0x007D</integer>
     <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
-    <string name="more_keys_for_single_quote">\u2019,\u201a,\u2018,\u201b</string>
-    <!-- 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> -->
+    <string name="more_keys_for_single_quote">&#x2019;,&#x201A;,&#x2018;,&#x201B;</string>
+    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+    <!-- <string name="more_keys_for_double_quote">&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;,&#x00BB;</string> -->
     <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
-    <string name="more_keys_for_double_quote">\u201d,\u00ab,\u201c,\u00bb</string>
-    <!-- Note: Neither DroidSans nor Roboto have a glyph for 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> -->
+    <string name="more_keys_for_double_quote">&#x201D;,&#x00AB;,&#x201C;,&#x00BB;</string>
+    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+    <!-- <string name="more_keys_for_tablet_double_quote">&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;,&#x00BB;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</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,\u201c,\u00bb,\u2019,\u201a,\u2018,\u201b</string>
+    <string name="more_keys_for_tablet_double_quote">&#x201D;,&#x00AB;,&#x201C;,&#x00BB;,&#x2019;,&#x201A;,&#x2018;,&#x201B;</string>
 </resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index a00dddf..d7a88bf 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -19,32 +19,30 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Symbols that are suggested between words -->
-    <string name="suggested_punctuations">!,?,\\,,:,;,\u0022,(,),\u0027,-,/,@,_</string>
+    <string name="suggested_punctuations">!,?,\\,,:,;,\",(,),\',-,/,@,_</string>
     <!-- Symbols that should be swapped with a magic space -->
-    <string name="magic_space_swapping_symbols">.,;:!?)]}\u0022</string>
+    <string name="magic_space_swapping_symbols">.,;:!?)]}\"</string>
     <!-- Symbols that should strip a magic space -->
-    <string name="magic_space_stripping_symbols">\u0009\u0020\n/_\u0027-</string>
+    <string name="magic_space_stripping_symbols">&#x0009;&#x0020;\n/_\'-</string>
     <!-- Symbols that should convert magic spaces into real space -->
     <string name="magic_space_promoting_symbols">([*&amp;@{&lt;&gt;+=|</string>
     <!-- Symbols that do NOT separate words -->
-    <string name="symbols_excluded_from_word_separators">\u0027-</string>
+    <string name="symbols_excluded_from_word_separators">\'-</string>
     <!-- Word separator list is the union of all symbols except those that are not separators:
     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 -->
-    <!-- string name="layout_switch_back_symbols">\u0022\u0027\u2018\u2019\u201a\u201b\u201c\u201d\u201e\u201f\u00ab\u00bb</string> -->
+    <!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK
+         U+2019: "’" RIGHT SINGLE QUOTATION MARK
+         U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
+         U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+         U+201C: "“" LEFT DOUBLE QUOTATION MARK
+         U+201D: "”" RIGHT DOUBLE QUOTATION MARK
+         U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
+         U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+         U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+         U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
+    <!-- <string name="layout_switch_back_symbols">\"\'&#x2018;&#x2019;&#x201A;&#x201B;&#x201C;&#x201D;&#x201E;&#x201F;&#x00AB;&#x00BB;</string> -->
     <string name="layout_switch_back_symbols"></string>
 
     <!-- Label for "switch to more symbol" modifier key.  Must be short to fit on key! -->
@@ -57,7 +55,9 @@
     <!-- Label for "switch to phone numeric" key.  Must be short to fit on key! -->
     <string name="label_to_phone_numeric_key">123</string>
     <!-- Label for "switch to phone symbols" key.  Must be short to fit on key! -->
-    <string name="label_to_phone_symbols_key">\uff0a\uff03</string>
+    <!-- U+FF0A: "＊" FULLWIDTH ASTERISK
+         U+FF03: "＃" FULLWIDTH NUMBER SIGN -->
+    <string name="label_to_phone_symbols_key">&#xFF0A;&#xFF03;</string>
 
     <!--  Always show the suggestion strip -->
     <string name="prefs_suggestion_visibility_show_value">0</string>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 525b775..c8b6421 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -182,7 +182,7 @@
     <string name="spoken_description_smiley">Smiley face</string>
     <!-- Spoken description for the "Return" keyboard key. -->
     <string name="spoken_description_return">Return</string>
-    <!-- Spoken description for the "\u2022" (BULLET) keyboard key. -->
+    <!-- Spoken description for the "U+2022" (BULLET) keyboard key. -->
     <string name="spoken_description_dot">Dot</string>
 
     <!-- Spoken feedback after turning "Shift" mode on. -->
@@ -301,7 +301,7 @@
     <string name="select_language">Input languages</string>
 
     <!-- Add to dictionary hint -->
-    <string name="hint_add_to_dictionary">\u2190 Touch again to save</string>
+    <string name="hint_add_to_dictionary">&#x2190; Touch again to save</string>
 
     <!-- Inform the user that a particular language has an available dictionary -->
     <string name="has_dictionary">Dictionary available</string>
diff --git a/java/res/values/touch-position-correction.xml b/java/res/values/touch-position-correction.xml
index 0a0e4e5..41b435a 100644
--- a/java/res/values/touch-position-correction.xml
+++ b/java/res/values/touch-position-correction.xml
@@ -71,4 +71,4 @@
         <item>0.0880847</item>
         <item>0.1522819</item>
     </string-array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
index 715ec6c..60ad45e 100644
--- a/java/res/xml-sw600dp/rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -26,53 +26,53 @@
     <Row
         latin:keyWidth="8.0%p"
     >
-        <!-- \u0636: "ض" ARABIC LETTER DAD -->
+        <!-- U+0636: "ض" ARABIC LETTER DAD -->
         <Key
-            latin:keyLabel="\u0636" />
-        <!-- \u0635: "ص" ARABIC LETTER SAD -->
+            latin:keyLabel="&#x0636;" />
+        <!-- U+0635: "ص" ARABIC LETTER SAD -->
         <Key
-            latin:keyLabel="\u0635" />
-        <!-- \u062b: "ث" ARABIC LETTER THEH -->
+            latin:keyLabel="&#x0635;" />
+        <!-- U+062B: "ث" ARABIC LETTER THEH -->
         <Key
-            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 -->
+            latin:keyLabel="&#x062B;" />
+        <!-- U+0642: "ق" ARABIC LETTER QAF
+             U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
         <Key
-            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 -->
+            latin:keyLabel="&#x0642;"
+            latin:moreKeys="&#x06A8;" />
+        <!-- U+0641: "ف" ARABIC LETTER FEH
+             U+06A4: "ڤ" ARABIC LETTER VEH
+             U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
+             U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
         <Key
-            latin:keyLabel="\u0641"
-            latin:moreKeys="\u06a4,\u06a2,\u06a5" />
-        <!-- \u063a: "غ" ARABIC LETTER GHAIN -->
+            latin:keyLabel="&#x0641;"
+            latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" />
+        <!-- U+063A: "غ" ARABIC LETTER GHAIN -->
         <Key
-            latin:keyLabel="\u063a" />
-        <!-- \u0639: "ع" ARABIC LETTER AIN -->
+            latin:keyLabel="&#x063A;" />
+        <!-- U+0639: "ع" ARABIC LETTER AIN -->
         <Key
-            latin:keyLabel="\u0639" />
-        <!-- \u0647: "ه" ARABIC LETTER HEH
-             \ufeeb: "ﻫ" ARABIC LETTER HEH INITIAL FORM
-             \u0647\u200d: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
+            latin:keyLabel="&#x0639;" />
+        <!-- U+0647: "ه" ARABIC LETTER HEH
+             U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+             U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
         <Key
-            latin:keyLabel="\u0647"
-            latin:moreKeys="\ufeeb|\u0647\u200d" />
-        <!-- \u062e: "خ" ARABIC LETTER KHAH -->
+            latin:keyLabel="&#x0647;"
+            latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" />
+        <!-- U+062E: "خ" ARABIC LETTER KHAH -->
         <Key
-            latin:keyLabel="\u062e" />
-        <!-- \u062d: "ح" ARABIC LETTER HAH -->
+            latin:keyLabel="&#x062E;" />
+        <!-- U+062D: "ح" ARABIC LETTER HAH -->
         <Key
-            latin:keyLabel="\u062d" />
-        <!-- \u062c: "ج" ARABIC LETTER JEEM
-             \u0686: "چ" ARABIC LETTER TCHEH -->
+            latin:keyLabel="&#x062D;" />
+        <!-- U+062C: "ج" ARABIC LETTER JEEM
+             U+0686: "چ" ARABIC LETTER TCHEH -->
         <Key
-            latin:keyLabel="\u062c"
-            latin:moreKeys="\u0686" />
+            latin:keyLabel="&#x062C;"
+            latin:moreKeys="&#x0686;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -81,66 +81,66 @@
     <Row
         latin:keyWidth="8.0%p"
     >
-        <!-- \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 -->
+        <!-- U+0634: "ش" ARABIC LETTER SHEEN
+             U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="\u0634"
-            latin:moreKeys="\u069c"
+            latin:keyLabel="&#x0634;"
+            latin:moreKeys="&#x069C;"
             latin:keyXPos="3.0%p" />
-        <!-- \u0633: "س" ARABIC LETTER SEEN -->
+        <!-- U+0633: "س" ARABIC LETTER SEEN -->
         <Key
-            latin:keyLabel="\u0633" />
-        <!-- \u064a: "ي" ARABIC LETTER YEH
-             \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
-             \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+            latin:keyLabel="&#x0633;" />
+        <!-- U+064A: "ي" ARABIC LETTER YEH
+             U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+             U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
         <Key
-            latin:keyLabel="\u064a"
-            latin:moreKeys="\u0626,\u0649" />
-        <!-- \u0628: "ب" ARABIC LETTER BEH
-             \u067e: "پ" ARABIC LETTER PEH -->
+            latin:keyLabel="&#x064A;"
+            latin:moreKeys="&#x0626;,&#x0649;" />
+        <!-- U+0628: "ب" ARABIC LETTER BEH
+             U+067E: "پ" 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 -->
+            latin:keyLabel="&#x0628;"
+            latin:moreKeys="&#x067E;" />
+        <!-- U+0644: "ل" ARABIC LETTER LAM
+             U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+             U+0627: "ا" ARABIC LETTER ALEF
+             U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+             U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+             U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+             U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+             U+0622: "آ" 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 -->
+            latin:keyLabel="&#x0644;"
+            latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;" />
+        <!-- U+0627: "ا" ARABIC LETTER ALEF
+             U+0621: "ء" ARABIC LETTER HAMZA
+             U+0671: "ٱ" ARABIC LETTER ALEF WASLA
+             U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+             U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
         <Key
-            latin:keyLabel="\u0627"
-            latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
-        <!-- \u062a: "ت" ARABIC LETTER TEH -->
+            latin:keyLabel="&#x0627;"
+            latin:moreKeys="&#x0621;,&#x0671;,&#x0623;,&#x0625;,&#x0622;" />
+        <!-- U+062A: "ت" ARABIC LETTER TEH -->
         <Key
-            latin:keyLabel="\u062a" />
-        <!-- \u0646: "ن" ARABIC LETTER NOON -->
+            latin:keyLabel="&#x062A;" />
+        <!-- U+0646: "ن" ARABIC LETTER NOON -->
         <Key
-            latin:keyLabel="\u0646" />
-        <!-- \u0645: "م" ARABIC LETTER MEEM -->
+            latin:keyLabel="&#x0646;" />
+        <!-- U+0645: "م" ARABIC LETTER MEEM -->
         <Key
-            latin:keyLabel="\u0645" />
-        <!-- \u0643: "ك" ARABIC LETTER KAF
-             \u06af: "گ" ARABIC LETTER GAF
-             \u06a9: "ک" ARABIC LETTER KEHEH -->
+            latin:keyLabel="&#x0645;" />
+        <!-- U+0643: "ك" ARABIC LETTER KAF
+             U+06AF: "گ" ARABIC LETTER GAF
+             U+06A9: "ک" ARABIC LETTER KEHEH -->
         <Key
-            latin:keyLabel="\u0643"
-            latin:moreKeys="\u06af,\u06a9" />
-        <!-- \u0637: "ط" ARABIC LETTER TAH -->
+            latin:keyLabel="&#x0643;"
+            latin:moreKeys="&#x06AF;,&#x06A9;" />
+        <!-- U+0637: "ط" ARABIC LETTER TAH -->
         <Key
-            latin:keyLabel="\u0637" />
+            latin:keyLabel="&#x0637;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-14.6%p"
@@ -151,41 +151,41 @@
     >
         <include
             latin:keyboardLayout="@xml/key_smiley" />
-        <!-- \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
+        <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="\u0626" />
-        <!-- \u0621: "ء" ARABIC LETTER HAMZA -->
+            latin:keyLabel="&#x0626;" />
+        <!-- U+0621: "ء" ARABIC LETTER HAMZA -->
         <Key
-            latin:keyLabel="\u0621" />
-        <!-- \u0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
+            latin:keyLabel="&#x0621;" />
+        <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="\u0624" />
-        <!-- \u0631: "ر" ARABIC LETTER REH -->
+            latin:keyLabel="&#x0624;" />
+        <!-- U+0631: "ر" ARABIC LETTER REH -->
         <Key
-            latin:keyLabel="\u0631" />
-        <!-- \u0630: "ذ" ARABIC LETTER THAL -->
+            latin:keyLabel="&#x0631;" />
+        <!-- U+0630: "ذ" ARABIC LETTER THAL -->
         <Key
-            latin:keyLabel="\u0630" />
-        <!-- \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+            latin:keyLabel="&#x0630;" />
+        <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
         <Key
-            latin:keyLabel="\u0649" />
-        <!-- \u0629: "ة" ARABIC LETTER TEH MARBUTA -->
+            latin:keyLabel="&#x0649;" />
+        <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
         <Key
-            latin:keyLabel="\u0629" />
-        <!-- \u0648: "و" ARABIC LETTER WAW -->
+            latin:keyLabel="&#x0629;" />
+        <!-- U+0648: "و" ARABIC LETTER WAW -->
         <Key
-            latin:keyLabel="\u0648" />
-        <!-- \u0632: "ز" ARABIC LETTER ZAIN
-             \u0698: "ژ" ARABIC LETTER JEH -->
+            latin:keyLabel="&#x0648;" />
+        <!-- U+0632: "ز" ARABIC LETTER ZAIN
+             U+0698: "ژ" ARABIC LETTER JEH -->
         <Key
-            latin:keyLabel="\u0632"
-            latin:moreKeys="\u0698" />
-        <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
+            latin:keyLabel="&#x0632;"
+            latin:moreKeys="&#x0698;" />
+        <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
         <Key
-            latin:keyLabel="\u0638" />
-        <!-- \u062f: "د" ARABIC LETTER DAL -->
+            latin:keyLabel="&#x0638;" />
+        <!-- U+062F: "د" ARABIC LETTER DAL -->
         <Key
-            latin:keyLabel="\u062f" />
+            latin:keyLabel="&#x062F;" />
     </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 5547663..87a273c 100644
--- a/java/res/xml-sw600dp/rows_bulgarian.xml
+++ b/java/res/xml-sw600dp/rows_bulgarian.xml
@@ -26,40 +26,41 @@
     <Row
         latin:keyWidth="7.692%p"
     >
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+            latin:keyLabel="&#x0447;" />
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+            latin:keyLabel="&#x0448;" />
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+            latin:keyLabel="&#x0435;" />
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+            latin:keyLabel="&#x0440;" />
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442" />
-        <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+            latin:keyLabel="&#x0442;" />
+        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="\u044a" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+            latin:keyLabel="&#x044A;" />
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443" />
-        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+            latin:keyLabel="&#x0443;" />
+        <!-- U+0438: "и" CYRILLIC SMALL LETTER I
+             U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
         <Key
-            latin:keyLabel="\u0438"
-            latin:moreKeys="ѝ" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+            latin:keyLabel="&#x0438;"
+            latin:moreKeys="&#x045D;" />
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+            latin:keyLabel="&#x043E;" />
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f" />
-        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+            latin:keyLabel="&#x043F;" />
+        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="\u044f" />
+            latin:keyLabel="&#x044F;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -67,40 +68,40 @@
     <Row
         latin:keyWidth="7.692%p"
     >
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430"
+            latin:keyLabel="&#x0430;"
             latin:keyXPos="4.000%p" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+            latin:keyLabel="&#x0444;" />
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+            latin:keyLabel="&#x0433;" />
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445" />
-        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+            latin:keyLabel="&#x0445;" />
+        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="\u0439" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+            latin:keyLabel="&#x0439;" />
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+            latin:keyLabel="&#x043A;" />
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
         <Key
-            latin:keyLabel="\u0449" />
-        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+            latin:keyLabel="&#x0449;" />
+        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="\u044c" />
+            latin:keyLabel="&#x044C;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -111,30 +112,30 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.000%p" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0437;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+            latin:keyLabel="&#x0436;" />
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+            latin:keyLabel="&#x0446;" />
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x043D;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
-        <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+            latin:keyLabel="&#x043C;" />
+        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="\u044e" />
+            latin:keyLabel="&#x044E;" />
         <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 8a7d706..82175f7 100644
--- a/java/res/xml-sw600dp/rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -28,30 +28,30 @@
     >
         <include
             latin:keyboardLayout="@xml/keys_apostrophe_dash" />
-        <!-- \u05e7: "ק" HEBREW LETTER QOF -->
+        <!-- U+05E7: "ק" HEBREW LETTER QOF -->
         <Key
-            latin:keyLabel="\u05e7" />
-        <!-- \u05e8: "ר" HEBREW LETTER RESH -->
+            latin:keyLabel="&#x05E7;" />
+        <!-- U+05E8: "ר" HEBREW LETTER RESH -->
         <Key
-            latin:keyLabel="\u05e8" />
-        <!-- \u05d0: "א" HEBREW LETTER ALEF -->
+            latin:keyLabel="&#x05E8;" />
+        <!-- U+05D0: "א" HEBREW LETTER ALEF -->
         <Key
-            latin:keyLabel="\u05d0" />
-        <!-- \u05d8: "ט" HEBREW LETTER TET -->
+            latin:keyLabel="&#x05D0;" />
+        <!-- U+05D8: "ט" HEBREW LETTER TET -->
         <Key
-            latin:keyLabel="\u05d8" />
-        <!-- \u05d5: "ו" HEBREW LETTER VAV -->
+            latin:keyLabel="&#x05D8;" />
+        <!-- U+05D5: "ו" HEBREW LETTER VAV -->
         <Key
-            latin:keyLabel="\u05d5" />
-        <!-- \u05df: "ן" HEBREW LETTER FINAL NUN -->
+            latin:keyLabel="&#x05D5;" />
+        <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
         <Key
-            latin:keyLabel="\u05df" />
-        <!-- \u05dd: "ם" HEBREW LETTER FINAL MEM -->
+            latin:keyLabel="&#x05DF;" />
+        <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
         <Key
-            latin:keyLabel="\u05dd" />
-        <!-- \u05e4: "פ" HEBREW LETTER PE -->
+            latin:keyLabel="&#x05DD;" />
+        <!-- U+05E4: "פ" HEBREW LETTER PE -->
         <Key
-            latin:keyLabel="\u05e4" />
+            latin:keyLabel="&#x05E4;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-12.000%p"
@@ -60,40 +60,43 @@
     <Row
         latin:keyWidth="9.0%p"
     >
-        <!-- \u05e9: "ש" HEBREW LETTER SHIN -->
+        <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
         <Key
-            latin:keyLabel="\u05e9"
+            latin:keyLabel="&#x05E9;"
             latin:keyXPos="4.500%p" />
-        <!-- \u05d3: "ד" HEBREW LETTER DALET -->
+        <!-- U+05D3: "ד" HEBREW LETTER DALET -->
         <Key
-            latin:keyLabel="\u05d3" />
-        <!-- \u05d2: "ג" HEBREW LETTER GIMEL -->
+            latin:keyLabel="&#x05D3;" />
+        <!-- U+05D2: "ג" HEBREW LETTER GIMEL
+             U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d2"
-            latin:moreKeys="ג׳" />
-        <!-- \u05db: "כ" HEBREW LETTER KAF -->
+            latin:keyLabel="&#x05D2;"
+            latin:moreKeys="&#x05D2;&#x05F3;" />
+        <!-- U+05DB: "כ" HEBREW LETTER KAF -->
         <Key
-            latin:keyLabel="\u05db" />
-        <!-- \u05e2: "ע" HEBREW LETTER AYIN -->
+            latin:keyLabel="&#x05DB;" />
+        <!-- U+05E2: "ע" HEBREW LETTER AYIN -->
         <Key
-            latin:keyLabel="\u05e2" />
-        <!-- \u05d9: "י" HEBREW LETTER YOD -->
+            latin:keyLabel="&#x05E2;" />
+        <!-- U+05D9: "י" HEBREW LETTER YOD
+             U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
         <Key
-            latin:keyLabel="\u05d9"
-            latin:moreKeys="ײַ" />
-        <!-- \u05d7: "ח" HEBREW LETTER HET -->
+            latin:keyLabel="&#x05D9;"
+            latin:moreKeys="&#x05F2;&#x05B7;" />
+        <!-- U+05D7: "ח" HEBREW LETTER HET
+             U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d7"
-            latin:moreKeys="ח׳" />
-        <!-- \u05dc: "ל" HEBREW LETTER LAMED -->
+            latin:keyLabel="&#x05D7;"
+            latin:moreKeys="&#x05D7;&#x05F3;" />
+        <!-- U+05DC: "ל" HEBREW LETTER LAMED -->
         <Key
-            latin:keyLabel="\u05dc" />
-        <!-- \u05da: "ך" HEBREW LETTER FINAL KAF -->
+            latin:keyLabel="&#x05DC;" />
+        <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
         <Key
-            latin:keyLabel="\u05da" />
-        <!-- \u05e3: "ף" HEBREW LETTER FINAL PE -->
+            latin:keyLabel="&#x05DA;" />
+        <!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
         <Key
-            latin:keyLabel="\u05e3" />
+            latin:keyLabel="&#x05E3;" />
     </Row>
     <Row
         latin:keyWidth="8.9%p"
@@ -101,37 +104,41 @@
         <include
             latin:keyboardLayout="@xml/key_smiley"
             latin:keyWidth="10.0%p" />
-        <!-- \u05d6: "ז" HEBREW LETTER ZAYIN -->
+        <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
+             U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d6"
-            latin:moreKeys="ז׳" />
-        <!-- \u05e1: "ס" HEBREW LETTER SAMEKH -->
+            latin:keyLabel="&#x05D6;"
+            latin:moreKeys="&#x05D6;&#x05F3;" />
+        <!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
         <Key
-            latin:keyLabel="\u05e1" />
-        <!-- \u05d1: "ב" HEBREW LETTER BET -->
+            latin:keyLabel="&#x05E1;" />
+        <!-- U+05D1: "ב" HEBREW LETTER BET -->
         <Key
-            latin:keyLabel="\u05d1" />
-        <!-- \u05d4: "ה" HEBREW LETTER HE -->
+            latin:keyLabel="&#x05D1;" />
+        <!-- U+05D4: "ה" HEBREW LETTER HE -->
         <Key
-            latin:keyLabel="\u05d4" />
-        <!-- \u05e0: "נ" HEBREW LETTER NUN -->
+            latin:keyLabel="&#x05D4;" />
+        <!-- U+05E0: "נ" HEBREW LETTER NUN -->
         <Key
-            latin:keyLabel="\u05e0" />
-        <!-- \u05de: "מ" HEBREW LETTER MEM -->
+            latin:keyLabel="&#x05E0;" />
+        <!-- U+05DE: "מ" HEBREW LETTER MEM -->
         <Key
-            latin:keyLabel="\u05de" />
-        <!-- \u05e6: "צ" HEBREW LETTER TSADI -->
+            latin:keyLabel="&#x05DE;" />
+        <!-- U+05E6: "צ" HEBREW LETTER TSADI
+             U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05e6"
-            latin:moreKeys="צ׳" />
-        <!-- \u05ea: "ת" HEBREW LETTER TAV -->
+            latin:keyLabel="&#x05E6;"
+            latin:moreKeys="&#x05E6;&#x05F3;" />
+        <!-- U+05EA: "ת" HEBREW LETTER TAV
+             U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05ea"
-            latin:moreKeys="ת׳" />
-        <!-- \u05e5: "ץ" HEBREW LETTER FINAL TSADI -->
+            latin:keyLabel="&#x05EA;"
+            latin:moreKeys="&#x05EA;&#x05F3;" />
+        <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
+             U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05e5"
-            latin:moreKeys="ץ׳" />
+            latin:keyLabel="&#x05E5;"
+            latin:moreKeys="&#x05E5;&#x05F3;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-10.400%p"
diff --git a/java/res/xml-sw600dp/rows_serbian.xml b/java/res/xml-sw600dp/rows_serbian.xml
index 8f2dc8d..5730aa0 100644
--- a/java/res/xml-sw600dp/rows_serbian.xml
+++ b/java/res/xml-sw600dp/rows_serbian.xml
@@ -26,40 +26,40 @@
     <Row
         latin:keyWidth="8.0%p"
     >
-        <!-- \u0459: "љ" CYRILLIC SMALL LETTER LJE -->
+        <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
         <Key
-            latin:keyLabel="\u0459"
+            latin:keyLabel="&#x0459;"
             latin:keyXPos="2.15%p" />
-        <!-- \u045a: "њ" CYRILLIC SMALL LETTER NJE -->
+        <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
         <Key
-            latin:keyLabel="\u045a" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+            latin:keyLabel="&#x045A;" />
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+            latin:keyLabel="&#x0435;" />
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+            latin:keyLabel="&#x0440;" />
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+            latin:keyLabel="&#x0442;" />
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+            latin:keyLabel="&#x0437;" />
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443" />
-        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+            latin:keyLabel="&#x0443;" />
+        <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
         <Key
-            latin:keyLabel="\u0438" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+            latin:keyLabel="&#x0438;" />
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+            latin:keyLabel="&#x043E;" />
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+            latin:keyLabel="&#x043F;" />
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448" />
+            latin:keyLabel="&#x0448;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -68,39 +68,39 @@
     <Row
         latin:keyWidth="7.9%p"
     >
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+            latin:keyLabel="&#x0444;" />
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+            latin:keyLabel="&#x0433;" />
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445" />
-        <!-- \u0458: "ј" CYRILLIC SMALL LETTER JE -->
+            latin:keyLabel="&#x0445;" />
+        <!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->
         <Key
-            latin:keyLabel="\u0458" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+            latin:keyLabel="&#x0458;" />
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+            latin:keyLabel="&#x043A;" />
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447" />
-        <!-- \u045b: "ћ" CYRILLIC SMALL LETTER TSHE -->
+            latin:keyLabel="&#x0447;" />
+        <!-- U+045B: "ћ" CYRILLIC SMALL LETTER TSHE -->
         <Key
-            latin:keyLabel="\u045b" />
+            latin:keyLabel="&#x045B;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-14.6%p"
@@ -112,33 +112,33 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="8.0%p" />
-        <!-- \u0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
+        <!-- U+0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
         <Key
-            latin:keyLabel="\u0455" />
-        <!-- \u045f: "џ" CYRILLIC SMALL LETTER DZHE -->
+            latin:keyLabel="&#x0455;" />
+        <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
         <Key
-            latin:keyLabel="\u045f" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+            latin:keyLabel="&#x045F;" />
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+            latin:keyLabel="&#x0446;" />
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x043D;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
-        <!-- \u0452: "ђ" CYRILLIC SMALL LETTER DJE -->
+            latin:keyLabel="&#x043C;" />
+        <!-- U+0452: "ђ" CYRILLIC SMALL LETTER DJE -->
         <Key
-            latin:keyLabel="\u0452" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0452;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
+            latin:keyLabel="&#x0436;" />
         <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 4ca15f6..58f0b39 100644
--- a/java/res/xml-sw600dp/rows_slavic.xml
+++ b/java/res/xml-sw600dp/rows_slavic.xml
@@ -26,44 +26,44 @@
     <Row
         latin:keyWidth="7.60%p"
     >
-        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="\u0439" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+            latin:keyLabel="&#x0439;" />
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+            latin:keyLabel="&#x0446;" />
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443"
+            latin:keyLabel="&#x0443;"
             latin:moreKeys="@string/more_keys_for_slavic_u" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+            latin:keyLabel="&#x043A;" />
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435"
+            latin:keyLabel="&#x0435;"
             latin:moreKeys="@string/more_keys_for_slavic_ye" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d"
+            latin:keyLabel="&#x043D;"
             latin:moreKeys="@string/more_keys_for_slavic_en" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+            latin:keyLabel="&#x0433;" />
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448" />
+            latin:keyLabel="&#x0448;" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_shcha" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+            latin:keyLabel="&#x0437;" />
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445" />
-        <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+            latin:keyLabel="&#x0445;" />
+        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="\u044a" />
+            latin:keyLabel="&#x044A;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -72,41 +72,41 @@
     <Row
         latin:keyWidth="7.60%p"
     >
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444"
+            latin:keyLabel="&#x0444;"
             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 -->
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+            latin:keyLabel="&#x043F;" />
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+            latin:keyLabel="&#x0440;" />
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e"
+            latin:keyLabel="&#x043E;"
             latin:moreKeys="@string/more_keys_for_slavic_o" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
-        <!-- \u044d: "э" CYRILLIC SMALL LETTER E -->
+            latin:keyLabel="&#x0436;" />
+        <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
         <Key
-            latin:keyLabel="\u044d" />
+            latin:keyLabel="&#x044D;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-14.6%p"
@@ -117,32 +117,32 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle" />
-        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="\u044f" />
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+            latin:keyLabel="&#x044F;" />
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0447;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
+            latin:keyLabel="&#x043C;" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_i" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442" />
-        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+            latin:keyLabel="&#x0442;" />
+        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="\u044c" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+            latin:keyLabel="&#x044C;" />
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="\u044e" />
+            latin:keyLabel="&#x044E;" />
         <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 d7af5b1..b6df257 100644
--- a/java/res/xml-sw600dp/rows_spanish.xml
+++ b/java/res/xml-sw600dp/rows_spanish.xml
@@ -53,9 +53,9 @@
         <Key
             latin:keyLabel="l"
             latin:moreKeys="@string/more_keys_for_l" />
-        <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
+        <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
         <Key
-            latin:keyLabel="\u00f1" />
+            latin:keyLabel="&#x00F1;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-14.6%p"
diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
index ce6e539..448e3bb 100644
--- a/java/res/xml-sw600dp/rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -133,9 +133,10 @@
             latin:moreKeys="@string/more_keys_for_comma" />
         <Key
             latin:keyLabel="." />
+        <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
         <Key
             latin:keyLabel="!"
-            latin:moreKeys="¡" />
+            latin:moreKeys="&#x00A1;" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_question"
             latin:moreKeys="@string/more_keys_for_symbols_question" />
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index 960d3d0..05824b9 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -34,32 +34,32 @@
             latin:keyLabel="`" />
         <Key
             latin:keyLabel="|" />
-        <!-- \u2022: "•" BULLET -->
+        <!-- U+2022: "•" BULLET -->
         <Key
-            latin:keyLabel="\u2022"
+            latin:keyLabel="&#x2022;"
             latin:moreKeys="@string/more_keys_for_bullet" />
-        <!-- \u221a: "√" SQUARE ROOT -->
+        <!-- U+221A: "√" SQUARE ROOT -->
         <Key
-            latin:keyLabel="\u221a" />
-        <!-- \u03c0: "π" GREEK SMALL LETTER PI
-             \u03a0: "Π" GREEK CAPITAL LETTER PI -->
+            latin:keyLabel="&#x221A;" />
+        <!-- U+03C0: "π" GREEK SMALL LETTER PI
+             U+03A0: "Π" GREEK CAPITAL LETTER PI -->
         <Key
-            latin:keyLabel="\u03c0"
-            latin:moreKeys="\u03a0" />
-        <!-- \u00f7: "÷" DIVISION SIGN -->
+            latin:keyLabel="&#x03C0;"
+            latin:moreKeys="&#x03A0;" />
+        <!-- U+00F7: "÷" DIVISION SIGN -->
         <Key
-            latin:keyLabel="\u00f7" />
-        <!-- \u00d7: "×" MULTIPLICATION SIGN -->
+            latin:keyLabel="&#x00F7;" />
+        <!-- U+00D7: "×" MULTIPLICATION SIGN -->
         <Key
-            latin:keyLabel="\u00d7" />
-        <!-- \u00a7: "§" SECTION SIGN
-             \u00b6: "¶" PILCROW SIGN -->
+            latin:keyLabel="&#x00D7;" />
+        <!-- U+00A7: "§" SECTION SIGN
+             U+00B6: "¶" PILCROW SIGN -->
         <Key
-            latin:keyLabel="\u00a7"
-            latin:moreKeys="\u00b6" />
-        <!-- \u0394: "Δ" GREEK CAPITAL LETTER DELTA -->
+            latin:keyLabel="&#x00A7;"
+            latin:moreKeys="&#x00B6;" />
+        <!-- U+0394: "Δ" GREEK CAPITAL LETTER DELTA -->
         <Key
-            latin:keyLabel="\u0394" />
+            latin:keyLabel="&#x0394;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -68,9 +68,9 @@
     <Row
         latin:keyWidth="9.0%p"
     >
-        <!-- \u00a3: "£" POUND SIGN -->
+        <!-- U+00A3: "£" POUND SIGN -->
         <Key
-            latin:keyLabel="\u00a3"
+            latin:keyLabel="&#x00A3;"
             latin:keyXPos="4.5%p" />
         <Key
             latin:keyStyle="moreCurrency1KeyStyle" />
@@ -78,24 +78,24 @@
             latin:keyStyle="moreCurrency2KeyStyle" />
         <Key
             latin:keyStyle="moreCurrency3KeyStyle" />
-        <!-- \u2191: "↑" UPWARDS ARROW
-             \u2193: "↓" DOWNWARDS ARROW
-             \u2190: "←" LEFTWARDS ARROW
-             \u2192: "→" RIGHTWARDS ARROW -->
+        <!-- U+2191: "↑" UPWARDS ARROW
+             U+2193: "↓" DOWNWARDS ARROW
+             U+2190: "←" LEFTWARDS ARROW
+             U+2192: "→" RIGHTWARDS ARROW -->
         <Key
             latin:keyLabel="^"
-            latin:moreKeys="\u2191,\u2193,\u2190,\u2192" />
-        <!-- \u00b0: "°" DEGREE SIGN
-             \u2032: "′" PRIME
-             \u2033: "″" DOUBLE PRIME -->
+            latin:moreKeys="&#x2191;,&#x2193;,&#x2190;,&#x2192;" />
+        <!-- U+00B0: "°" DEGREE SIGN
+             U+2032: "′" PRIME
+             U+2033: "″" DOUBLE PRIME -->
         <Key
-            latin:keyLabel="\u00b0"
-            latin:moreKeys="\u2032,\u2033" />
-        <!-- \u00b1: "±" PLUS-MINUS SIGN
-             \u221e: "∞" INFINITY -->
+            latin:keyLabel="&#x00B0;"
+            latin:moreKeys="&#x2032;,&#x2033;" />
+        <!-- U+00B1: "±" PLUS-MINUS SIGN
+             U+221E: "∞" INFINITY -->
         <Key
-            latin:keyLabel="\u00b1"
-            latin:moreKeys="\u221e" />
+            latin:keyLabel="&#x00B1;"
+            latin:moreKeys="&#x221E;" />
         <include
             latin:keyboardLayout="@xml/keys_curly_brackets" />
         <Key
@@ -111,26 +111,26 @@
             latin:keyWidth="10.0%p" />
         <Key
             latin:keyLabel="\\" />
-        <!-- \u00a9: "©" COPYRIGHT SIGN -->
+        <!-- U+00A9: "©" COPYRIGHT SIGN -->
         <Key
-            latin:keyLabel="\u00a9" />
-        <!-- \u00ae: "®" REGISTERED SIGN -->
+            latin:keyLabel="&#x00A9;" />
+        <!-- U+00AE: "®" REGISTERED SIGN -->
         <Key
-            latin:keyLabel="\u00ae" />
-        <!-- \u2122: "™" TRADE MARK SIGN -->
+            latin:keyLabel="&#x00AE;" />
+        <!-- U+2122: "™" TRADE MARK SIGN -->
         <Key
-            latin:keyLabel="\u2122" />
-        <!-- \u2105: "℅" CARE OF -->
+            latin:keyLabel="&#x2122;" />
+        <!-- U+2105: "℅" CARE OF -->
         <Key
-            latin:keyLabel="\u2105" />
+            latin:keyLabel="&#x2105;" />
         <include
             latin:keyboardLayout="@xml/keys_square_brackets" />
-        <!-- \u00a1: "¡" INVERTED EXCLAMATION MARK -->
+        <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
         <Key
-            latin:keyLabel="\u00a1" />
-        <!-- \u00bf: "¿" INVERTED QUESTION MARK -->
+            latin:keyLabel="&#x00A1;" />
+        <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
         <Key
-            latin:keyLabel="\u00bf" />
+            latin:keyLabel="&#x00BF;" />
     </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 8720217..ac6e459 100644
--- a/java/res/xml-sw768dp/rows_arabic.xml
+++ b/java/res/xml-sw768dp/rows_arabic.xml
@@ -30,53 +30,53 @@
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="7.500%p" />
-        <!-- \u0636: "ض" ARABIC LETTER DAD -->
+        <!-- U+0636: "ض" ARABIC LETTER DAD -->
         <Key
-            latin:keyLabel="\u0636" />
-        <!-- \u0635: "ص" ARABIC LETTER SAD -->
+            latin:keyLabel="&#x0636;" />
+        <!-- U+0635: "ص" ARABIC LETTER SAD -->
         <Key
-            latin:keyLabel="\u0635" />
-        <!-- \u062b: "ث" ARABIC LETTER THEH -->
+            latin:keyLabel="&#x0635;" />
+        <!-- U+062B: "ث" ARABIC LETTER THEH -->
         <Key
-            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 -->
+            latin:keyLabel="&#x062B;" />
+        <!-- U+0642: "ق" ARABIC LETTER QAF
+             U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
         <Key
-            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 -->
+            latin:keyLabel="&#x0642;"
+            latin:moreKeys="&#x06A8;" />
+        <!-- U+0641: "ف" ARABIC LETTER FEH
+             U+06A4: "ڤ" ARABIC LETTER VEH
+             U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
+             U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
         <Key
-            latin:keyLabel="\u0641"
-            latin:moreKeys="\u06a4,\u06a2,\u06a5" />
-        <!-- \u063a: "غ" ARABIC LETTER GHAIN -->
+            latin:keyLabel="&#x0641;"
+            latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" />
+        <!-- U+063A: "غ" ARABIC LETTER GHAIN -->
         <Key
-            latin:keyLabel="\u063a" />
-        <!-- \u0639: "ع" ARABIC LETTER AIN -->
+            latin:keyLabel="&#x063A;" />
+        <!-- U+0639: "ع" ARABIC LETTER AIN -->
         <Key
-            latin:keyLabel="\u0639" />
-        <!-- \u0647: "ه" ARABIC LETTER HEH
-             \ufeeb: "ﻫ" ARABIC LETTER HEH INITIAL FORM
-             \u0647\u200d: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
+            latin:keyLabel="&#x0639;" />
+        <!-- U+0647: "ه" ARABIC LETTER HEH
+             U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+             U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
         <Key
-            latin:keyLabel="\u0647"
-            latin:moreKeys="\ufeeb|\u0647\u200d" />
-        <!-- \u062e: "خ" ARABIC LETTER KHAH -->
+            latin:keyLabel="&#x0647;"
+            latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" />
+        <!-- U+062E: "خ" ARABIC LETTER KHAH -->
         <Key
-            latin:keyLabel="\u062e" />
-        <!-- \u062d: "ح" ARABIC LETTER HAH -->
+            latin:keyLabel="&#x062E;" />
+        <!-- U+062D: "ح" ARABIC LETTER HAH -->
         <Key
-            latin:keyLabel="\u062d" />
-        <!-- \u062c: "ج" ARABIC LETTER JEEM
-             \u0686: "چ" ARABIC LETTER TCHEH -->
+            latin:keyLabel="&#x062D;" />
+        <!-- U+062C: "ج" ARABIC LETTER JEEM
+             U+0686: "چ" ARABIC LETTER TCHEH -->
         <Key
-            latin:keyLabel="\u062c"
-            latin:moreKeys="\u0686" />
+            latin:keyLabel="&#x062C;"
+            latin:moreKeys="&#x0686;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-11.500%p"
@@ -89,64 +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 -->
-        <!-- TODO: DroidSansArabic lacks the glyph of \u069c ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- U+0634: "ش" ARABIC LETTER SHEEN
+             U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="\u0634"
-            latin:moreKeys="\u069c" />
-        <!-- \u0633: "س" ARABIC LETTER SEEN -->
+            latin:keyLabel="&#x0634;"
+            latin:moreKeys="&#x069C;" />
+        <!-- U+0633: "س" ARABIC LETTER SEEN -->
         <Key
-            latin:keyLabel="\u0633" />
-        <!-- \u064a: "ي" ARABIC LETTER YEH
-             \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
-             \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+            latin:keyLabel="&#x0633;" />
+        <!-- U+064A: "ي" ARABIC LETTER YEH
+             U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+             U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
         <Key
-            latin:keyLabel="\u064a"
-            latin:moreKeys="\u0626,\u0649" />
-        <!-- \u0628: "ب" ARABIC LETTER BEH
-             \u067e: "پ" ARABIC LETTER PEH -->
+            latin:keyLabel="&#x064A;"
+            latin:moreKeys="&#x0626;,&#x0649;" />
+        <!-- U+0628: "ب" ARABIC LETTER BEH
+             U+067E: "پ" 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 -->
+            latin:keyLabel="&#x0628;"
+            latin:moreKeys="&#x067E;" />
+        <!-- U+0644: "ل" ARABIC LETTER LAM
+             U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+             U+0627: "ا" ARABIC LETTER ALEF
+             U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+             U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+             U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+             U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+             U+0622: "آ" 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 -->
+            latin:keyLabel="&#x0644;"
+            latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;" />
+        <!-- U+0627: "ا" ARABIC LETTER ALEF
+             U+0621: "ء" ARABIC LETTER HAMZA
+             U+0671: "ٱ" ARABIC LETTER ALEF WASLA
+             U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+             U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
         <Key
-            latin:keyLabel="\u0627"
-            latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
-        <!-- \u062a: "ت" ARABIC LETTER TEH -->
+            latin:keyLabel="&#x0627;"
+            latin:moreKeys="&#x0621;,&#x0671;,&#x0623;,&#x0625;,&#x0622;" />
+        <!-- U+062A: "ت" ARABIC LETTER TEH -->
         <Key
-            latin:keyLabel="\u062a" />
-        <!-- \u0646: "ن" ARABIC LETTER NOON -->
+            latin:keyLabel="&#x062A;" />
+        <!-- U+0646: "ن" ARABIC LETTER NOON -->
         <Key
-            latin:keyLabel="\u0646" />
-        <!-- \u0645: "م" ARABIC LETTER MEEM -->
+            latin:keyLabel="&#x0646;" />
+        <!-- U+0645: "م" ARABIC LETTER MEEM -->
         <Key
-            latin:keyLabel="\u0645" />
-        <!-- \u0643: "ك" ARABIC LETTER KAF
-             \u06af: "گ" ARABIC LETTER GAF -->
+            latin:keyLabel="&#x0645;" />
+        <!-- U+0643: "ك" ARABIC LETTER KAF
+             U+06AF: "گ" ARABIC LETTER GAF -->
         <Key
-            latin:keyLabel="\u0643"
-            latin:moreKeys="\u06af" />
-        <!-- \u0637: "ط" ARABIC LETTER TAH -->
+            latin:keyLabel="&#x0643;"
+            latin:moreKeys="&#x06AF;" />
+        <!-- U+0637: "ط" ARABIC LETTER TAH -->
         <Key
-            latin:keyLabel="\u0637" />
+            latin:keyLabel="&#x0637;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-9.375%p"
@@ -155,42 +155,42 @@
     <Row
         latin:keyWidth="7.375%p"
     >
-        <!-- \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
+        <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="\u0626"
+            latin:keyLabel="&#x0626;"
             latin:keyXPos="12.750%p" />
-        <!-- \u0621: "ء" ARABIC LETTER HAMZA -->
+        <!-- U+0621: "ء" ARABIC LETTER HAMZA -->
         <Key
-            latin:keyLabel="\u0621" />
-        <!-- \u0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
+            latin:keyLabel="&#x0621;" />
+        <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="\u0624" />
-        <!-- \u0631: "ر" ARABIC LETTER REH -->
+            latin:keyLabel="&#x0624;" />
+        <!-- U+0631: "ر" ARABIC LETTER REH -->
         <Key
-            latin:keyLabel="\u0631" />
-        <!-- \u0630: "ذ" ARABIC LETTER THAL -->
+            latin:keyLabel="&#x0631;" />
+        <!-- U+0630: "ذ" ARABIC LETTER THAL -->
         <Key
-            latin:keyLabel="\u0630" />
-        <!-- \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+            latin:keyLabel="&#x0630;" />
+        <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
         <Key
-            latin:keyLabel="\u0649" />
-        <!-- \u0629: "ة" ARABIC LETTER TEH MARBUTA -->
+            latin:keyLabel="&#x0649;" />
+        <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
         <Key
-            latin:keyLabel="\u0629" />
-        <!-- \u0648: "و" ARABIC LETTER WAW -->
+            latin:keyLabel="&#x0629;" />
+        <!-- U+0648: "و" ARABIC LETTER WAW -->
         <Key
-            latin:keyLabel="\u0648" />
-        <!-- \u0632: "ز" ARABIC LETTER ZAIN
-             \u0698: "ژ" ARABIC LETTER JEH -->
+            latin:keyLabel="&#x0648;" />
+        <!-- U+0632: "ز" ARABIC LETTER ZAIN
+             U+0698: "ژ" ARABIC LETTER JEH -->
         <Key
-            latin:keyLabel="\u0632"
-            latin:moreKeys="\u0698" />
-        <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
+            latin:keyLabel="&#x0632;"
+            latin:moreKeys="&#x0698;" />
+        <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
         <Key
-            latin:keyLabel="\u0638" />
-        <!-- \u062f: "د" ARABIC LETTER DAL -->
+            latin:keyLabel="&#x0638;" />
+        <!-- U+062F: "د" ARABIC LETTER DAL -->
         <Key
-            latin:keyLabel="\u062f" />
+            latin:keyLabel="&#x062F;" />
     </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 844744e..0204dae 100644
--- a/java/res/xml-sw768dp/rows_bulgarian.xml
+++ b/java/res/xml-sw768dp/rows_bulgarian.xml
@@ -29,40 +29,41 @@
         <Key
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft" />
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+            latin:keyLabel="&#x0447;" />
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+            latin:keyLabel="&#x0448;" />
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+            latin:keyLabel="&#x0435;" />
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+            latin:keyLabel="&#x0440;" />
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442" />
-        <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+            latin:keyLabel="&#x0442;" />
+        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="\u044a" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+            latin:keyLabel="&#x044A;" />
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443" />
-        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+            latin:keyLabel="&#x0443;" />
+        <!-- U+0438: "и" CYRILLIC SMALL LETTER I
+             U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
         <Key
-            latin:keyLabel="\u0438"
-            latin:moreKeys="ѝ" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+            latin:keyLabel="&#x0438;"
+            latin:moreKeys="&#x045D;" />
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+            latin:keyLabel="&#x043E;" />
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f" />
-        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+            latin:keyLabel="&#x043F;" />
+        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="\u044f" />
+            latin:keyLabel="&#x044F;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -74,39 +75,39 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="9.375%p" />
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+            latin:keyLabel="&#x0444;" />
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+            latin:keyLabel="&#x0433;" />
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445" />
-        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+            latin:keyLabel="&#x0445;" />
+        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="\u0439" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+            latin:keyLabel="&#x0439;" />
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+            latin:keyLabel="&#x043A;" />
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
         <Key
-            latin:keyLabel="\u0449" />
-        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+            latin:keyLabel="&#x0449;" />
+        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="\u044c" />
+            latin:keyLabel="&#x044C;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -117,30 +118,30 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="14.375%p" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0437;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+            latin:keyLabel="&#x0436;" />
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+            latin:keyLabel="&#x0446;" />
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x043D;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
-        <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+            latin:keyLabel="&#x043C;" />
+        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="\u044e" />
+            latin:keyLabel="&#x044E;" />
         <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 a2090ae..c725ee6 100644
--- a/java/res/xml-sw768dp/rows_hebrew.xml
+++ b/java/res/xml-sw768dp/rows_hebrew.xml
@@ -32,30 +32,30 @@
             latin:keyWidth="7.969%p" />
         <include
             latin:keyboardLayout="@xml/keys_apostrophe_dash" />
-        <!-- \u05e7: "ק" HEBREW LETTER QOF -->
+        <!-- U+05E7: "ק" HEBREW LETTER QOF -->
         <Key
-            latin:keyLabel="\u05e7" />
-        <!-- \u05e8: "ר" HEBREW LETTER RESH -->
+            latin:keyLabel="&#x05E7;" />
+        <!-- U+05E8: "ר" HEBREW LETTER RESH -->
         <Key
-            latin:keyLabel="\u05e8" />
-        <!-- \u05d0: "א" HEBREW LETTER ALEF -->
+            latin:keyLabel="&#x05E8;" />
+        <!-- U+05D0: "א" HEBREW LETTER ALEF -->
         <Key
-            latin:keyLabel="\u05d0" />
-        <!-- \u05d8: "ט" HEBREW LETTER TET -->
+            latin:keyLabel="&#x05D0;" />
+        <!-- U+05D8: "ט" HEBREW LETTER TET -->
         <Key
-            latin:keyLabel="\u05d8" />
-        <!-- \u05d5: "ו" HEBREW LETTER VAV -->
+            latin:keyLabel="&#x05D8;" />
+        <!-- U+05D5: "ו" HEBREW LETTER VAV -->
         <Key
-            latin:keyLabel="\u05d5" />
-        <!-- \u05df: "ן" HEBREW LETTER FINAL NUN -->
+            latin:keyLabel="&#x05D5;" />
+        <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
         <Key
-            latin:keyLabel="\u05df" />
-        <!-- \u05dd: "ם" HEBREW LETTER FINAL MEM -->
+            latin:keyLabel="&#x05DF;" />
+        <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
         <Key
-            latin:keyLabel="\u05dd" />
-        <!-- \u05e4: "פ" HEBREW LETTER PE -->
+            latin:keyLabel="&#x05DD;" />
+        <!-- U+05E4: "פ" HEBREW LETTER PE -->
         <Key
-            latin:keyLabel="\u05e4" />
+            latin:keyLabel="&#x05E4;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-12.000%p"
@@ -68,75 +68,82 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="11.172%p" />
-        <!-- \u05e9: "ש" HEBREW LETTER SHIN -->
+        <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
         <Key
-            latin:keyLabel="\u05e9" />
-        <!-- \u05d3: "ד" HEBREW LETTER DALET -->
+            latin:keyLabel="&#x05E9;" />
+        <!-- U+05D3: "ד" HEBREW LETTER DALET -->
         <Key
-            latin:keyLabel="\u05d3" />
-        <!-- \u05d2: "ג" HEBREW LETTER GIMEL -->
+            latin:keyLabel="&#x05D3;" />
+        <!-- U+05D2: "ג" HEBREW LETTER GIMEL
+             U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d2"
-            latin:moreKeys="ג׳" />
-        <!-- \u05db: "כ" HEBREW LETTER KAF -->
+            latin:keyLabel="&#x05D2;"
+            latin:moreKeys="&#x05D2;&#x05F3;" />
+        <!-- U+05DB: "כ" HEBREW LETTER KAF -->
         <Key
-            latin:keyLabel="\u05db" />
-        <!-- \u05e2: "ע" HEBREW LETTER AYIN -->
+            latin:keyLabel="&#x05DB;" />
+        <!-- U+05E2: "ע" HEBREW LETTER AYIN -->
         <Key
-            latin:keyLabel="\u05e2" />
-        <!-- \u05d9: "י" HEBREW LETTER YOD -->
+            latin:keyLabel="&#x05E2;" />
+        <!-- U+05D9: "י" HEBREW LETTER YOD
+             U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
         <Key
-            latin:keyLabel="\u05d9"
-            latin:moreKeys="ײַ" />
-        <!-- \u05d7: "ח" HEBREW LETTER HET -->
+            latin:keyLabel="&#x05D9;"
+            latin:moreKeys="&#x05F2;&#x05B7;" />
+        <!-- U+05D7: "ח" HEBREW LETTER HET
+             U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d7"
-            latin:moreKeys="ח׳" />
-        <!-- \u05dc: "ל" HEBREW LETTER LAMED -->
+            latin:keyLabel="&#x05D7;"
+            latin:moreKeys="&#x05D7;&#x05F3;" />
+        <!-- U+05DC: "ל" HEBREW LETTER LAMED -->
         <Key
-            latin:keyLabel="\u05dc" />
-        <!-- \u05da: "ך" HEBREW LETTER FINAL KAF -->
+            latin:keyLabel="&#x05DC;" />
+        <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
         <Key
-            latin:keyLabel="\u05da" />
-        <!-- \u05e3: "ף" HEBREW LETTER FINAL PE -->
+            latin:keyLabel="&#x05DA;" />
+        <!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
         <Key
-            latin:keyLabel="\u05e3" />
+            latin:keyLabel="&#x05E3;" />
     </Row>
     <Row
         latin:keyWidth="8.047%p"
     >
-        <!-- \u05d6: "ז" HEBREW LETTER ZAYIN -->
+        <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
+             U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d6"
-            latin:moreKeys="ז׳"
+            latin:keyLabel="&#x05D6;"
+            latin:moreKeys="&#x05D6;&#x05F3;"
             latin:keyXPos="13.829%p" />
-        <!-- \u05e1: "ס" HEBREW LETTER SAMEKH -->
+        <!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
         <Key
-            latin:keyLabel="\u05e1" />
-        <!-- \u05d1: "ב" HEBREW LETTER BET -->
+            latin:keyLabel="&#x05E1;" />
+        <!-- U+05D1: "ב" HEBREW LETTER BET -->
         <Key
-            latin:keyLabel="\u05d1" />
-        <!-- \u05d4: "ה" HEBREW LETTER HE -->
+            latin:keyLabel="&#x05D1;" />
+        <!-- U+05D4: "ה" HEBREW LETTER HE -->
         <Key
-            latin:keyLabel="\u05d4" />
-        <!-- \u05e0: "נ" HEBREW LETTER NUN -->
+            latin:keyLabel="&#x05D4;" />
+        <!-- U+05E0: "נ" HEBREW LETTER NUN -->
         <Key
-            latin:keyLabel="\u05e0" />
-        <!-- \u05de: "מ" HEBREW LETTER MEM -->
+            latin:keyLabel="&#x05E0;" />
+        <!-- U+05DE: "מ" HEBREW LETTER MEM -->
         <Key
-            latin:keyLabel="\u05de" />
-        <!-- \u05e6: "צ" HEBREW LETTER TSADI -->
+            latin:keyLabel="&#x05DE;" />
+        <!-- U+05E6: "צ" HEBREW LETTER TSADI
+             U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05e6"
-            latin:moreKeys="צ׳" />
-        <!-- \u05ea: "ת" HEBREW LETTER TAV -->
+            latin:keyLabel="&#x05E6;"
+            latin:moreKeys="&#x05E6;&#x05F3;" />
+        <!-- U+05EA: "ת" HEBREW LETTER TAV
+             U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05ea"
-            latin:moreKeys="ת׳" />
-        <!-- \u05e5: "ץ" HEBREW LETTER FINAL TSADI -->
+            latin:keyLabel="&#x05EA;"
+            latin:moreKeys="&#x05EA;&#x05F3;" />
+        <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
+             U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05e5"
-            latin:moreKeys="ץ׳" />
+            latin:keyLabel="&#x05E5;"
+            latin:moreKeys="&#x05E5;&#x05F3;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-10.400%p"
diff --git a/java/res/xml-sw768dp/rows_serbian.xml b/java/res/xml-sw768dp/rows_serbian.xml
index 89556dd..39907c8 100644
--- a/java/res/xml-sw768dp/rows_serbian.xml
+++ b/java/res/xml-sw768dp/rows_serbian.xml
@@ -29,45 +29,45 @@
         <Key
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft" />
-        <!-- \u0459: "љ" CYRILLIC SMALL LETTER LJE -->
+        <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
         <Key
-            latin:keyLabel="\u0459" />
-        <!-- \u045a: "њ" CYRILLIC SMALL LETTER NJE -->
+            latin:keyLabel="&#x0459;" />
+        <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
         <Key
-            latin:keyLabel="\u045a" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+            latin:keyLabel="&#x045A;" />
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+            latin:keyLabel="&#x0435;" />
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+            latin:keyLabel="&#x0440;" />
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+            latin:keyLabel="&#x0442;" />
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+            latin:keyLabel="&#x0437;" />
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443" />
-        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+            latin:keyLabel="&#x0443;" />
+        <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
         <Key
-            latin:keyLabel="\u0438" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+            latin:keyLabel="&#x0438;" />
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+            latin:keyLabel="&#x043E;" />
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+            latin:keyLabel="&#x043F;" />
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448" />
-        <!-- \u0452: "ђ" CYRILLIC SMALL LETTER DJE -->
+            latin:keyLabel="&#x0448;" />
+        <!-- U+0452: "ђ" CYRILLIC SMALL LETTER DJE -->
         <Key
-            latin:keyLabel="\u0452" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0452;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436"
+            latin:keyLabel="&#x0436;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -77,39 +77,39 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="11.172%p" />
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+            latin:keyLabel="&#x0444;" />
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+            latin:keyLabel="&#x0433;" />
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445" />
-        <!-- \u0458: "ј" CYRILLIC SMALL LETTER JE -->
+            latin:keyLabel="&#x0445;" />
+        <!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->
         <Key
-            latin:keyLabel="\u0458" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+            latin:keyLabel="&#x0458;" />
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+            latin:keyLabel="&#x043A;" />
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447" />
-        <!-- \u045b: "ћ" CYRILLIC SMALL LETTER TSHE -->
+            latin:keyLabel="&#x0447;" />
+        <!-- U+045B: "ћ" CYRILLIC SMALL LETTER TSHE -->
         <Key
-            latin:keyLabel="\u045b" />
+            latin:keyLabel="&#x045B;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-9.219%p"
@@ -121,27 +121,27 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="13.829%p" />
-        <!-- \u0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
+        <!-- U+0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
         <Key
-            latin:keyLabel="\u0455" />
-        <!-- \u045f: "џ" CYRILLIC SMALL LETTER DZHE -->
+            latin:keyLabel="&#x0455;" />
+        <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
         <Key
-            latin:keyLabel="\u045f" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+            latin:keyLabel="&#x045F;" />
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+            latin:keyLabel="&#x0446;" />
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x043D;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
+            latin:keyLabel="&#x043C;" />
         <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 deca884..26857ae 100644
--- a/java/res/xml-sw768dp/rows_slavic.xml
+++ b/java/res/xml-sw768dp/rows_slavic.xml
@@ -29,44 +29,44 @@
         <Key
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft" />
-        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="\u0439" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+            latin:keyLabel="&#x0439;" />
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+            latin:keyLabel="&#x0446;" />
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443"
+            latin:keyLabel="&#x0443;"
             latin:moreKeys="@string/more_keys_for_slavic_u" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+            latin:keyLabel="&#x043A;" />
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435"
+            latin:keyLabel="&#x0435;"
             latin:moreKeys="@string/more_keys_for_slavic_ye" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d"
+            latin:keyLabel="&#x043D;"
             latin:moreKeys="@string/more_keys_for_slavic_en" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+            latin:keyLabel="&#x0433;" />
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448" />
+            latin:keyLabel="&#x0448;" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_shcha" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+            latin:keyLabel="&#x0437;" />
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445" />
-        <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+            latin:keyLabel="&#x0445;" />
+        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="\u044a" />
+            latin:keyLabel="&#x044A;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -78,40 +78,40 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="9.375%p" />
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
+            latin:keyLabel="&#x0444;" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_yery"
             latin:moreKeys="@string/more_keys_for_slavic_yery" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+            latin:keyLabel="&#x043F;" />
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+            latin:keyLabel="&#x0440;" />
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e"
+            latin:keyLabel="&#x043E;"
             latin:moreKeys="@string/more_keys_for_slavic_o" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
-        <!-- \u044d: "э" CYRILLIC SMALL LETTER E -->
+            latin:keyLabel="&#x0436;" />
+        <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
         <Key
-            latin:keyLabel="\u044d" />
+            latin:keyLabel="&#x044D;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-9.375%p"
@@ -123,32 +123,32 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="12.750%p" />
-        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="\u044f" />
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+            latin:keyLabel="&#x044F;" />
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0447;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
+            latin:keyLabel="&#x043C;" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_i" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442" />
-        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+            latin:keyLabel="&#x0442;" />
+        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="\u044c" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+            latin:keyLabel="&#x044C;" />
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="\u044e" />
+            latin:keyLabel="&#x044E;" />
         <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 210c38d..9fe1b3b 100644
--- a/java/res/xml-sw768dp/rows_spanish.xml
+++ b/java/res/xml-sw768dp/rows_spanish.xml
@@ -56,9 +56,9 @@
         <Key
             latin:keyLabel="l"
             latin:moreKeys="@string/more_keys_for_l" />
-        <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
+        <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
         <Key
-            latin:keyLabel="\u00f1" />
+            latin:keyLabel="&#x00F1;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-15.704%p"
diff --git a/java/res/xml-sw768dp/rows_symbols.xml b/java/res/xml-sw768dp/rows_symbols.xml
index c199ae4..d82f20b 100644
--- a/java/res/xml-sw768dp/rows_symbols.xml
+++ b/java/res/xml-sw768dp/rows_symbols.xml
@@ -140,9 +140,10 @@
             latin:moreKeys="@string/more_keys_for_comma" />
         <Key
             latin:keyLabel="." />
+        <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
         <Key
             latin:keyLabel="!"
-            latin:moreKeys="¡" />
+            latin:moreKeys="&#x00A1;" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_question"
             latin:moreKeys="@string/more_keys_for_symbols_question" />
diff --git a/java/res/xml-sw768dp/rows_symbols_shift.xml b/java/res/xml-sw768dp/rows_symbols_shift.xml
index ced62f3..4c80771 100644
--- a/java/res/xml-sw768dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw768dp/rows_symbols_shift.xml
@@ -38,32 +38,32 @@
             latin:keyLabel="`" />
         <Key
             latin:keyLabel="|" />
-        <!-- \u2022: "•" BULLET -->
+        <!-- U+2022: "•" BULLET -->
         <Key
-            latin:keyLabel="\u2022"
+            latin:keyLabel="&#x2022;"
             latin:moreKeys="@string/more_keys_for_bullet" />
-        <!-- \u221a: "√" SQUARE ROOT -->
+        <!-- U+221A: "√" SQUARE ROOT -->
         <Key
-            latin:keyLabel="\u221a" />
-        <!-- \u03c0: "π" GREEK SMALL LETTER PI
-             \u03a0: "Π" GREEK CAPITAL LETTER PI -->
+            latin:keyLabel="&#x221A;" />
+        <!-- U+03C0: "π" GREEK SMALL LETTER PI
+             U+03A0: "Π" GREEK CAPITAL LETTER PI -->
         <Key
-            latin:keyLabel="\u03c0"
-            latin:moreKeys="\u03a0" />
-        <!-- \u00f7: "÷" DIVISION SIGN -->
+            latin:keyLabel="&#x03C0;"
+            latin:moreKeys="&#x03A0;" />
+        <!-- U+00F7: "÷" DIVISION SIGN -->
         <Key
-            latin:keyLabel="\u00f7" />
-        <!-- \u00d7: "×" MULTIPLICATION SIGN -->
+            latin:keyLabel="&#x00F7;" />
+        <!-- U+00D7: "×" MULTIPLICATION SIGN -->
         <Key
-            latin:keyLabel="\u00d7" />
-        <!-- \u00a7: "§" SECTION SIGN
-             \u00b6: "¶" PILCROW SIGN -->
+            latin:keyLabel="&#x00D7;" />
+        <!-- U+00A7: "§" SECTION SIGN
+             U+00B6: "¶" PILCROW SIGN -->
         <Key
-            latin:keyLabel="\u00a7"
-            latin:moreKeys="\u00b6" />
-        <!-- \u0394: "Δ" GREEK CAPITAL LETTER DELTA -->
+            latin:keyLabel="&#x00A7;"
+            latin:moreKeys="&#x00B6;" />
+        <!-- U+0394: "Δ" GREEK CAPITAL LETTER DELTA -->
         <Key
-            latin:keyLabel="\u0394" />
+            latin:keyLabel="&#x0394;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-9.219%p"
@@ -84,24 +84,24 @@
             latin:keyStyle="moreCurrency3KeyStyle" />
         <Key
             latin:keyStyle="moreCurrency4KeyStyle" />
-        <!-- \u2191: "↑" UPWARDS ARROW
-             \u2193: "↓" DOWNWARDS ARROW
-             \u2190: "←" LEFTWARDS ARROW
-             \u2192: "→" RIGHTWARDS ARROW -->
+        <!-- U+2191: "↑" UPWARDS ARROW
+             U+2193: "↓" DOWNWARDS ARROW
+             U+2190: "←" LEFTWARDS ARROW
+             U+2192: "→" RIGHTWARDS ARROW -->
         <Key
             latin:keyLabel="^"
-            latin:moreKeys="\u2191,\u2193,\u2190,\u2192" />
-        <!-- \u00b0: "°" DEGREE SIGN
-             \u2032: "′" PRIME
-             \u2033: "″" DOUBLE PRIME -->
+            latin:moreKeys="&#x2191;,&#x2193;,&#x2190;,&#x2192;" />
+        <!-- U+00B0: "°" DEGREE SIGN
+             U+2032: "′" PRIME
+             U+2033: "″" DOUBLE PRIME -->
         <Key
-            latin:keyLabel="\u00b0"
-            latin:moreKeys="\u2032,\u2033" />
-        <!-- \u00b1: "±" PLUS-MINUS SIGN
-             \u221e: "∞" INFINITY -->
+            latin:keyLabel="&#x00B0;"
+            latin:moreKeys="&#x2032;,&#x2033;" />
+        <!-- U+00B1: "±" PLUS-MINUS SIGN
+             U+221E: "∞" INFINITY -->
         <Key
-            latin:keyLabel="\u00b1"
-            latin:moreKeys="\u221e" />
+            latin:keyLabel="&#x00B1;"
+            latin:moreKeys="&#x221E;" />
         <include
             latin:keyboardLayout="@xml/keys_curly_brackets" />
         <Key
@@ -117,26 +117,26 @@
             latin:keyWidth="13.829%p" />
         <Key
             latin:keyLabel="\\" />
-        <!-- \u00a9: "©" COPYRIGHT SIGN -->
+        <!-- U+00A9: "©" COPYRIGHT SIGN -->
         <Key
-            latin:keyLabel="\u00a9" />
-        <!-- \u00ae: "®" REGISTERED SIGN -->
+            latin:keyLabel="&#x00A9;" />
+        <!-- U+00AE: "®" REGISTERED SIGN -->
         <Key
-            latin:keyLabel="\u00ae" />
-        <!-- \u2122: "™" TRADE MARK SIGN -->
+            latin:keyLabel="&#x00AE;" />
+        <!-- U+2122: "™" TRADE MARK SIGN -->
         <Key
-            latin:keyLabel="\u2122" />
-        <!-- \u2105: "℅" CARE OF -->
+            latin:keyLabel="&#x2122;" />
+        <!-- U+2105: "℅" CARE OF -->
         <Key
-            latin:keyLabel="\u2105" />
+            latin:keyLabel="&#x2105;" />
         <include
             latin:keyboardLayout="@xml/keys_square_brackets" />
-        <!-- \u00a1: "¡" INVERTED EXCLAMATION MARK -->
+        <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
         <Key
-            latin:keyLabel="\u00a1" />
-        <!-- \u00bf: "¿" INVERTED QUESTION MARK -->
+            latin:keyLabel="&#x00A1;" />
+        <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
         <Key
-            latin:keyLabel="\u00bf" />
+            latin:keyLabel="&#x00BF;" />
         <Key
             latin:keyStyle="backFromMoreSymbolKeyStyle"
             latin:keyXPos="-13.750%p"
diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
index 7307a1a..01f7aee 100644
--- a/java/res/xml/key_styles_number.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -91,10 +91,11 @@
         latin:keyLabel="9"
         latin:keyHintLabel="WXYZ"
         latin:parentStyle="numberKeyStyle" />
+    <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
     <key-style
         latin:styleName="numStarKeyStyle"
         latin:code="42"
-        latin:keyLabel="\uff0a"
+        latin:keyLabel="&#xFF0A;"
         latin:parentStyle="numKeyStyle" />
     <!-- Only for non-tablet device -->
     <key-style
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index 78d5d02..5cb6512 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -32,19 +32,20 @@
                 <Key
                     latin:keyStyle="toAlphaKeyStyle"
                     latin:keyWidth="15%p" />
-                <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
+                <!-- U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+                <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
                     <!-- latin:keyLabelFlags="hasPopupHint" -->
-                    <!-- latin:moreKeys="‟" -->
-                <!-- \u201e: "„" DOUBLE LOW-9 QUOTATION MARK -->
+                    <!-- latin:moreKeys="&#x201F;" -->
+                <!-- U+201E: "„" DOUBLE LOW-9 QUOTATION MARK -->
                 <Key
-                    latin:keyLabel="\u201e"
+                    latin:keyLabel="&#x201E;"
                     latin:backgroundType="functional" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="50%p" />
-                <!-- \u2026: "…" HORIZONTAL ELLIPSIS -->
+                <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
                 <Key
-                    latin:keyLabel="\u2026"
+                    latin:keyLabel="&#x2026;"
                     latin:backgroundType="functional" />
                 <Key
                     latin:keyStyle="enterKeyStyle"
@@ -57,20 +58,21 @@
                     latin:keyWidth="13.75%p" />
                 <include
                     latin:keyboardLayout="@xml/key_settings_or_tab" />
-                <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
+                <!-- U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+                <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
                     <!-- latin:keyLabelFlags="hasPopupHint" -->
-                    <!-- latin:moreKeys="‟" -->
-                <!-- \u201e: "„" DOUBLE LOW-9 QUOTATION MARK -->
+                    <!-- latin:moreKeys="&#x201F;" -->
+                <!-- U+201E: "„" DOUBLE LOW-9 QUOTATION MARK -->
                 <Key
-                    latin:keyLabel="\u201e"
+                    latin:keyLabel="&#x201E;"
                     latin:keyWidth="9.2%p"
                     latin:backgroundType="functional" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="35.83%p" />
-                <!-- \u2026: "…" HORIZONTAL ELLIPSIS -->
+                <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
                 <Key
-                    latin:keyLabel="\u2026"
+                    latin:keyLabel="&#x2026;"
                     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 449b240..84f7a3c 100644
--- a/java/res/xml/rows_arabic.xml
+++ b/java/res/xml/rows_arabic.xml
@@ -26,177 +26,177 @@
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u0636: "ض" ARABIC LETTER DAD
-             \u0661: "١" ARABIC-INDIC DIGIT ONE -->
+        <!-- U+0636: "ض" ARABIC LETTER DAD
+             U+0661: "١" ARABIC-INDIC DIGIT ONE -->
         <Key
-            latin:keyLabel="\u0636"
+            latin:keyLabel="&#x0636;"
             latin:keyHintLabel="1"
-            latin:additionalMoreKeys="1,\u0661" />
-        <!-- \u0635: "ص" ARABIC LETTER SAD
-             \u0662: "٢" ARABIC-INDIC DIGIT TWO -->
+            latin:additionalMoreKeys="1,&#x0661;" />
+        <!-- U+0635: "ص" ARABIC LETTER SAD
+             U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
         <Key
-            latin:keyLabel="\u0635"
+            latin:keyLabel="&#x0635;"
             latin:keyHintLabel="2"
-            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 -->
+            latin:additionalMoreKeys="2,&#x0662;" />
+        <!-- U+0642: "ق" ARABIC LETTER QAF
+             U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE
+             U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="\u0642"
+            latin:keyLabel="&#x0642;"
             latin:keyHintLabel="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
-             \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 -->
+            latin:additionalMoreKeys="3,&#x0663;"
+            latin:moreKeys="&#x06A8;" />
+        <!-- U+0641: "ف" ARABIC LETTER FEH
+             U+06A4: "ڤ" ARABIC LETTER VEH
+             U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
+             U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW
+             U+0664: "٤" ARABIC-INDIC DIGIT FOUR -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
         <Key
-            latin:keyLabel="\u0641"
+            latin:keyLabel="&#x0641;"
             latin:keyHintLabel="4"
-            latin:additionalMoreKeys="4,\u0664"
-            latin:moreKeys="\u06a4,\u06a2,\u06a5" />
-        <!-- \u063a: "غ" ARABIC LETTER GHAIN
-             \u0665: "٥" ARABIC-INDIC DIGIT FIVE -->
+            latin:additionalMoreKeys="4,&#x0664;"
+            latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" />
+        <!-- U+063A: "غ" ARABIC LETTER GHAIN
+             U+0665: "٥" ARABIC-INDIC DIGIT FIVE -->
         <Key
-            latin:keyLabel="\u063a"
+            latin:keyLabel="&#x063A;"
             latin:keyHintLabel="5"
-            latin:additionalMoreKeys="5,\u0665" />
-        <!-- \u0639: "ع" ARABIC LETTER AIN
-             \u0666: "٦" ARABIC-INDIC DIGIT SIX -->
+            latin:additionalMoreKeys="5,&#x0665;" />
+        <!-- U+0639: "ع" ARABIC LETTER AIN
+             U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
         <Key
-            latin:keyLabel="\u0639"
+            latin:keyLabel="&#x0639;"
             latin:keyHintLabel="6"
-            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 -->
+            latin:additionalMoreKeys="6,&#x0666;" />
+        <!-- U+0647: "ه" ARABIC LETTER HEH
+             U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+             U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
+             U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
         <Key
-            latin:keyLabel="\u0647"
+            latin:keyLabel="&#x0647;"
             latin:keyHintLabel="7"
-            latin:additionalMoreKeys="7,\u0667"
-            latin:moreKeys="\ufeeb|\u0647\u200d" />
-        <!-- \u062e: "خ" ARABIC LETTER KHAH
-             \u0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
+            latin:additionalMoreKeys="7,&#x0667;"
+            latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" />
+        <!-- U+062E: "خ" ARABIC LETTER KHAH
+             U+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
         <Key
-            latin:keyLabel="\u062e"
+            latin:keyLabel="&#x062E;"
             latin:keyHintLabel="8"
-            latin:additionalMoreKeys="8,\u0668" />
-        <!-- \u062d: "ح" ARABIC LETTER HAH
-             \u0669: "٩" ARABIC-INDIC DIGIT NINE -->
+            latin:additionalMoreKeys="8,&#x0668;" />
+        <!-- U+062D: "ح" ARABIC LETTER HAH
+             U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
         <Key
-            latin:keyLabel="\u062d"
+            latin:keyLabel="&#x062D;"
             latin:keyHintLabel="9"
-            latin:additionalMoreKeys="9,\u0669" />
-        <!-- \u062c: "ج" ARABIC LETTER JEEM
-             \u0686: "چ" ARABIC LETTER TCHEH
-             \u0660: "٠" ARABIC-INDIC DIGIT ZERO -->
+            latin:additionalMoreKeys="9,&#x0669;" />
+        <!-- U+062C: "ج" ARABIC LETTER JEEM
+             U+0686: "چ" ARABIC LETTER TCHEH
+             U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
         <Key
-            latin:keyLabel="\u062c"
+            latin:keyLabel="&#x062C;"
             latin:keyHintLabel="0"
-            latin:additionalMoreKeys="0,\u0660"
-            latin:moreKeys="\u0686"
+            latin:additionalMoreKeys="0,&#x0660;"
+            latin:moreKeys="&#x0686;"
             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 -->
-        <!-- TODO: DroidSansArabic lacks the glyph of \u069c ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- U+0634: "ش" ARABIC LETTER SHEEN
+             U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="\u0634"
-            latin:moreKeys="\u069c" />
-        <!-- \u0633: "س" ARABIC LETTER SEEN -->
+            latin:keyLabel="&#x0634;"
+            latin:moreKeys="&#x069C;" />
+        <!-- U+0633: "س" ARABIC LETTER SEEN -->
         <Key
-            latin:keyLabel="\u0633" />
-        <!-- \u064a: "ي" ARABIC LETTER YEH
-             \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
-             \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+            latin:keyLabel="&#x0633;" />
+        <!-- U+064A: "ي" ARABIC LETTER YEH
+             U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+             U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
         <Key
-            latin:keyLabel="\u064a"
-            latin:moreKeys="\u0626,\u0649" />
-        <!-- \u0628: "ب" ARABIC LETTER BEH
-             \u067e: "پ" ARABIC LETTER PEH -->
+            latin:keyLabel="&#x064A;"
+            latin:moreKeys="&#x0626;,&#x0649;" />
+        <!-- U+0628: "ب" ARABIC LETTER BEH
+             U+067E: "پ" 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 -->
+            latin:keyLabel="&#x0628;"
+            latin:moreKeys="&#x067E;" />
+        <!-- U+0644: "ل" ARABIC LETTER LAM
+             U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+             U+0627: "ا" ARABIC LETTER ALEF
+             U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+             U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+             U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+             U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+             U+0622: "آ" 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 -->
+            latin:keyLabel="&#x0644;"
+            latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;" />
+        <!-- U+0627: "ا" ARABIC LETTER ALEF
+             U+0621: "ء" ARABIC LETTER HAMZA
+             U+0671: "ٱ" ARABIC LETTER ALEF WASLA
+             U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+             U+0622: "آ" 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 -->
+            latin:keyLabel="&#x0627;"
+            latin:moreKeys="&#x0621;,&#x0671;,&#x0623;,&#x0625;,&#x0622;" />
+        <!-- U+062A: "ت" ARABIC LETTER TEH
+             U+062B: "ﺙ" ARABIC LETTER THEH -->
         <Key
-            latin:keyLabel="\u062a"
-            latin:moreKeys="\u062b" />
-        <!-- \u0646: "ن" ARABIC LETTER NOON -->
+            latin:keyLabel="&#x062A;"
+            latin:moreKeys="&#x062B;" />
+        <!-- U+0646: "ن" ARABIC LETTER NOON -->
         <Key
-            latin:keyLabel="\u0646" />
-        <!-- \u0645: "م" ARABIC LETTER MEEM -->
+            latin:keyLabel="&#x0646;" />
+        <!-- U+0645: "م" ARABIC LETTER MEEM -->
         <Key
-            latin:keyLabel="\u0645" />
-        <!-- \u0643: "ك" ARABIC LETTER KAF
-             \u06af: "گ" ARABIC LETTER GAF
-             \u06a9: "ک" ARABIC LETTER KEHEH -->
+            latin:keyLabel="&#x0645;" />
+        <!-- U+0643: "ك" ARABIC LETTER KAF
+             U+06AF: "گ" ARABIC LETTER GAF
+             U+06A9: "ک" ARABIC LETTER KEHEH -->
         <Key
-            latin:keyLabel="\u0643"
-            latin:moreKeys="\u06af,\u06a9"
+            latin:keyLabel="&#x0643;"
+            latin:moreKeys="&#x06AF;,&#x06A9;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
+        <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
         <Key
-            latin:keyLabel="\u0638"
+            latin:keyLabel="&#x0638;"
             latin:keyXPos="5.0%p" />
-        <!-- \u0637: "ط" ARABIC LETTER TAH -->
+        <!-- U+0637: "ط" ARABIC LETTER TAH -->
         <Key
-            latin:keyLabel="\u0637" />
-        <!-- \u0630: "ذ" ARABIC LETTER THAL -->
+            latin:keyLabel="&#x0637;" />
+        <!-- U+0630: "ذ" ARABIC LETTER THAL -->
         <Key
-            latin:keyLabel="\u0630" />
-        <!-- \u062f: "د" ARABIC LETTER DAL -->
+            latin:keyLabel="&#x0630;" />
+        <!-- U+062F: "د" ARABIC LETTER DAL -->
         <Key
-            latin:keyLabel="\u062f" />
-        <!-- \u0632: "ز" ARABIC LETTER ZAIN
-             \u0698: "ژ" ARABIC LETTER JEH -->
+            latin:keyLabel="&#x062F;" />
+        <!-- U+0632: "ز" ARABIC LETTER ZAIN
+             U+0698: "ژ" ARABIC LETTER JEH -->
         <Key
-            latin:keyLabel="\u0632"
-            latin:moreKeys="\u0698" />
-        <!-- \u0631: "ر" ARABIC LETTER REH -->
+            latin:keyLabel="&#x0632;"
+            latin:moreKeys="&#x0698;" />
+        <!-- U+0631: "ر" ARABIC LETTER REH -->
         <Key
-            latin:keyLabel="\u0631" />
-        <!-- \u0629: "ة" ARABIC LETTER TEH MARBUTA -->
+            latin:keyLabel="&#x0631;" />
+        <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
         <Key
-            latin:keyLabel="\u0629" />
-        <!-- \u0648: "و" ARABIC LETTER WAW
-             \u0624: "ﺅ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
+            latin:keyLabel="&#x0629;" />
+        <!-- U+0648: "و" ARABIC LETTER WAW
+             U+0624: "ﺅ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="\u0648"
-            latin:moreKeys="\u0624" />
+            latin:keyLabel="&#x0648;"
+            latin:moreKeys="&#x0624;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
diff --git a/java/res/xml/rows_azerty.xml b/java/res/xml/rows_azerty.xml
index 533c683..6f607cb 100644
--- a/java/res/xml/rows_azerty.xml
+++ b/java/res/xml/rows_azerty.xml
@@ -136,7 +136,7 @@
              order of "4,3,1,2". See @string/more_keys_for_single_quote -->
         <Key
             latin:keyLabel="\'"
-            latin:moreKeys="\u2018,\u2019,\u201b,\u201a" />
+            latin:moreKeys="&#x2018;,&#x2019;,&#x201B;,&#x201A;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
diff --git a/java/res/xml/rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
index 3a8da04..3d954a9 100644
--- a/java/res/xml/rows_bulgarian.xml
+++ b/java/res/xml/rows_bulgarian.xml
@@ -26,99 +26,99 @@
     <Row
         latin:keyWidth="9.091%p"
     >
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447"
+            latin:keyLabel="&#x0447;"
             latin:keyHintLabel="1"
             latin:additionalMoreKeys="1" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448"
+            latin:keyLabel="&#x0448;"
             latin:keyHintLabel="2"
             latin:additionalMoreKeys="2" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435"
+            latin:keyLabel="&#x0435;"
             latin:keyHintLabel="3"
             latin:additionalMoreKeys="3" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440"
+            latin:keyLabel="&#x0440;"
             latin:keyHintLabel="4"
             latin:additionalMoreKeys="4" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442"
+            latin:keyLabel="&#x0442;"
             latin:keyHintLabel="5"
             latin:additionalMoreKeys="5" />
-        <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="\u044a"
+            latin:keyLabel="&#x044A;"
             latin:keyHintLabel="6"
             latin:additionalMoreKeys="6" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443"
+            latin:keyLabel="&#x0443;"
             latin:keyHintLabel="7"
             latin:additionalMoreKeys="7" />
-        <!-- \u0438: "и" CYRILLIC SMALL LETTER I
-             \u045d: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
+        <!-- U+0438: "и" CYRILLIC SMALL LETTER I
+             U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
         <Key
-            latin:keyLabel="\u0438"
+            latin:keyLabel="&#x0438;"
             latin:keyHintLabel="8"
             latin:additionalMoreKeys="8"
-            latin:moreKeys="\u045d" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+            latin:moreKeys="&#x045D;" />
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e"
+            latin:keyLabel="&#x043E;"
             latin:keyHintLabel="9"
             latin:additionalMoreKeys="9" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f"
+            latin:keyLabel="&#x043F;"
             latin:keyHintLabel="0"
             latin:additionalMoreKeys="0" />
-        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="\u044f"
+            latin:keyLabel="&#x044F;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
             latin:keyWidth="9.091%p"
     >
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+            latin:keyLabel="&#x0444;" />
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+            latin:keyLabel="&#x0433;" />
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445" />
-        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+            latin:keyLabel="&#x0445;" />
+        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="\u0439" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+            latin:keyLabel="&#x0439;" />
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+            latin:keyLabel="&#x043A;" />
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
         <Key
-            latin:keyLabel="\u0449" />
-        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+            latin:keyLabel="&#x0449;" />
+        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="\u044c"
+            latin:keyLabel="&#x044C;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -127,30 +127,30 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="13.636%p" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0437;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+            latin:keyLabel="&#x0436;" />
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+            latin:keyLabel="&#x0446;" />
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x043D;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
-        <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+            latin:keyLabel="&#x043C;" />
+        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="\u044e" />
+            latin:keyLabel="&#x044E;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_hebrew.xml b/java/res/xml/rows_hebrew.xml
index ca18a0c..1f11632 100644
--- a/java/res/xml/rows_hebrew.xml
+++ b/java/res/xml/rows_hebrew.xml
@@ -26,31 +26,31 @@
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u05e7: "ק" HEBREW LETTER QOF -->
+        <!-- U+05E7: "ק" HEBREW LETTER QOF -->
         <Key
-            latin:keyLabel="\u05e7"
+            latin:keyLabel="&#x05E7;"
             latin:keyXPos="5%p" />
-        <!-- \u05e8: "ר" HEBREW LETTER RESH -->
+        <!-- U+05E8: "ר" HEBREW LETTER RESH -->
         <Key
-            latin:keyLabel="\u05e8" />
-        <!-- \u05d0: "א" HEBREW LETTER ALEF -->
+            latin:keyLabel="&#x05E8;" />
+        <!-- U+05D0: "א" HEBREW LETTER ALEF -->
         <Key
-            latin:keyLabel="\u05d0" />
-        <!-- \u05d8: "ט" HEBREW LETTER TET -->
+            latin:keyLabel="&#x05D0;" />
+        <!-- U+05D8: "ט" HEBREW LETTER TET -->
         <Key
-            latin:keyLabel="\u05d8" />
-        <!-- \u05d5: "ו" HEBREW LETTER VAV -->
+            latin:keyLabel="&#x05D8;" />
+        <!-- U+05D5: "ו" HEBREW LETTER VAV -->
         <Key
-            latin:keyLabel="\u05d5" />
-        <!-- \u05df: "ן" HEBREW LETTER FINAL NUN -->
+            latin:keyLabel="&#x05D5;" />
+        <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
         <Key
-            latin:keyLabel="\u05df" />
-        <!-- \u05dd: "ם" HEBREW LETTER FINAL MEM -->
+            latin:keyLabel="&#x05DF;" />
+        <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
         <Key
-            latin:keyLabel="\u05dd" />
-        <!-- \u05e4: "פ" HEBREW LETTER PE -->
+            latin:keyLabel="&#x05DD;" />
+        <!-- U+05E4: "פ" HEBREW LETTER PE -->
         <Key
-            latin:keyLabel="\u05e4" />
+            latin:keyLabel="&#x05E4;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
@@ -59,83 +59,83 @@
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u05e9: "ש" HEBREW LETTER SHIN -->
+        <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
         <Key
-            latin:keyLabel="\u05e9" />
-        <!-- \u05d3: "ד" HEBREW LETTER DALET -->
+            latin:keyLabel="&#x05E9;" />
+        <!-- U+05D3: "ד" HEBREW LETTER DALET -->
         <Key
-            latin:keyLabel="\u05d3" />
-        <!-- \u05d2: "ג" HEBREW LETTER GIMEL
-             \u05d2\u05f3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
+            latin:keyLabel="&#x05D3;" />
+        <!-- U+05D2: "ג" HEBREW LETTER GIMEL
+             U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d2"
-            latin:moreKeys="\u05d2\u05f3" />
-        <!-- \u05db: "כ" HEBREW LETTER KAF -->
+            latin:keyLabel="&#x05D2;"
+            latin:moreKeys="&#x05D2;&#x05F3;" />
+        <!-- U+05DB: "כ" HEBREW LETTER KAF -->
         <Key
-            latin:keyLabel="\u05db" />
-        <!-- \u05e2: "ע" HEBREW LETTER AYIN -->
+            latin:keyLabel="&#x05DB;" />
+        <!-- U+05E2: "ע" HEBREW LETTER AYIN -->
         <Key
-            latin:keyLabel="\u05e2" />
-        <!-- \u05d9: "י" HEBREW LETTER YOD
-             \u05f2\u05b7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
+            latin:keyLabel="&#x05E2;" />
+        <!-- U+05D9: "י" HEBREW LETTER YOD
+             U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
         <Key
-            latin:keyLabel="\u05d9"
-            latin:moreKeys="\u05f2\u05b7" />
-        <!-- \u05d7: "ח" HEBREW LETTER HET
-             \u05d7\u05f3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
+            latin:keyLabel="&#x05D9;"
+            latin:moreKeys="&#x05F2;&#x05B7;" />
+        <!-- U+05D7: "ח" HEBREW LETTER HET
+             U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d7"
-            latin:moreKeys="\u05d7\u05f3" />
-        <!-- \u05dc: "ל" HEBREW LETTER LAMED -->
+            latin:keyLabel="&#x05D7;"
+            latin:moreKeys="&#x05D7;&#x05F3;" />
+        <!-- U+05DC: "ל" HEBREW LETTER LAMED -->
         <Key
-            latin:keyLabel="\u05dc" />
-        <!-- \u05da: "ך" HEBREW LETTER FINAL KAF -->
+            latin:keyLabel="&#x05DC;" />
+        <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
         <Key
-            latin:keyLabel="\u05da" />
-        <!-- \u05e3: "ף" HEBREW LETTER FINAL PE -->
+            latin:keyLabel="&#x05DA;" />
+        <!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
         <Key
-            latin:keyLabel="\u05e3"
+            latin:keyLabel="&#x05E3;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u05d6: "ז" HEBREW LETTER ZAYIN
-             \u05d6\u05f3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
+        <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
+             U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d6"
-            latin:moreKeys="\u05d6\u05f3"
+            latin:keyLabel="&#x05D6;"
+            latin:moreKeys="&#x05D6;&#x05F3;"
             latin:keyXPos="5%p" />
-        <!-- \u05e1: "ס" HEBREW LETTER SAMEKH -->
+        <!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
         <Key
-            latin:keyLabel="\u05e1" />
-        <!-- \u05d1: "ב" HEBREW LETTER BET -->
+            latin:keyLabel="&#x05E1;" />
+        <!-- U+05D1: "ב" HEBREW LETTER BET -->
         <Key
-            latin:keyLabel="\u05d1" />
-        <!-- \u05d4: "ה" HEBREW LETTER HE -->
+            latin:keyLabel="&#x05D1;" />
+        <!-- U+05D4: "ה" HEBREW LETTER HE -->
         <Key
-            latin:keyLabel="\u05d4" />
-        <!-- \u05e0: "נ" HEBREW LETTER NUN -->
+            latin:keyLabel="&#x05D4;" />
+        <!-- U+05E0: "נ" HEBREW LETTER NUN -->
         <Key
-            latin:keyLabel="\u05e0" />
-        <!-- \u05de: "מ" HEBREW LETTER MEM -->
+            latin:keyLabel="&#x05E0;" />
+        <!-- U+05DE: "מ" HEBREW LETTER MEM -->
         <Key
-            latin:keyLabel="\u05de" />
-        <!-- \u05e6: "צ" HEBREW LETTER TSADI
-             \u05e6\u05f3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
+            latin:keyLabel="&#x05DE;" />
+        <!-- U+05E6: "צ" HEBREW LETTER TSADI
+             U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05e6"
-            latin:moreKeys="\u05e6\u05f3" />
-        <!-- \u05ea: "ת" HEBREW LETTER TAV
-             \u05ea\u05f3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
+            latin:keyLabel="&#x05E6;"
+            latin:moreKeys="&#x05E6;&#x05F3;" />
+        <!-- U+05EA: "ת" HEBREW LETTER TAV
+             U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05ea"
-            latin:moreKeys="\u05ea\u05f3" />
-        <!-- \u05e5: "ץ" HEBREW LETTER FINAL TSADI
-             \u05e5\u05f3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
+            latin:keyLabel="&#x05EA;"
+            latin:moreKeys="&#x05EA;&#x05F3;" />
+        <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
+             U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05e5"
-            latin:moreKeys="\u05e5\u05f3" />
+            latin:keyLabel="&#x05E5;"
+            latin:moreKeys="&#x05E5;&#x05F3;" />
         <!-- Here is 5%p space -->
     </Row>
     <include
diff --git a/java/res/xml/rows_serbian.xml b/java/res/xml/rows_serbian.xml
index 5591ced..cf52fe0 100644
--- a/java/res/xml/rows_serbian.xml
+++ b/java/res/xml/rows_serbian.xml
@@ -26,97 +26,97 @@
     <Row
         latin:keyWidth="9.091%p"
     >
-        <!-- \u0459: "љ" CYRILLIC SMALL LETTER LJE -->
+        <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
         <Key
-            latin:keyLabel="\u0459"
+            latin:keyLabel="&#x0459;"
             latin:keyHintLabel="1"
             latin:additionalMoreKeys="1" />
-        <!-- \u045a: "њ" CYRILLIC SMALL LETTER NJE -->
+        <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
         <Key
-            latin:keyLabel="\u045a"
+            latin:keyLabel="&#x045A;"
             latin:keyHintLabel="2"
             latin:additionalMoreKeys="2" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435"
+            latin:keyLabel="&#x0435;"
             latin:keyHintLabel="3"
             latin:additionalMoreKeys="3" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440"
+            latin:keyLabel="&#x0440;"
             latin:keyHintLabel="4"
             latin:additionalMoreKeys="4" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442"
+            latin:keyLabel="&#x0442;"
             latin:keyHintLabel="5"
             latin:additionalMoreKeys="5" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437"
+            latin:keyLabel="&#x0437;"
             latin:keyHintLabel="6"
             latin:additionalMoreKeys="6" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443"
+            latin:keyLabel="&#x0443;"
             latin:keyHintLabel="7"
             latin:additionalMoreKeys="7" />
-        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+        <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
         <Key
-            latin:keyLabel="\u0438"
+            latin:keyLabel="&#x0438;"
             latin:keyHintLabel="8"
             latin:additionalMoreKeys="8" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e"
+            latin:keyLabel="&#x043E;"
             latin:keyHintLabel="9"
             latin:additionalMoreKeys="9" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f"
+            latin:keyLabel="&#x043F;"
             latin:keyHintLabel="0"
             latin:additionalMoreKeys="0" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448"
+            latin:keyLabel="&#x0448;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
     >
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+            latin:keyLabel="&#x0444;" />
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+            latin:keyLabel="&#x0433;" />
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445" />
-        <!-- \u0458: "ј" CYRILLIC SMALL LETTER JE -->
+            latin:keyLabel="&#x0445;" />
+        <!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->
         <Key
-            latin:keyLabel="\u0458" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+            latin:keyLabel="&#x0458;" />
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+            latin:keyLabel="&#x043A;" />
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447" />
-        <!-- \u045b: "ћ" CYRILLIC SMALL LETTER TSHE -->
+            latin:keyLabel="&#x0447;" />
+        <!-- U+045B: "ћ" CYRILLIC SMALL LETTER TSHE -->
         <Key
-            latin:keyLabel="\u045b"
+            latin:keyLabel="&#x045B;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -125,33 +125,33 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
-        <!-- \u0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
+        <!-- U+0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
         <Key
-            latin:keyLabel="\u0455" />
-        <!-- \u045f: "џ" CYRILLIC SMALL LETTER DZHE -->
+            latin:keyLabel="&#x0455;" />
+        <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
         <Key
-            latin:keyLabel="\u045f" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+            latin:keyLabel="&#x045F;" />
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+            latin:keyLabel="&#x0446;" />
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x043D;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
-        <!-- \u0452: "ђ" CYRILLIC SMALL LETTER DJE -->
+            latin:keyLabel="&#x043C;" />
+        <!-- U+0452: "ђ" CYRILLIC SMALL LETTER DJE -->
         <Key
-            latin:keyLabel="\u0452" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0452;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
+            latin:keyLabel="&#x0436;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_slavic.xml b/java/res/xml/rows_slavic.xml
index 4472f8e..4099edd 100644
--- a/java/res/xml/rows_slavic.xml
+++ b/java/res/xml/rows_slavic.xml
@@ -26,101 +26,101 @@
     <Row
         latin:keyWidth="9.091%p"
     >
-        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="\u0439"
+            latin:keyLabel="&#x0439;"
             latin:keyHintLabel="1"
             latin:additionalMoreKeys="1" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446"
+            latin:keyLabel="&#x0446;"
             latin:keyHintLabel="2"
             latin:additionalMoreKeys="2" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443"
+            latin:keyLabel="&#x0443;"
             latin:keyHintLabel="3"
             latin:additionalMoreKeys="3"
             latin:moreKeys="@string/more_keys_for_slavic_u" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a"
+            latin:keyLabel="&#x043A;"
             latin:keyHintLabel="4"
             latin:additionalMoreKeys="4" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435"
+            latin:keyLabel="&#x0435;"
             latin:keyHintLabel="5"
             latin:additionalMoreKeys="5"
             latin:moreKeys="@string/more_keys_for_slavic_ye" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d"
+            latin:keyLabel="&#x043D;"
             latin:keyHintLabel="6"
             latin:additionalMoreKeys="6"
             latin:moreKeys="@string/more_keys_for_slavic_en" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433"
+            latin:keyLabel="&#x0433;"
             latin:keyHintLabel="7"
             latin:additionalMoreKeys="7" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448"
+            latin:keyLabel="&#x0448;"
             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 -->
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437"
+            latin:keyLabel="&#x0437;"
             latin:keyHintLabel="0"
             latin:additionalMoreKeys="0" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445"
+            latin:keyLabel="&#x0445;"
             latin:moreKeys="@string/more_keys_for_slavic_ha"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
             latin:keyWidth="9.091%p"
     >
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
+            latin:keyLabel="&#x0444;" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_yery"
             latin:moreKeys="@string/more_keys_for_slavic_yery" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+            latin:keyLabel="&#x043F;" />
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+            latin:keyLabel="&#x0440;" />
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e"
+            latin:keyLabel="&#x043E;"
             latin:moreKeys="@string/more_keys_for_slavic_o" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
-        <!-- \u044d: "э" CYRILLIC SMALL LETTER E -->
+            latin:keyLabel="&#x0436;" />
+        <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
         <Key
-            latin:keyLabel="\u044d"
+            latin:keyLabel="&#x044D;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -129,33 +129,33 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
-        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="\u044f" />
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+            latin:keyLabel="&#x044F;" />
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0447;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
+            latin:keyLabel="&#x043C;" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_i" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442" />
-        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+            latin:keyLabel="&#x0442;" />
+        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="\u044c"
+            latin:keyLabel="&#x044C;"
             latin:moreKeys="@string/more_keys_for_slavic_soft_sign" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="\u044e" />
+            latin:keyLabel="&#x044E;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_spanish.xml b/java/res/xml/rows_spanish.xml
index 5fc2a00..5831a2b 100644
--- a/java/res/xml/rows_spanish.xml
+++ b/java/res/xml/rows_spanish.xml
@@ -52,9 +52,9 @@
         <Key
             latin:keyLabel="l"
             latin:moreKeys="@string/more_keys_for_l" />
-        <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
+        <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
         <Key
-            latin:keyLabel="\u00f1" />
+            latin:keyLabel="&#x00F1;" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty3" />
diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml
index 81a9a46..05699e0 100644
--- a/java/res/xml/rows_symbols.xml
+++ b/java/res/xml/rows_symbols.xml
@@ -103,9 +103,10 @@
             latin:keyStyle="toMoreSymbolKeyStyle"
             latin:keyWidth="15%p"
             latin:visualInsetsRight="1%p" />
+        <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
         <Key
             latin:keyLabel="!"
-            latin:moreKeys="¡" />
+            latin:moreKeys="&#x00A1;" />
         <Key
             latin:keyLabel="&quot;"
             latin:moreKeys="@string/more_keys_for_double_quote"
diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
index 168fc9e..3fb8214 100644
--- a/java/res/xml/rows_symbols_shift.xml
+++ b/java/res/xml/rows_symbols_shift.xml
@@ -34,23 +34,23 @@
             latin:keyLabel="`" />
         <Key
             latin:keyLabel="|" />
-        <!-- \u2022: "•" BULLET -->
+        <!-- U+2022: "•" BULLET -->
         <Key
-            latin:keyLabel="\u2022"
+            latin:keyLabel="&#x2022;"
             latin:moreKeys="@string/more_keys_for_bullet" />
-        <!-- \u221a: "√" SQUARE ROOT -->
+        <!-- U+221A: "√" SQUARE ROOT -->
         <Key
-            latin:keyLabel="\u221a" />
-        <!-- \u03c0: "π" GREEK SMALL LETTER PI -->
+            latin:keyLabel="&#x221A;" />
+        <!-- U+03C0: "π" GREEK SMALL LETTER PI -->
         <Key
-            latin:keyLabel="\u03c0"
+            latin:keyLabel="&#x03C0;"
             latin:moreKeys="Π" />
-        <!-- \u00f7: "÷" DIVISION SIGN -->
+        <!-- U+00F7: "÷" DIVISION SIGN -->
         <Key
-            latin:keyLabel="\u00f7" />
-        <!-- \u00d7: "×" MULTIPLICATION SIGN -->
+            latin:keyLabel="&#x00F7;" />
+        <!-- U+00D7: "×" MULTIPLICATION SIGN -->
         <Key
-            latin:keyLabel="\u00d7" />
+            latin:keyLabel="&#x00D7;" />
         <include
             latin:keyboardLayout="@xml/keys_curly_brackets" />
     </Row>
@@ -65,27 +65,27 @@
             latin:keyStyle="moreCurrency2KeyStyle" />
         <Key
             latin:keyStyle="moreCurrency3KeyStyle" />
-        <!-- \u00b0: "°" DEGREE SIGN
-             \u2032: "′" PRIME
-             \u2033: "″" DOUBLE PRIME -->
+        <!-- U+00B0: "°" DEGREE SIGN
+             U+2032: "′" PRIME
+             U+2033: "″" DOUBLE PRIME -->
         <Key
-            latin:keyLabel="\u00b0"
-            latin:moreKeys="\u2032,\u2033" />
-        <!-- \u2191: "↑" UPWARDS ARROW
-             \u2193: "↓" DOWNWARDS ARROW
-             \u2190: "←" LEFTWARDS ARROW
-             \u2192: "→" RIGHTWARDS ARROW -->
+            latin:keyLabel="&#x00B0;"
+            latin:moreKeys="&#x2032;,&#x2033;" />
+        <!-- U+2191: "↑" UPWARDS ARROW
+             U+2193: "↓" DOWNWARDS ARROW
+             U+2190: "←" LEFTWARDS ARROW
+             U+2192: "→" RIGHTWARDS ARROW -->
         <Key
             latin:keyLabel="^"
-            latin:moreKeys="\u2191,\u2193,\u2190,\u2192" />
+            latin:moreKeys="&#x2191;,&#x2193;,&#x2190;,&#x2192;" />
         <Key
             latin:keyLabel="_" />
-        <!-- \u2260: "≠" NOT EQUAL TO
-             \u2248: "≈" ALMOST EQUAL TO
-             \u221e: "∞" INFINITY -->
+        <!-- U+2260: "≠" NOT EQUAL TO
+             U+2248: "≈" ALMOST EQUAL TO
+             U+221E: "∞" INFINITY -->
         <Key
             latin:keyLabel="="
-            latin:moreKeys="\u2260,\u2248,\u221e" />
+            latin:moreKeys="&#x2260;,&#x2248;,&#x221E;" />
         <include
             latin:keyboardLayout="@xml/keys_square_brackets" />
     </Row>
@@ -96,20 +96,20 @@
             latin:keyStyle="backFromMoreSymbolKeyStyle"
             latin:keyWidth="15%p"
             latin:visualInsetsRight="1%p" />
-        <!-- \u2122: "™" TRADE MARK SIGN -->
+        <!-- U+2122: "™" TRADE MARK SIGN -->
         <Key
-            latin:keyLabel="\u2122" />
-        <!-- \u00ae: "®" REGISTERED SIGN -->
+            latin:keyLabel="&#x2122;" />
+        <!-- U+00AE: "®" REGISTERED SIGN -->
         <Key
-            latin:keyLabel="\u00ae" />
-        <!-- \u00a9: "©" COPYRIGHT SIGN -->
+            latin:keyLabel="&#x00AE;" />
+        <!-- U+00A9: "©" COPYRIGHT SIGN -->
         <Key
-            latin:keyLabel="\u00a9" />
-        <!-- \u00b6: "¶" PILCROW SIGN
-             \u00a7: "§" SECTION SIGN -->
+            latin:keyLabel="&#x00A9;" />
+        <!-- U+00B6: "¶" PILCROW SIGN
+             U+00A7: "§" SECTION SIGN -->
         <Key
-            latin:keyLabel="\u00b6"
-            latin:moreKeys="\u00a7" />
+            latin:keyLabel="&#x00B6;"
+            latin:moreKeys="&#x00A7;" />
         <Key
             latin:keyLabel="\\" />
         <include