diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
index b6b6ffadeffe01f00ca4fdb665453102a9b02aab..195223702a3e7dc78417bb7a57d52094ecf3b27b 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
@@ -379,54 +379,55 @@ public final class KeyboardTextsSet {
/* Language af: Afrikaans */
private static final String[] LANGUAGE_af = {
- // This is the same as Dutch except promoting vowels with circumflex and diaeresis.
+ // This is the same as Dutch except more keys of y and demoting vowels with diaeresis.
+ // 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+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// 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
- /* 0 */ "\u00E2,\u00E4,\u00E1,\u00E0,\u00E6,\u00E3,\u00E5,\u0101",
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ /* 0 */ "\u00E1,\u00E2,\u00E4,\u00E0,\u00E6,\u00E3,\u00E5,\u0101",
// 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
- /* 1 */ "\u00EA,\u00EB,\u00E9,\u00E8,\u0119,\u0117,\u0113",
- // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ /* 1 */ "\u00E9,\u00E8,\u00EA,\u00EB,\u0119,\u0117,\u0113",
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+ // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
// U+0133: "ij" LATIN SMALL LIGATURE IJ
- /* 2 */ "\u00EC,\u00EF,\u00ED,\u00EE,\u012F,\u012B,\u0133",
+ /* 2 */ "\u00ED,\u00EC,\u00EF,\u00EE,\u012F,\u012B,\u0133",
+ // 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+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// 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
- /* 3 */ "\u00F4,\u00F6,\u00F3,\u00F2,\u00F5,\u0153,\u00F8,\u014D",
+ /* 3 */ "\u00F3,\u00F4,\u00F6,\u00F2,\u00F5,\u0153,\u00F8,\u014D",
+ // 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+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- /* 4 */ "\u00FB,\u00FC,\u00FA,\u00F9,\u016B",
+ /* 4 */ "\u00FA,\u00FB,\u00FC,\u00F9,\u016B",
/* 5 */ null,
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
/* 6 */ "\u00F1,\u0144",
/* 7 */ null,
+ // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+0133: "ij" LATIN SMALL LIGATURE IJ
- /* 8 */ "\u0133",
+ /* 8 */ "\u00FD,\u0133",
};
/* Language ar: Arabic */
diff --git a/tools/maketext/res/values-af/donottranslate-more-keys.xml b/tools/maketext/res/values-af/donottranslate-more-keys.xml
index 15a281a4482ff8ec3f3ddbe7853f5e1d8625e2f3..ee96f442d716cfca99bb5e38b7998df91e0acbf6 100644
--- a/tools/maketext/res/values-af/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-af/donottranslate-more-keys.xml
@@ -18,50 +18,52 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- This is the same as Dutch except promoting vowels with circumflex and diaeresis. -->
- <!-- U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ <!-- This is the same as Dutch except more keys of y and demoting vowels with diaeresis. -->
+ <!-- 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+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
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">â,ä,á,à,æ,ã,å,ā</string>
- <!-- U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+ <string name="more_keys_for_a">á,â,ä,à,æ,ã,å,ā</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">ê,ë,é,è,ę,ė,ē</string>
- <!-- U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
+ <string name="more_keys_for_e">é,è,ê,ë,ę,ė,ē</string>
+ <!-- U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+ U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
U+0133: "ij" LATIN SMALL LIGATURE IJ -->
- <string name="more_keys_for_i">ì,ï,í,î,į,ī,ij</string>
- <!-- U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ <string name="more_keys_for_i">í,ì,ï,î,į,ī,ij</string>
+ <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
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">ô,ö,ó,ò,õ,œ,ø,ō</string>
- <!-- U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ <string name="more_keys_for_o">ó,ô,ö,ò,õ,œ,ø,ō</string>
+ <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+ U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON -->
- <string name="more_keys_for_u">û,ü,ú,ù,ū</string>
+ <string name="more_keys_for_u">ú,û,ü,ù,ū</string>
<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE -->
<string name="more_keys_for_n">ñ,ń</string>
- <!-- U+0133: "ij" LATIN SMALL LIGATURE IJ -->
- <string name="more_keys_for_y">ij</string>
+ <string name="more_keys_for_y">ý,ŷ,ÿ,ij</string>
+ <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
+ U+0133: "ij" LATIN SMALL LIGATURE IJ -->
+ <string name="more_keys_for_y">ý,ij</string>
</resources>