diff --git a/java/res/xml-sw600dp/rows_esperanto.xml b/java/res/xml-sw600dp/rows_esperanto.xml
deleted file mode 100644
index e0c62fed71ff134a6dfc9f960e5ebe1b35371090..0000000000000000000000000000000000000000
--- a/java/res/xml-sw600dp/rows_esperanto.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
- <Row
- latin:keyWidth="9.0%p"
- >
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto1"
- latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="9.0%p"
- >
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto2" />
- <Key
- latin:keyStyle="enterKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="9.0%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto3" />
- <include
- latin:keyboardLayout="@xml/keys_comma_period" />
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml-sw768dp/rows_esperanto.xml b/java/res/xml-sw768dp/rows_esperanto.xml
deleted file mode 100644
index 0b3bb1fe035d12c358dc0acd47d5b729e28ef370..0000000000000000000000000000000000000000
--- a/java/res/xml-sw768dp/rows_esperanto.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
- <Row
- latin:keyWidth="8.282%p"
- >
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyLabelFlags="alignLeft"
- latin:keyWidth="7.969%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto1"
- latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight"/>
- </Row>
- <Row
- latin:keyWidth="8.125%p"
- >
- <Key
- latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabelFlags="alignLeft"
- latin:keyWidth="10.167%"/>
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto2" />
- <Key
- latin:keyStyle="enterKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="8.047%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="13.829%p"/>
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto3" />
- <include
- latin:keyboardLayout="@xml/keys_comma_period" />
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/kbd_esperanto.xml b/java/res/xml/kbd_esperanto.xml
deleted file mode 100644
index c0c45dd117c3cbecff046c57aa115d482b3f864a..0000000000000000000000000000000000000000
--- a/java/res/xml/kbd_esperanto.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/rows_esperanto" />
-</Keyboard>
diff --git a/java/res/xml/keyboard_layout_set_esperanto.xml b/java/res/xml/keyboard_layout_set_esperanto.xml
deleted file mode 100644
index 94a386d6cf0129305b47709fee7d67fb501d631c..0000000000000000000000000000000000000000
--- a/java/res/xml/keyboard_layout_set_esperanto.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
- <Element
- latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_esperanto"
- latin:enableProximityCharsCorrection="true" />
- <Element
- latin:elementName="symbols"
- latin:elementKeyboard="@xml/kbd_symbols" />
- <Element
- latin:elementName="symbolsShifted"
- latin:elementKeyboard="@xml/kbd_symbols_shift" />
- <Element
- latin:elementName="phone"
- latin:elementKeyboard="@xml/kbd_phone" />
- <Element
- latin:elementName="phoneSymbols"
- latin:elementKeyboard="@xml/kbd_phone_symbols" />
- <Element
- latin:elementName="number"
- latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 9b769f66e9f8dfa63190f7cb060112c1f4273575..613e9f6c46c2e6bc5fa64ce12d9e8e094adcf3a5 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -34,7 +34,7 @@
el: Greek/greek
en_US: English United States/qwerty
en_GB: English Great Britain/qwerty
- eo: Esperanto/esperanto
+ eo: Esperanto/spanish
es: Spanish/spanish
et: Estonian/nordic
fa: Persian/arabic
@@ -157,7 +157,7 @@
android:label="@string/subtype_generic"
android:imeSubtypeLocale="eo"
android:imeSubtypeMode="keyboard"
- android:imeSubtypeExtraValue="KeyboardLayoutSet=esperanto,AsciiCapable"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
diff --git a/java/res/xml/rowkeys_esperanto1.xml b/java/res/xml/rowkeys_esperanto1.xml
deleted file mode 100644
index 6994d4b5ec0a874aa995580758151602ad4dfa83..0000000000000000000000000000000000000000
--- a/java/res/xml/rowkeys_esperanto1.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <!-- U+015D: "Å" LATIN SMALL LETTER S WITH CIRCUMFLEX -->
- <Key
- latin:keyLabel="ŝ"
- latin:keyHintLabel="1"
- latin:additionalMoreKeys="1"
- latin:moreKeys="q" />
- <!-- U+011D: "Ä" LATIN SMALL LETTER G WITH CIRCUMFLEX
- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX -->
- <Key
- latin:keyLabel="ĝ"
- latin:keyHintLabel="2"
- latin:additionalMoreKeys="2"
- latin:moreKeys="w,ŵ" />
- <!-- 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 -->
- <Key
- latin:keyLabel="e"
- latin:keyHintLabel="3"
- latin:additionalMoreKeys="3"
- latin:moreKeys="é,ě,è,ê,ë,ę,ė,ē" />
- <!-- U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
- U+0155: "Å•" LATIN SMALL LETTER R WITH ACUTE
- U+0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA -->
- <Key
- latin:keyLabel="r"
- latin:keyHintLabel="4"
- latin:additionalMoreKeys="4"
- latin:moreKeys="ř,ŕ,ŗ" />
- <!-- U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
- U+021B: "È›" LATIN SMALL LETTER T WITH COMMA BELOW
- U+0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
- U+0167: "ŧ" LATIN SMALL LETTER T WITH STROKE -->
- <Key
- latin:keyLabel="t"
- latin:keyHintLabel="5"
- latin:additionalMoreKeys="5"
- latin:moreKeys="ť,ț,ţ,ŧ" />
- <!-- U+016D: "Å" LATIN SMALL LETTER U WITH BREVE
- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
- U+0177: "Å·" LATIN SMALL LETTER Y WITH CIRCUMFLEX
- U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- U+00FE: "þ" LATIN SMALL LETTER THORN -->
- <Key
- latin:keyLabel="ŭ"
- latin:keyHintLabel="6"
- latin:additionalMoreKeys="6"
- latin:moreKeys="y,ý,ŷ,ÿ,þ" />
- <!-- 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
- U+0169: "Å©" LATIN SMALL LETTER U WITH TILDE
- U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
- U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
- U+00B5: "µ" MICRO SIGN -->
- <Key
- latin:keyLabel="u"
- latin:keyHintLabel="7"
- latin:additionalMoreKeys="7"
- latin:moreKeys="ú,ů,û,ü,ù,ū,ũ,ű,ų,µ" />
- <!-- 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+0129: "Ä©" LATIN SMALL LETTER I WITH TILDE
- U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
- U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- U+0131: "ı" LATIN SMALL LETTER DOTLESS I
- U+0133: "ij" LATIN SMALL LIGATURE IJ -->
- <Key
- latin:keyLabel="i"
- latin:keyHintLabel="8"
- latin:additionalMoreKeys="8"
- latin:moreKeys="í,î,ï,ĩ,ì,į,ī,ı,ij" />
- <!-- 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
- U+0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
- U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
- <Key
- latin:keyLabel="o"
- latin:keyHintLabel="9"
- latin:additionalMoreKeys="9"
- latin:moreKeys="ó,ö,ô,ò,õ,œ,ø,ō,ő,º" />
- <Key
- latin:keyLabel="p"
- latin:keyHintLabel="0"
- latin:additionalMoreKeys="0" />
-</merge>
diff --git a/java/res/xml/rowkeys_esperanto2.xml b/java/res/xml/rowkeys_esperanto2.xml
deleted file mode 100644
index ebc968a7026e20259f1917b35656a6d70924616d..0000000000000000000000000000000000000000
--- a/java/res/xml/rowkeys_esperanto2.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <!-- 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
- U+0103: "ă" LATIN SMALL LETTER A WITH BREVE
- U+0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
- U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
- <Key
- latin:keyLabel="a"
- latin:moreKeys="á,à,â,ä,æ,ã,å,ā,ă,ą,ª" />
- <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
- U+0161: "Å¡" LATIN SMALL LETTER S WITH CARON
- U+015B: "Å›" LATIN SMALL LETTER S WITH ACUTE
- U+0219: "È™" LATIN SMALL LETTER S WITH COMMA BELOW
- U+015F: "ÅŸ" LATIN SMALL LETTER S WITH CEDILLA -->
- <Key
- latin:keyLabel="s"
- latin:moreKeys="ß,š,ś,ș,ş" />
- <!-- U+00F0: "ð" LATIN SMALL LETTER ETH
- U+010F: "Ä" LATIN SMALL LETTER D WITH CARON
- U+0111: "Ä‘" LATIN SMALL LETTER D WITH STROKE -->
- <Key
- latin:keyLabel="d"
- latin:moreKeys="ð,ď,đ" />
- <Key
- latin:keyLabel="f" />
- <!-- U+011F: "ÄŸ" LATIN SMALL LETTER G WITH BREVE
- U+0121: "Ä¡" LATIN SMALL LETTER G WITH DOT ABOVE
- U+0123: "Ä£" LATIN SMALL LETTER G WITH CEDILLA -->
- <Key
- latin:keyLabel="g"
- latin:moreKeys="ğ,ġ,ģ" />
- <!-- U+0125: "Ä¥" LATIN SMALL LETTER H WITH CIRCUMFLEX
- U+0127: "ħ" LATIN SMALL LETTER H WITH STROKE -->
- <Key
- latin:keyLabel="h"
- latin:moreKeys="ĥ,ħ" />
- <Key
- latin:keyLabel="j" />
- <!-- U+0137: "Ä·" LATIN SMALL LETTER K WITH CEDILLA
- U+0138: "ĸ" LATIN SMALL LETTER KRA -->
- <Key
- latin:keyLabel="k"
- latin:moreKeys="ķ,ĸ" />
- <!-- U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
- U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
- U+013E: "ľ" LATIN SMALL LETTER L WITH CARON
- U+0140: "Å€" LATIN SMALL LETTER L WITH MIDDLE DOT
- U+0142: "Å‚" LATIN SMALL LETTER L WITH STROKE -->
- <Key
- latin:keyLabel="l"
- latin:moreKeys="ĺ,ļ,ľ,ŀ,ł" />
- <!-- U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX -->
- <Key
- latin:keyLabel="ĵ" />
-</merge>
diff --git a/java/res/xml/rowkeys_esperanto3.xml b/java/res/xml/rowkeys_esperanto3.xml
deleted file mode 100644
index b2eab8d60f841f5ef75191824db264719d9cb802..0000000000000000000000000000000000000000
--- a/java/res/xml/rowkeys_esperanto3.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <!-- U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
- U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON -->
- <Key
- latin:keyLabel="z"
- latin:moreKeys="ź,ż,ž" />
- <!-- U+0109: "ĉ" LATIN SMALL LETTER C WITH CIRCUMFLEX -->
- <Key
- latin:keyLabel="ĉ"
- latin:moreKeys="x" />
- <!-- U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
- U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- U+010B: "Ä‹" LATIN SMALL LETTER C WITH DOT ABOVE -->
- <Key
- latin:keyLabel="c"
- latin:moreKeys="ć,č,ç,ċ" />
- <!-- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX -->
- <Key
- latin:keyLabel="v"
- latin:moreKeys="w,ŵ" />
- <Key
- latin:keyLabel="b" />
- <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
- U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
- U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
- U+0148: "ň" LATIN SMALL LETTER N WITH CARON
- U+0149: "ʼn" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
- U+014B: "Å‹" LATIN SMALL LETTER ENG -->
- <Key
- latin:keyLabel="n"
- latin:moreKeys="ñ,ń,ņ,ň,ʼn,ŋ" />
- <Key
- latin:keyLabel="m" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml
index 84d61346040cb701808a05d24d9865deed93be62..e7c9b590beefc79a8f74e2aa0e045f004400407f 100644
--- a/java/res/xml/rowkeys_qwerty1.xml
+++ b/java/res/xml/rowkeys_qwerty1.xml
@@ -22,11 +22,12 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="q"
+ latin:keyLabel="!text/keylabel_for_q"
latin:keyHintLabel="1"
- latin:additionalMoreKeys="1" />
+ latin:additionalMoreKeys="1"
+ latin:moreKeys="!text/more_keys_for_q" />
<Key
- latin:keyLabel="w"
+ latin:keyLabel="!text/keylabel_for_w"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="!text/more_keys_for_w" />
@@ -46,7 +47,7 @@
latin:additionalMoreKeys="5"
latin:moreKeys="!text/more_keys_for_t" />
<Key
- latin:keyLabel="y"
+ latin:keyLabel="!text/keylabel_for_y"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
latin:moreKeys="!text/more_keys_for_y" />
diff --git a/java/res/xml/rowkeys_qwerty3.xml b/java/res/xml/rowkeys_qwerty3.xml
index a74aeb842473bd194beceb24884ecbbbdda6f27b..b70fd729f78e6628021ad9bb693e55a955a5f114 100644
--- a/java/res/xml/rowkeys_qwerty3.xml
+++ b/java/res/xml/rowkeys_qwerty3.xml
@@ -25,7 +25,8 @@
latin:keyLabel="z"
latin:moreKeys="!text/more_keys_for_z" />
<Key
- latin:keyLabel="x" />
+ latin:keyLabel="!text/keylabel_for_x"
+ latin:moreKeys="!text/more_keys_for_x" />
<Key
latin:keyLabel="c"
latin:moreKeys="!text/more_keys_for_c" />
diff --git a/java/res/xml/rowkeys_spanish2.xml b/java/res/xml/rowkeys_spanish2.xml
index 4c7e5799763a8019aa5f4258c1ec777312dbb43f..335dff33c6bc104b8f87b29d057e9bb32661f483 100644
--- a/java/res/xml/rowkeys_spanish2.xml
+++ b/java/res/xml/rowkeys_spanish2.xml
@@ -25,5 +25,5 @@
latin:keyboardLayout="@xml/rowkeys_qwerty2" />
<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
<Key
- latin:keyLabel="ñ" />
+ latin:keyLabel="!text/keylabel_for_spanish_row2_10" />
</merge>
diff --git a/java/res/xml/rows_esperanto.xml b/java/res/xml/rows_esperanto.xml
deleted file mode 100644
index c5f626e9b45edb0fcc85083e2f8bcbbf697de85f..0000000000000000000000000000000000000000
--- a/java/res/xml/rows_esperanto.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
- <Row
- latin:keyWidth="10%p"
- >
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto1" />
- </Row>
- <Row
- latin:keyWidth="10%p"
- >
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto2" />
- </Row>
- <Row
- latin:keyWidth="10%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="15%p"
- latin:visualInsetsRight="1%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto3" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight"
- latin:visualInsetsLeft="1%p" />
- </Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
index a608cdef04ae5fdbb1dd0aa5235fc9ff7838568f..3b7c6ad7a1c39e4200cc358b68dc97e423d40a28 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
@@ -210,22 +210,29 @@ public final class KeyboardTextsSet {
/* 103 */ "keylabel_for_apostrophe",
/* 104 */ "keyhintlabel_for_apostrophe",
/* 105 */ "more_keys_for_apostrophe",
- /* 106 */ "more_keys_for_am_pm",
- /* 107 */ "settings_as_more_key",
- /* 108 */ "shortcut_as_more_key",
- /* 109 */ "action_next_as_more_key",
- /* 110 */ "action_previous_as_more_key",
- /* 111 */ "label_to_more_symbol_key",
- /* 112 */ "label_to_more_symbol_for_tablet_key",
- /* 113 */ "label_tab_key",
- /* 114 */ "label_to_phone_numeric_key",
- /* 115 */ "label_to_phone_symbols_key",
- /* 116 */ "label_time_am",
- /* 117 */ "label_time_pm",
- /* 118 */ "label_to_symbol_key_pcqwerty",
- /* 119 */ "keylabel_for_popular_domain",
- /* 120 */ "more_keys_for_popular_domain",
- /* 121 */ "more_keys_for_smiley",
+ /* 106 */ "more_keys_for_q",
+ /* 107 */ "more_keys_for_x",
+ /* 108 */ "keylabel_for_q",
+ /* 109 */ "keylabel_for_w",
+ /* 110 */ "keylabel_for_y",
+ /* 111 */ "keylabel_for_x",
+ /* 112 */ "keylabel_for_spanish_row2_10",
+ /* 113 */ "more_keys_for_am_pm",
+ /* 114 */ "settings_as_more_key",
+ /* 115 */ "shortcut_as_more_key",
+ /* 116 */ "action_next_as_more_key",
+ /* 117 */ "action_previous_as_more_key",
+ /* 118 */ "label_to_more_symbol_key",
+ /* 119 */ "label_to_more_symbol_for_tablet_key",
+ /* 120 */ "label_tab_key",
+ /* 121 */ "label_to_phone_numeric_key",
+ /* 122 */ "label_to_phone_symbols_key",
+ /* 123 */ "label_time_am",
+ /* 124 */ "label_time_pm",
+ /* 125 */ "label_to_symbol_key_pcqwerty",
+ /* 126 */ "keylabel_for_popular_domain",
+ /* 127 */ "more_keys_for_popular_domain",
+ /* 128 */ "more_keys_for_smiley",
};
private static final String EMPTY = "";
@@ -348,33 +355,41 @@ public final class KeyboardTextsSet {
/* 103 */ "\'",
/* 104 */ "\"",
/* 105 */ "\"",
- /* 106 */ "!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm",
- /* 107 */ "!icon/settings_key|!code/key_settings",
- /* 108 */ "!icon/shortcut_key|!code/key_shortcut",
- /* 109 */ "!hasLabels!,!text/label_next_key|!code/key_action_next",
- /* 110 */ "!hasLabels!,!text/label_previous_key|!code/key_action_previous",
+ /* 106 */ EMPTY,
+ /* 107 */ EMPTY,
+ /* 108 */ "q",
+ /* 109 */ "w",
+ /* 110 */ "y",
+ /* 111 */ "x",
+ // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ /* 112 */ "\u00F1",
+ /* 113 */ "!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm",
+ /* 114 */ "!icon/settings_key|!code/key_settings",
+ /* 115 */ "!icon/shortcut_key|!code/key_shortcut",
+ /* 116 */ "!hasLabels!,!text/label_next_key|!code/key_action_next",
+ /* 117 */ "!hasLabels!,!text/label_previous_key|!code/key_action_previous",
// Label for "switch to more symbol" modifier key. Must be short to fit on key!
- /* 111 */ "= \\ <",
+ /* 118 */ "= \\ <",
// Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key!
- /* 112 */ "~ \\ {",
+ /* 119 */ "~ \\ {",
// Label for "Tab" key. Must be short to fit on key!
- /* 113 */ "Tab",
+ /* 120 */ "Tab",
// Label for "switch to phone numeric" key. Must be short to fit on key!
- /* 114 */ "123",
+ /* 121 */ "123",
// Label for "switch to phone symbols" key. Must be short to fit on key!
// U+FF0A: "＊" FULLWIDTH ASTERISK
// U+FF03: "＃" FULLWIDTH NUMBER SIGN
- /* 115 */ "\uFF0A\uFF03",
+ /* 122 */ "\uFF0A\uFF03",
// Key label for "ante meridiem"
- /* 116 */ "AM",
+ /* 123 */ "AM",
// Key label for "post meridiem"
- /* 117 */ "PM",
+ /* 124 */ "PM",
// Label for "switch to symbols" key on PC QWERTY layout
- /* 118 */ "Sym",
- /* 119 */ ".com",
+ /* 125 */ "Sym",
+ /* 126 */ ".com",
// popular web domains for the locale - most popular, displayed on the keyboard
- /* 120 */ "!hasLabels!,.net,.org,.gov,.edu",
- /* 121 */ "!fixedColumnOrder!5,!hasLabels!,=-O|=-O ,:-P|:-P ,;-)|;-) ,:-(|:-( ,:-)|:-) ,:-!|:-! ,:-$|:-$ ,B-)|B-) ,:O|:O ,:-*|:-* ,:-D|:-D ,:\'(|:\'( ,:-\\\\|:-\\\\ ,O:-)|O:-) ,:-[|:-[ ",
+ /* 127 */ "!hasLabels!,.net,.org,.gov,.edu",
+ /* 128 */ "!fixedColumnOrder!5,!hasLabels!,=-O|=-O ,:-P|:-P ,;-)|;-) ,:-(|:-( ,:-)|:-) ,:-!|:-! ,:-$|:-$ ,B-)|B-) ,:O|:O ,:-*|:-* ,:-D|:-D ,:\'(|:\'( ,:-\\\\|:-\\\\ ,O:-)|O:-) ,:-[|:-[ ",
};
/* Language af: Afrikaans */
@@ -857,6 +872,144 @@ public final class KeyboardTextsSet {
/* 7 */ "\u00E7",
};
+ /* Language eo: Esperanto */
+ private static final String[] LANGUAGE_eo = {
+ // 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
+ // U+0103: "ă" LATIN SMALL LETTER A WITH BREVE
+ // U+0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
+ // U+00AA: "ª" FEMININE ORDINAL INDICATOR
+ /* 0 */ "\u00E1,\u00E0,\u00E2,\u00E4,\u00E6,\u00E3,\u00E5,\u0101,\u0103,\u0105,\u00AA",
+ // 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
+ /* 1 */ "\u00E9,\u011B,\u00E8,\u00EA,\u00EB,\u0119,\u0117,\u0113",
+ // 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+0129: "Ä©" LATIN SMALL LETTER I WITH TILDE
+ // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+ // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+ // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
+ // U+0131: "ı" LATIN SMALL LETTER DOTLESS I
+ // U+0133: "ij" LATIN SMALL LIGATURE IJ
+ /* 2 */ "\u00ED,\u00EE,\u00EF,\u0129,\u00EC,\u012F,\u012B,\u0131,\u0133",
+ // 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
+ // U+0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+ // U+00BA: "º" MASCULINE ORDINAL INDICATOR
+ /* 3 */ "\u00F3,\u00F6,\u00F4,\u00F2,\u00F5,\u0153,\u00F8,\u014D,\u0151,\u00BA",
+ // 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
+ // U+0169: "Å©" LATIN SMALL LETTER U WITH TILDE
+ // U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
+ // U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+ // U+00B5: "µ" MICRO SIGN
+ /* 4 */ "\u00FA,\u016F,\u00FB,\u00FC,\u00F9,\u016B,\u0169,\u0171,\u0173,\u00B5",
+ // U+00DF: "ß" LATIN SMALL LETTER SHARP S
+ // U+0161: "Å¡" LATIN SMALL LETTER S WITH CARON
+ // U+015B: "Å›" LATIN SMALL LETTER S WITH ACUTE
+ // U+0219: "È™" LATIN SMALL LETTER S WITH COMMA BELOW
+ // U+015F: "ÅŸ" LATIN SMALL LETTER S WITH CEDILLA
+ /* 5 */ "\u00DF,\u0161,\u015B,\u0219,\u015F",
+ // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ // U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
+ // U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+ // U+0148: "ň" LATIN SMALL LETTER N WITH CARON
+ // U+0149: "ʼn" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+ // U+014B: "Å‹" LATIN SMALL LETTER ENG
+ /* 6 */ "\u00F1,\u0144,\u0146,\u0148,\u0149,\u014B",
+ // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ // U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
+ // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ // U+010B: "Ä‹" LATIN SMALL LETTER C WITH DOT ABOVE
+ /* 7 */ "\u0107,\u010D,\u00E7,\u010B",
+ // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
+ // U+0177: "Å·" LATIN SMALL LETTER Y WITH CIRCUMFLEX
+ // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
+ // U+00FE: "þ" LATIN SMALL LETTER THORN
+ /* 8 */ "y,\u00FD,\u0177,\u00FF,\u00FE",
+ // U+00F0: "ð" LATIN SMALL LETTER ETH
+ // U+010F: "Ä" LATIN SMALL LETTER D WITH CARON
+ // U+0111: "Ä‘" LATIN SMALL LETTER D WITH STROKE
+ /* 9 */ "\u00F0,\u010F,\u0111",
+ // U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
+ // U+0155: "Å•" LATIN SMALL LETTER R WITH ACUTE
+ // U+0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA
+ /* 10 */ "\u0159,\u0155,\u0157",
+ // U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
+ // U+021B: "È›" LATIN SMALL LETTER T WITH COMMA BELOW
+ // U+0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
+ // U+0167: "ŧ" LATIN SMALL LETTER T WITH STROKE
+ /* 11 */ "\u0165,\u021B,\u0163,\u0167",
+ // U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
+ // U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+ // U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
+ /* 12 */ "\u017A,\u017C,\u017E",
+ // U+0137: "Ä·" LATIN SMALL LETTER K WITH CEDILLA
+ // U+0138: "ĸ" LATIN SMALL LETTER KRA
+ /* 13 */ "\u0137,\u0138",
+ // U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+ // U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+ // U+013E: "ľ" LATIN SMALL LETTER L WITH CARON
+ // U+0140: "Å€" LATIN SMALL LETTER L WITH MIDDLE DOT
+ // U+0142: "Å‚" LATIN SMALL LETTER L WITH STROKE
+ /* 14 */ "\u013A,\u013C,\u013E,\u0140,\u0142",
+ // U+011F: "ÄŸ" LATIN SMALL LETTER G WITH BREVE
+ // U+0121: "Ä¡" LATIN SMALL LETTER G WITH DOT ABOVE
+ // U+0123: "Ä£" LATIN SMALL LETTER G WITH CEDILLA
+ /* 15 */ "\u011F,\u0121,\u0123",
+ // U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX
+ /* 16 */ "w,\u0175",
+ // U+0125: "Ä¥" LATIN SMALL LETTER H WITH CIRCUMFLEX
+ // U+0127: "ħ" LATIN SMALL LETTER H WITH STROKE
+ /* 17 */ "\u0125,\u0127",
+ /* 18 */ null,
+ // U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX
+ /* 19 */ "w,\u0175",
+ /* 20~ */
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null,
+ /* ~105 */
+ /* 106 */ "q",
+ /* 107 */ "x",
+ // U+015D: "Å" LATIN SMALL LETTER S WITH CIRCUMFLEX
+ /* 108 */ "\u015D",
+ // U+011D: "Ä" LATIN SMALL LETTER G WITH CIRCUMFLEX
+ /* 109 */ "\u011D",
+ // U+016D: "Å" LATIN SMALL LETTER U WITH BREVE
+ /* 110 */ "\u016D",
+ // U+0109: "ĉ" LATIN SMALL LETTER C WITH CIRCUMFLEX
+ /* 111 */ "\u0109",
+ // U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX
+ /* 112 */ "\u0135",
+ };
+
/* Language es: Spanish */
private static final String[] LANGUAGE_es = {
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
@@ -2695,6 +2848,7 @@ public final class KeyboardTextsSet {
"da", LANGUAGE_da, /* Danish */
"de", LANGUAGE_de, /* German */
"en", LANGUAGE_en, /* English */
+ "eo", LANGUAGE_eo, /* Esperanto */
"es", LANGUAGE_es, /* Spanish */
"et", LANGUAGE_et, /* Estonian */
"fa", LANGUAGE_fa, /* Persian */
diff --git a/tools/maketext/res/values-eo/donottranslate-more-keys.xml b/tools/maketext/res/values-eo/donottranslate-more-keys.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e929869e2374ade315822e41458bf66c61e1e8f7
--- /dev/null
+++ b/tools/maketext/res/values-eo/donottranslate-more-keys.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- 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
+ U+0103: "ă" LATIN SMALL LETTER A WITH BREVE
+ U+0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
+ U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
+ <string name="more_keys_for_a">á,à,â,ä,æ,ã,å,ā,ă,ą,ª</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">é,ě,è,ê,ë,ę,ė,ē</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+0129: "Ä©" LATIN SMALL LETTER I WITH TILDE
+ U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+ U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+ U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
+ U+0131: "ı" LATIN SMALL LETTER DOTLESS I
+ U+0133: "ij" LATIN SMALL LIGATURE IJ -->
+ <string name="more_keys_for_i">í,î,ï,ĩ,ì,į,ī,ı,ij</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
+ U+0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
+ U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
+ <string name="more_keys_for_o">ó,ö,ô,ò,õ,œ,ø,ō,ő,º</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
+ U+0169: "Å©" LATIN SMALL LETTER U WITH TILDE
+ U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
+ U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
+ U+00B5: "µ" MICRO SIGN -->
+ <string name="more_keys_for_u">ú,ů,û,ü,ù,ū,ũ,ű,ų,µ</string>
+ <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
+ U+0161: "Å¡" LATIN SMALL LETTER S WITH CARON
+ U+015B: "Å›" LATIN SMALL LETTER S WITH ACUTE
+ U+0219: "È™" LATIN SMALL LETTER S WITH COMMA BELOW
+ U+015F: "ÅŸ" LATIN SMALL LETTER S WITH CEDILLA -->
+ <string name="more_keys_for_s">ß,š,ś,ș,ş</string>
+ <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
+ U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
+ U+0148: "ň" LATIN SMALL LETTER N WITH CARON
+ U+0149: "ʼn" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+ U+014B: "Å‹" LATIN SMALL LETTER ENG -->
+ <string name="more_keys_for_n">ñ,ń,ņ,ň,ʼn,ŋ</string>
+ <!-- U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
+ U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ U+010B: "Ä‹" LATIN SMALL LETTER C WITH DOT ABOVE -->
+ <string name="more_keys_for_c">ć,č,ç,ċ</string>
+ <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
+ U+0177: "Å·" LATIN SMALL LETTER Y WITH CIRCUMFLEX
+ U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
+ U+00FE: "þ" LATIN SMALL LETTER THORN -->
+ <string name="more_keys_for_y">y,ý,ŷ,ÿ,þ</string>
+ <!-- U+00F0: "ð" LATIN SMALL LETTER ETH
+ U+010F: "Ä" LATIN SMALL LETTER D WITH CARON
+ U+0111: "Ä‘" LATIN SMALL LETTER D WITH STROKE -->
+ <string name="more_keys_for_d">ð,ď,đ</string>
+ <!-- U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
+ U+0155: "Å•" LATIN SMALL LETTER R WITH ACUTE
+ U+0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA -->
+ <string name="more_keys_for_r">ř,ŕ,ŗ</string>
+ <!-- U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
+ U+021B: "È›" LATIN SMALL LETTER T WITH COMMA BELOW
+ U+0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
+ U+0167: "ŧ" LATIN SMALL LETTER T WITH STROKE -->
+ <string name="more_keys_for_t">ť,ț,ţ,ŧ</string>
+ <!-- U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
+ U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
+ U+017E: "ž" LATIN SMALL LETTER Z WITH CARON -->
+ <string name="more_keys_for_z">ź,ż,ž</string>
+ <!-- U+0137: "Ä·" LATIN SMALL LETTER K WITH CEDILLA
+ U+0138: "ĸ" LATIN SMALL LETTER KRA -->
+ <string name="more_keys_for_k">ķ,ĸ</string>
+ <!-- U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
+ U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
+ U+013E: "ľ" LATIN SMALL LETTER L WITH CARON
+ U+0140: "Å€" LATIN SMALL LETTER L WITH MIDDLE DOT
+ U+0142: "Å‚" LATIN SMALL LETTER L WITH STROKE -->
+ <string name="more_keys_for_l">ĺ,ļ,ľ,ŀ,ł</string>
+ <!-- U+011F: "ÄŸ" LATIN SMALL LETTER G WITH BREVE
+ U+0121: "Ä¡" LATIN SMALL LETTER G WITH DOT ABOVE
+ U+0123: "Ä£" LATIN SMALL LETTER G WITH CEDILLA -->
+ <string name="more_keys_for_g">ğ,ġ,ģ</string>
+ <!-- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX -->
+ <string name="more_keys_for_v">w,ŵ</string>
+ <!-- U+0125: "Ä¥" LATIN SMALL LETTER H WITH CIRCUMFLEX
+ U+0127: "ħ" LATIN SMALL LETTER H WITH STROKE -->
+ <string name="more_keys_for_h">ĥ,ħ</string>
+ <!-- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX -->
+ <string name="more_keys_for_w">w,ŵ</string>
+ <string name="more_keys_for_q">q</string>
+ <string name="more_keys_for_x">x</string>
+ <!-- U+015D: "Å" LATIN SMALL LETTER S WITH CIRCUMFLEX -->
+ <string name="keylabel_for_q">ŝ</string>
+ <!-- U+011D: "Ä" LATIN SMALL LETTER G WITH CIRCUMFLEX -->
+ <string name="keylabel_for_w">ĝ</string>
+ <!-- U+016D: "Å" LATIN SMALL LETTER U WITH BREVE -->
+ <string name="keylabel_for_y">ŭ</string>
+ <!-- U+0109: "ĉ" LATIN SMALL LETTER C WITH CIRCUMFLEX -->
+ <string name="keylabel_for_x">ĉ</string>
+ <!-- U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX -->
+ <string name="keylabel_for_spanish_row2_10">ĵ</string>
+</resources>
diff --git a/tools/maketext/res/values/donottranslate-more-keys.xml b/tools/maketext/res/values/donottranslate-more-keys.xml
index 543e936205f4b2c0ddf7e93fdf98ff3409ea7dfc..4d7100b8c57d1108ab4b1c44eacb6c4e5f6a4cbd 100644
--- a/tools/maketext/res/values/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values/donottranslate-more-keys.xml
@@ -177,6 +177,14 @@
<string name="keylabel_for_apostrophe">\'</string>
<string name="keyhintlabel_for_apostrophe">\"</string>
<string name="more_keys_for_apostrophe">\"</string>
+ <string name="more_keys_for_q"></string>
+ <string name="more_keys_for_x"></string>
+ <string name="keylabel_for_q">q</string>
+ <string name="keylabel_for_w">w</string>
+ <string name="keylabel_for_y">y</string>
+ <string name="keylabel_for_x">x</string>
+ <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
+ <string name="keylabel_for_spanish_row2_10">ñ</string>
<string name="more_keys_for_am_pm">!fixedColumnOrder!2,!hasLabels!,\@string/label_time_am,\@string/label_time_pm</string>
<string name="settings_as_more_key">!icon/settings_key|!code/key_settings</string>
<string name="shortcut_as_more_key">!icon/shortcut_key|!code/key_shortcut</string>