diff --git a/java/res/values-cs/donottranslate.xml b/java/res/values-cs/altchars.xml
similarity index 62%
rename from java/res/values-cs/donottranslate.xml
rename to java/res/values-cs/altchars.xml
index 9c2a476a6..db2213df7 100644
--- a/java/res/values-cs/donottranslate.xml
+++ b/java/res/values-cs/altchars.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2009, The Android Open Source Project
+** Copyright 2010, 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.
@@ -18,12 +18,17 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Accented characters related to "d" -->
+    <string name="alternates_for_a">áàâãäåæ</string>
+    <string name="alternates_for_e">éěèêë</string>
+    <string name="alternates_for_i">íìîï</string>
+    <string name="alternates_for_o">óòôõöœø</string>
+    <string name="alternates_for_u">ůúùûü</string>
+    <string name="alternates_for_s">š§ß</string>
+    <string name="alternates_for_n">ňñ</string>
+    <string name="alternates_for_c">čç</string>
+    <string name="alternates_for_y">ýÿ</string>
     <string name="alternates_for_d">ď</string>
-    <!-- Accented characters related to "r" -->
     <string name="alternates_for_r">ř</string>
-    <!-- Accented characters related to "t" -->
     <string name="alternates_for_t">ť</string>
-    <!-- Accented characters related to "z" -->
     <string name="alternates_for_z">ž</string>
 </resources>
diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index d6bb40233..b398ce80d 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Pokročilé"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Uloženo"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"áàâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"éěèêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"íìîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"óòôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ůúùûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"š§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ňñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"čç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Podržením klávesy zobrazíte diakritiku (á, ž apod.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Stisknutím klávesy Zpět ↶ můžete klávesnici kdykoli zavřít."</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Přístup k číslům a symbolům"</string>
diff --git a/java/res/values-da/altchars.xml b/java/res/values-da/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-da/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index 8028286bb..0751c67db 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Avanceret"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Gemt"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Hold en tast nede for at se accenter (ø, ö osv.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Tryk på knappen Tilbage ↶ for når som helst at lukke for tastaturet"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Få adgang til tal og symboler"</string>
diff --git a/java/res/values-de/altchars.xml b/java/res/values-de/altchars.xml
new file mode 100644
index 000000000..edc2b082e
--- /dev/null
+++ b/java/res/values-de/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">ä</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">ö</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index f46b9b82f..a7be8fd34 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Erweitert"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: gespeichert"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"ä"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"ö"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Zur Anzeige von Umlauten (ä, ö usw.) Taste gedrückt halten"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Zum Schließen der Tastatur ↶ drücken"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Auf Zahlen und Symbole zugreifen"</string>
diff --git a/java/res/values-el/altchars.xml b/java/res/values-el/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-el/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml
index 7cdd8278e..6e6f3a754 100644
--- a/java/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Σύνθετη"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Αποθηκεύτηκε"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Κρατήστε πατημένο ένα πλήκτρο για να δείτε τους τονισμένους χαρακτήρες (ø, ö, κ.τ.λ.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Πατήστε το πλήκτρο Πίσω ↶ για να κλείσετε το πληκτρολόγιο ανά πάσα στιγμή"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Πρόσβαση σε αριθμούς και σύμβολα"</string>
diff --git a/java/res/values-en/donottranslate.xml b/java/res/values-en/altchars.xml
similarity index 91%
rename from java/res/values-en/donottranslate.xml
rename to java/res/values-en/altchars.xml
index f5692735a..a18ef7b28 100644
--- a/java/res/values-en/donottranslate.xml
+++ b/java/res/values-en/altchars.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2008, The Android Open Source Project
+** Copyright 2010, 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.
@@ -19,7 +19,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Accented forms of "e" -->
-    <string name="alternates_for_e">èéêë3</string>
+    <string name="alternates_for_e">3èéêë</string>
     <!-- Accented forms of "i" -->
     <string name="alternates_for_i">ìíîï8</string>
     <!-- Accented forms of "o" -->
diff --git a/java/res/values-es-rUS/altchars.xml b/java/res/values-es-rUS/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-es-rUS/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index 88185b557..54ec3b94c 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Avanzado"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Mantén una tecla presionada para ver los acentos (ø, ö, etc.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Pulsa la tecla hacia atrás ↶ para cerrar el teclado en cualquier momento"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Acceder a números y símbolos"</string>
diff --git a/java/res/values-pl/donottranslate.xml b/java/res/values-es/altchars.xml
similarity index 58%
rename from java/res/values-pl/donottranslate.xml
rename to java/res/values-es/altchars.xml
index 196e73c1d..23aff7381 100644
--- a/java/res/values-pl/donottranslate.xml
+++ b/java/res/values-es/altchars.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2009, The Android Open Source Project
+** Copyright 2010, 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.
@@ -18,8 +18,13 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Accented characters related to "z" -->
-    <string name="alternates_for_z">źż</string>
-    <!-- Accented characters related to "l" -->
-    <string name="alternates_for_l">ł</string>    
+    <string name="alternates_for_a">á</string>
+    <string name="alternates_for_e">é</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">ó</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
 </resources>
diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index 70539414f..fe8578bc0 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Avanzado"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"á"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"é"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"ó"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Mantén pulsada una tecla para ver los caracteres acentuados (ø, ö, etc.)."</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Pulsa la tecla \"Atrás\" ↶ para cerrar el teclado en cualquier momento."</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Acceso a números y símbolos"</string>
diff --git a/java/res/values-fr/altchars.xml b/java/res/values-fr/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-fr/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index 0c267aaff..f5d18edf4 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Avancé"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : enregistré"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Maintenir une touche enfoncée pour afficher les accents (à, é, etc.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Appuyez sur la touche Retour ↶ pour fermer le clavier à tout moment."</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Accéder aux chiffres et symboles"</string>
diff --git a/java/res/values-it/altchars.xml b/java/res/values-it/altchars.xml
new file mode 100644
index 000000000..d1f940593
--- /dev/null
+++ b/java/res/values-it/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àá</string>
+    <string name="alternates_for_e">èé</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òó</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index 0624ec478..f710ca7fe 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Avanzate"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : parola salvata"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àá"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èé"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òó"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Tieni premuto un tasto per vedere le lettere con segni diacritici (ø, ö etc.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Premi il tasto Indietro ↶ per chiudere la tastiera"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Accedi a numeri e simboli"</string>
diff --git a/java/res/values-ja/altchars.xml b/java/res/values-ja/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-ja/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index 8e6508c5f..e2d6e2629 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"高度"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>:保存しました"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"キー長押しでアクセント文字を表示（ø、öなど）"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"戻るキーでキーボードを閉じます"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"数字と記号"</string>
diff --git a/java/res/values-ko/altchars.xml b/java/res/values-ko/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-ko/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index 6f9643c3d..1e06e15ec 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"고급"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: 저장됨"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"키를 길게 누르면 악센트(ø, ö 등)가 표시됩니다."</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"키보드를 닫으려면 언제든지 뒤로 키(↶)를 누르세요."</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"숫자 및 기호 사용"</string>
diff --git a/java/res/values-nb/altchars.xml b/java/res/values-nb/altchars.xml
new file mode 100644
index 000000000..0bb186bc8
--- /dev/null
+++ b/java/res/values-nb/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">åæáàâãä</string>
+    <string name="alternates_for_e">éèêë</string>
+    <string name="alternates_for_i">íìîï</string>
+    <string name="alternates_for_o">ôóòöõœø</string>
+    <string name="alternates_for_u">üùúû</string>
+    <string name="alternates_for_s">ߧ</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml
index b74506227..5666521e4 100644
--- a/java/res/values-nb/strings.xml
+++ b/java/res/values-nb/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Avansert"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Lagret"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"åæáàâãä"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"éèêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"íìîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"ôóòöõœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"üùúû"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"ߧ"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Hold en tast nede for å se aksenterte tegn (ø, ö, osv.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Trykk tilbakeknappen, ↶, for å lukke tastaturet"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Få tilgang til tall og symboler"</string>
diff --git a/java/res/values-nl/altchars.xml b/java/res/values-nl/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-nl/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index 164a65b51..b45587d72 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Geavanceerd"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: opgeslagen"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Houd een toets ingedrukt om diakritische tekens weer te geven (ø, ö, enzovoort)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Druk op elk gewenst moment op de toets Terug ↶ om het toetsenbord te sluiten"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Toegang tot cijfers en symbolen"</string>
diff --git a/java/res/values-pl/altchars.xml b/java/res/values-pl/altchars.xml
new file mode 100644
index 000000000..2b6ac2f3f
--- /dev/null
+++ b/java/res/values-pl/altchars.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">ą</string>
+    <string name="alternates_for_e">ę</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">ó</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">ś</string>
+    <string name="alternates_for_n">ń</string>
+    <string name="alternates_for_c">ć</string>
+    <string name="alternates_for_y">ýÿ</string>
+    <string name="alternates_for_z">źż</string>
+    <string name="alternates_for_l">ł</string>
+</resources>
diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml
index 7c0252d93..6417cd94a 100644
--- a/java/res/values-pl/strings.xml
+++ b/java/res/values-pl/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Zaawansowany"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Zapisano"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"ą"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"ę"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"ó"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"ś"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ń"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ć"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Przytrzymaj klawisz, aby wyświetlić znaki akcentowane (ą, ó itp.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Naciśnij klawisz cofania ↶, aby zamknąć klawiaturę w dowolnym momencie"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Przejdź do cyfr i symboli"</string>
diff --git a/java/res/values-pt-rPT/altchars.xml b/java/res/values-pt-rPT/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-pt-rPT/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml
index 13871eebe..63259bc5e 100644
--- a/java/res/values-pt-rPT/strings.xml
+++ b/java/res/values-pt-rPT/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Avançados"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Mantenha uma tecla premida para ver os acentos (ø, ö, etc.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Prima a tecla de retrocesso ↶ para fechar o teclado a qualquer momento"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Aceder a números e símbolos"</string>
diff --git a/java/res/values-pt/altchars.xml b/java/res/values-pt/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-pt/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
index 7defaee85..734dc9cd5 100644
--- a/java/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Avançado"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Salvo"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Segure uma tecla pressionada para ver os acentos (ø, ö, etc.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Apertar a tecla voltar ↶ para fechar o teclado, em qualquer ponto"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Acessar números e símbolos"</string>
diff --git a/java/res/values-rm/altchars.xml b/java/res/values-rm/altchars.xml
new file mode 100644
index 000000000..543b0e29c
--- /dev/null
+++ b/java/res/values-rm/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóöôõœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml
index 066f72ab6..91dbf72ff 100644
--- a/java/res/values-rm/strings.xml
+++ b/java/res/values-rm/strings.xml
@@ -58,15 +58,6 @@
     <item msgid="4894328801530136615">"Avanzà"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Memorisà"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóöôõœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Tegnair smatgà per mussar ils accents (à, é, etc.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Smatgar ↶ per serrar la tastatura"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Acceder a cifras e simbols"</string>
diff --git a/java/res/values-ru/altchars.xml b/java/res/values-ru/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-ru/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index 0d3aed39f..11371f8b1 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Дополнительно"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: сохранено"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Удерживайте клавишу, чтобы увидеть варианты с диакритическими знаками (ø, ö и т.д.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Нажмите клавишу \"Назад\" ↶, чтобы закрыть клавиатуру в любой момент"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Открыть цифры и символы"</string>
diff --git a/java/res/values-sv/altchars.xml b/java/res/values-sv/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-sv/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
index d56c370b7..44ae2697d 100644
--- a/java/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Avancerade"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: sparat"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Håll nere en tangent om du vill visa accenter (ø, ö, etc.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Tryck på Tillbaka ↶ om du vill stänga tangentbordet"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"För siffror och symboler"</string>
diff --git a/java/res/values-tr/donottranslate.xml b/java/res/values-tr/altchars.xml
similarity index 57%
rename from java/res/values-tr/donottranslate.xml
rename to java/res/values-tr/altchars.xml
index 2154c16bb..e51e7cff1 100644
--- a/java/res/values-tr/donottranslate.xml
+++ b/java/res/values-tr/altchars.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2009, The Android Open Source Project
+** Copyright 2010, 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.
@@ -18,6 +18,14 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Accented characters related to "g" -->
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">iìíîï</string>
+    <string name="alternates_for_o">öòóôõœø</string>
+    <string name="alternates_for_u">üùúû</string>
+    <string name="alternates_for_s">ş§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
     <string name="alternates_for_g">ğ</string>
 </resources>
\ No newline at end of file
diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
index 32f357f82..d5ed22597 100644
--- a/java/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"Gelişmiş"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Kaydedildi"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"iìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"öòóôõœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"üùúû"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"ş§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"Vurguları görmek için bir tuşu basılı tutun (ø, ö, v.b.)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"Klavyeyi herhangi bir anda kapatmak için geri tuşuna ↶ basın"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"Sayılara ve simgelere erişin"</string>
diff --git a/java/res/values-zh-rCN/altchars.xml b/java/res/values-zh-rCN/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-zh-rCN/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index 373cee4ae..3cfd59996 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"高级"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>：已保存"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"按住某个键可看到重音符号（例如 ø、ö 等）"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"随时可以通过按后退键 ↶ 关闭键盘"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"访问数字和符号"</string>
diff --git a/java/res/values-zh-rTW/altchars.xml b/java/res/values-zh-rTW/altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-zh-rTW/altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index 77c41e832..3f9781154 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -56,15 +56,6 @@
     <item msgid="4894328801530136615">"進階模式"</item>
   </string-array>
     <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>：已儲存"</string>
-    <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string>
-    <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string>
-    <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string>
-    <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string>
-    <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string>
-    <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string>
-    <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string>
-    <string name="alternates_for_c" msgid="151699780720639892">"ç"</string>
-    <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string>
     <string name="tip_long_press" msgid="6101270866284343344">"按住按鍵可查看重音符號 (ø、ö 等)"</string>
     <string name="tip_dismiss" msgid="7585579046862204381">"隨時可以透過按後退鍵 ↶ 關閉鍵盤"</string>
     <string name="tip_access_symbols" msgid="6344098517525531652">"使用數字和符號"</string>
diff --git a/java/res/values/altchars.xml b/java/res/values/altchars.xml
new file mode 100644
index 000000000..ff12a3f26
--- /dev/null
+++ b/java/res/values/altchars.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+    <string name="alternates_for_q">1</string>
+    <string name="alternates_for_w">2</string>
+    <string name="alternates_for_d"></string>
+    <string name="alternates_for_r">4</string>
+    <string name="alternates_for_t">5</string>
+    <string name="alternates_for_z"></string>
+    <string name="alternates_for_l"></string>
+    <string name="alternates_for_g"></string>
+    <string name="alternates_for_p">0</string>
+</resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index 97b645c4a..971e22965 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -24,22 +24,4 @@
     <string name="sentence_separators">.,!?)</string>
     <!-- Symbols that are suggested between words -->
     <string name="suggested_punctuations">!?,\u0022\u0027:()-/@_</string>
-    <!-- Accented characters related to "q" -->
-    <string name="alternates_for_q">1</string>
-    <!-- Accented characters related to "w" -->
-    <string name="alternates_for_w">2</string>
-    <!-- Accented characters related to "d" -->
-    <string name="alternates_for_d"></string>
-    <!-- Accented characters related to "r" -->
-    <string name="alternates_for_r">4</string>
-    <!-- Accented characters related to "t" -->
-    <string name="alternates_for_t">5</string>
-    <!-- Accented characters related to "z" -->
-    <string name="alternates_for_z"></string>
-    <!-- Accented characters related to "l" -->
-    <string name="alternates_for_l"></string>
-    <!-- Accented characters related to "g" -->
-    <string name="alternates_for_g"></string>
-    <!-- Accented characters related to "p" -->
-    <string name="alternates_for_p">0</string>
 </resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 38dd1b337..bf8e987c9 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -118,24 +118,6 @@
 
     <!-- Indicates that a word has been added to the dictionary -->
     <string name="added_word"><xliff:g id="word">%s</xliff:g> : Saved</string>
-    <!-- Accented forms of "a" -->
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <!-- Accented forms of "e" -->
-    <string name="alternates_for_e">èéêë</string>
-    <!-- Accented forms of "i" -->
-    <string name="alternates_for_i">ìíîï</string>
-    <!-- Accented forms of "o" -->
-    <string name="alternates_for_o">òóôõöœø</string>
-    <!-- Accented forms of "u" -->
-    <string name="alternates_for_u">ùúûü</string>
-    <!-- Letters associated with "s" -->
-    <string name="alternates_for_s">§ß</string>
-    <!-- Accented forms of "n" -->
-    <string name="alternates_for_n">ñ</string>
-    <!-- Accented forms of "c" -->
-    <string name="alternates_for_c">ç</string>
-    <!-- Accented forms of "y" -->
-    <string name="alternates_for_y">ýÿ</string>
     
     <!-- Tip to long press on keys -->
     <string name="tip_long_press">Hold a key down to see accents (ø, ö, etc.)</string>