Move alternate chars from keyboard layout to altchars.xml
Bug: 2973749
Change-Id: Ic6e5f986c32be07c1e1038594a0e420ba6902351
diff --git a/java/res/values-da/altchars.xml b/java/res/values-da/altchars.xml
index c165b11..7b313bd 100644
--- a/java/res/values-da/altchars.xml
+++ b/java/res/values-da/altchars.xml
@@ -18,13 +18,21 @@
*/
-->
<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_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>
+ <string name="alternates_for_r">ř</string>
+ <string name="alternates_for_t">ťþ</string>
+ <string name="alternates_for_z">źžż</string>
+ <string name="alternates_for_l">ł</string>
+ <string name="alternates_for_v">w</string>
+ <string name="alternates_for_ae">ä</string>
+ <string name="alternates_for_oe">öœ</string>
</resources>
diff --git a/java/res/values-nb/altchars.xml b/java/res/values-nb/altchars.xml
index 0bb186b..2019f44 100644
--- a/java/res/values-nb/altchars.xml
+++ b/java/res/values-nb/altchars.xml
@@ -18,13 +18,20 @@
*/
-->
<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_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_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>
+ <string name="alternates_for_r">ř</string>
+ <string name="alternates_for_t">ťþ</string>
+ <string name="alternates_for_z">źžż</string>
+ <string name="alternates_for_l">ł</string>
+ <string name="alternates_for_v">w</string>
+ <string name="alternates_for_oe">œ</string>
</resources>
diff --git a/java/res/values-ru/altchars.xml b/java/res/values-ru/altchars.xml
index c165b11..f545867 100644
--- a/java/res/values-ru/altchars.xml
+++ b/java/res/values-ru/altchars.xml
@@ -27,4 +27,6 @@
<string name="alternates_for_n">ñ</string>
<string name="alternates_for_c">ç</string>
<string name="alternates_for_y">ýÿ</string>
+ <string name="alternates_for_cyrillic_e">ё</string>
+ <string name="alternates_for_cyrillic_soft_sign">ъ</string>
</resources>
diff --git a/java/res/values-sv/altchars.xml b/java/res/values-sv/altchars.xml
index c165b11..33a367b 100644
--- a/java/res/values-sv/altchars.xml
+++ b/java/res/values-sv/altchars.xml
@@ -18,13 +18,21 @@
*/
-->
<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_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>
+ <string name="alternates_for_r">ř</string>
+ <string name="alternates_for_t">ťþ</string>
+ <string name="alternates_for_z">źžż</string>
+ <string name="alternates_for_l">ł</string>
+ <string name="alternates_for_v">w</string>
+ <string name="alternates_for_a_umlaut">æ</string>
+ <string name="alternates_for_o_umlaut">øœ</string>
</resources>
diff --git a/java/res/values-tr/altchars.xml b/java/res/values-tr/altchars.xml
index e51e7cf..55ad8a7 100644
--- a/java/res/values-tr/altchars.xml
+++ b/java/res/values-tr/altchars.xml
@@ -20,7 +20,7 @@
<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">iìíîï</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>
diff --git a/java/res/values/altchars.xml b/java/res/values/altchars.xml
index ff12a3f..bba7282 100644
--- a/java/res/values/altchars.xml
+++ b/java/res/values/altchars.xml
@@ -36,4 +36,11 @@
<string name="alternates_for_l"></string>
<string name="alternates_for_g"></string>
<string name="alternates_for_p">0</string>
+ <string name="alternates_for_v"></string>
+ <string name="alternates_for_ae"></string>
+ <string name="alternates_for_oe"></string>
+ <string name="alternates_for_cyrillic_e"></string>
+ <string name="alternates_for_cyrillic_soft_sign"></string>
+ <string name="alternates_for_a_umlaut"></string>
+ <string name="alternates_for_o_umlaut"></string>
</resources>
diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml
index 3bbd552..53b4d50 100644
--- a/java/res/xml-da/kbd_qwerty.xml
+++ b/java/res/xml-da/kbd_qwerty.xml
@@ -41,31 +41,31 @@
<Key
android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€" />
+ android:popupCharacters="@string/alternates_for_e" />
<Key
android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ř" />
+ android:popupCharacters="@string/alternates_for_r" />
<Key
android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ" />
+ android:popupCharacters="@string/alternates_for_t" />
<Key
android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿü" />
+ android:popupCharacters="@string/alternates_for_y" />
<Key
android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="úùûū" />
+ android:popupCharacters="@string/alternates_for_u" />
<Key
android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="íìîï" />
+ android:popupCharacters="@string/alternates_for_i" />
<Key
android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="óòôõ" />
+ android:popupCharacters="@string/alternates_for_o" />
<Key
android:keyLabel="p" />
<Key
@@ -77,17 +77,17 @@
<Key
android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="áàâąã"
+ android:popupCharacters="@string/alternates_for_a"
android:keyWidth="8.75%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß" />
+ android:popupCharacters="@string/alternates_for_s" />
<Key
android:keyLabel="d"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðď" />
+ android:popupCharacters="@string/alternates_for_d" />
<Key
android:keyLabel="f" />
<Key
@@ -101,15 +101,15 @@
<Key
android:keyLabel="l"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ł" />
+ android:popupCharacters="@string/alternates_for_l" />
<Key
android:keyLabel="æ"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ä" />
+ android:popupCharacters="@string/alternates_for_ae" />
<Key
android:keyLabel="ø"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="öœ"
+ android:popupCharacters="@string/alternates_for_oe"
android:keyWidth="8.75%p"
android:keyEdgeFlags="right" />
</Row>
@@ -127,23 +127,23 @@
<Key
android:keyLabel="z"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż" />
+ android:popupCharacters="@string/alternates_for_z" />
<Key
android:keyLabel="x" />
<Key
android:keyLabel="c"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćč" />
+ android:popupCharacters="@string/alternates_for_c" />
<Key
android:keyLabel="v"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w" />
+ android:popupCharacters="@string/alternates_for_v" />
<Key
android:keyLabel="b" />
<Key
android:keyLabel="n"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň" />
+ android:popupCharacters="@string/alternates_for_n" />
<Key
android:keyLabel="m" />
<Key
diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml
index f1b5f6d..414119a 100644
--- a/java/res/xml-da/kbd_qwerty_black.xml
+++ b/java/res/xml-da/kbd_qwerty_black.xml
@@ -41,31 +41,31 @@
<Key
android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€" />
+ android:popupCharacters="@string/alternates_for_e" />
<Key
android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ř" />
+ android:popupCharacters="@string/alternates_for_r" />
<Key
android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ" />
+ android:popupCharacters="@string/alternates_for_t" />
<Key
android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿü" />
+ android:popupCharacters="@string/alternates_for_y" />
<Key
android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="úùûū" />
+ android:popupCharacters="@string/alternates_for_u" />
<Key
android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="íìîï" />
+ android:popupCharacters="@string/alternates_for_i" />
<Key
android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="óòôõ" />
+ android:popupCharacters="@string/alternates_for_o" />
<Key
android:keyLabel="p" />
<Key
@@ -77,17 +77,17 @@
<Key
android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="áàâąã"
+ android:popupCharacters="@string/alternates_for_a"
android:keyWidth="8.75%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß" />
+ android:popupCharacters="@string/alternates_for_s" />
<Key
android:keyLabel="d"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðď" />
+ android:popupCharacters="@string/alternates_for_d" />
<Key
android:keyLabel="f" />
<Key
@@ -101,15 +101,15 @@
<Key
android:keyLabel="l"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ł" />
+ android:popupCharacters="@string/alternates_for_l" />
<Key
android:keyLabel="æ"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ä" />
+ android:popupCharacters="@string/alternates_for_ae" />
<Key
android:keyLabel="ø"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="öœ"
+ android:popupCharacters="@string/alternates_for_oe"
android:keyWidth="8.75%p"
android:keyEdgeFlags="right" />
</Row>
@@ -127,23 +127,23 @@
<Key
android:keyLabel="z"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż" />
+ android:popupCharacters="@string/alternates_for_z" />
<Key
android:keyLabel="x" />
<Key
android:keyLabel="c"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćč" />
+ android:popupCharacters="@string/alternates_for_c" />
<Key
android:keyLabel="v"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w" />
+ android:popupCharacters="@string/alternates_for_v" />
<Key
android:keyLabel="b" />
<Key
android:keyLabel="n"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň" />
+ android:popupCharacters="@string/alternates_for_n" />
<Key
android:keyLabel="m" />
<Key
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
index 36c7b7c..548ba2d 100644
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ b/java/res/xml-nb/kbd_qwerty.xml
@@ -41,31 +41,31 @@
<Key
android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€" />
+ android:popupCharacters="@string/alternates_for_e" />
<Key
android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ř" />
+ android:popupCharacters="@string/alternates_for_r" />
<Key
android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ" />
+ android:popupCharacters="@string/alternates_for_t" />
<Key
android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿ" />
+ android:popupCharacters="@string/alternates_for_y" />
<Key
android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="üúùûū" />
+ android:popupCharacters="@string/alternates_for_u" />
<Key
android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="íìîï" />
+ android:popupCharacters="@string/alternates_for_i" />
<Key
android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="öóòôõ" />
+ android:popupCharacters="@string/alternates_for_o" />
<Key
android:keyLabel="p" />
<Key
@@ -77,17 +77,17 @@
<Key
android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="äáàâąã"
+ android:popupCharacters="@string/alternates_for_a"
android:keyWidth="8.75%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß" />
+ android:popupCharacters="@string/alternates_for_s" />
<Key
android:keyLabel="d"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðď" />
+ android:popupCharacters="@string/alternates_for_d" />
<Key
android:keyLabel="f" />
<Key
@@ -101,11 +101,11 @@
<Key
android:keyLabel="l"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ł" />
+ android:popupCharacters="@string/alternates_for_l" />
<Key
android:keyLabel="ø"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="œ" />
+ android:popupCharacters="@string/alternates_for_oe" />
<Key
android:keyLabel="æ"
android:keyWidth="8.75%p"
@@ -125,23 +125,23 @@
<Key
android:keyLabel="z"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż" />
+ android:popupCharacters="@string/alternates_for_z" />
<Key
android:keyLabel="x" />
<Key
android:keyLabel="c"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćč" />
+ android:popupCharacters="@string/alternates_for_c" />
<Key
android:keyLabel="v"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w" />
+ android:popupCharacters="@string/alternates_for_v" />
<Key
android:keyLabel="b" />
<Key
android:keyLabel="n"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň" />
+ android:popupCharacters="@string/alternates_for_n" />
<Key
android:keyLabel="m" />
<Key
diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml
index 664d0e8..ffc94dc 100644
--- a/java/res/xml-nb/kbd_qwerty_black.xml
+++ b/java/res/xml-nb/kbd_qwerty_black.xml
@@ -41,31 +41,31 @@
<Key
android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€" />
+ android:popupCharacters="@string/alternates_for_e" />
<Key
android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ř" />
+ android:popupCharacters="@string/alternates_for_r" />
<Key
android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ" />
+ android:popupCharacters="@string/alternates_for_t" />
<Key
android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿ" />
+ android:popupCharacters="@string/alternates_for_y" />
<Key
android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="üúùûū" />
+ android:popupCharacters="@string/alternates_for_u" />
<Key
android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="íìîï" />
+ android:popupCharacters="@string/alternates_for_i" />
<Key
android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="öóòôõ" />
+ android:popupCharacters="@string/alternates_for_o" />
<Key
android:keyLabel="p" />
<Key
@@ -77,17 +77,17 @@
<Key
android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="äáàâąã"
+ android:popupCharacters="@string/alternates_for_a"
android:keyWidth="8.75%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß" />
+ android:popupCharacters="@string/alternates_for_s" />
<Key
android:keyLabel="d"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðď" />
+ android:popupCharacters="@string/alternates_for_d" />
<Key
android:keyLabel="f" />
<Key
@@ -101,11 +101,11 @@
<Key
android:keyLabel="l"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ł" />
+ android:popupCharacters="@string/alternates_for_l" />
<Key
android:keyLabel="ø"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="œ" />
+ android:popupCharacters="@string/alternates_for_oe" />
<Key
android:keyLabel="æ"
android:keyWidth="8.75%p"
@@ -125,23 +125,23 @@
<Key
android:keyLabel="z"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż" />
+ android:popupCharacters="@string/alternates_for_z" />
<Key
android:keyLabel="x" />
<Key
android:keyLabel="c"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćč" />
+ android:popupCharacters="@string/alternates_for_c" />
<Key
android:keyLabel="v"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w" />
+ android:popupCharacters="@string/alternates_for_v" />
<Key
android:keyLabel="b" />
<Key
android:keyLabel="n"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň" />
+ android:popupCharacters="@string/alternates_for_n" />
<Key
android:keyLabel="m" />
<Key
diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml
index 742dee2..a7a46ee 100644
--- a/java/res/xml-ru/kbd_qwerty.xml
+++ b/java/res/xml-ru/kbd_qwerty.xml
@@ -39,7 +39,7 @@
<Key
android:keyLabel="е"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ё" />
+ android:popupCharacters="@string/alternates_for_cyrillic_e" />
<Key
android:keyLabel="н" />
<Key
@@ -109,7 +109,7 @@
<Key
android:keyLabel="ь"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ъ" />
+ android:popupCharacters="@string/alternates_for_cyrillic_soft_sign" />
<Key
android:keyLabel="б" />
<Key
diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml
index fbd7399..e6f3689 100644
--- a/java/res/xml-ru/kbd_qwerty_black.xml
+++ b/java/res/xml-ru/kbd_qwerty_black.xml
@@ -39,7 +39,7 @@
<Key
android:keyLabel="е"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ё" />
+ android:popupCharacters="@string/alternates_for_cyrillic_e" />
<Key
android:keyLabel="н" />
<Key
@@ -109,7 +109,7 @@
<Key
android:keyLabel="ь"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ъ" />
+ android:popupCharacters="@string/alternates_for_cyrillic_soft_sign" />
<Key
android:keyLabel="б" />
<Key
diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml
index 3c90e31..7fd72a4 100644
--- a/java/res/xml-sv/kbd_qwerty.xml
+++ b/java/res/xml-sv/kbd_qwerty.xml
@@ -43,31 +43,31 @@
<Key
android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€" />
+ android:popupCharacters="@string/alternates_for_e" />
<Key
android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ř" />
+ android:popupCharacters="@string/alternates_for_r" />
<Key
android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ" />
+ android:popupCharacters="@string/alternates_for_t" />
<Key
android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿü" />
+ android:popupCharacters="@string/alternates_for_y" />
<Key
android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="úùûū" />
+ android:popupCharacters="@string/alternates_for_u" />
<Key
android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="íìîï" />
+ android:popupCharacters="@string/alternates_for_i" />
<Key
android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="óòôõ" />
+ android:popupCharacters="@string/alternates_for_o" />
<Key
android:keyLabel="p" />
<Key
@@ -79,17 +79,17 @@
<Key
android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="áàâąã"
+ android:popupCharacters="@string/alternates_for_a"
android:keyWidth="8.75%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß" />
+ android:popupCharacters="@string/alternates_for_s" />
<Key
android:keyLabel="d"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðď" />
+ android:popupCharacters="@string/alternates_for_d" />
<Key
android:keyLabel="f" />
<Key
@@ -103,15 +103,15 @@
<Key
android:keyLabel="l"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ł" />
+ android:popupCharacters="@string/alternates_for_l" />
<Key
android:keyLabel="ö"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="øœ" />
+ android:popupCharacters="@string/alternates_for_o_umlaut" />
<Key
android:keyLabel="ä"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="æ"
+ android:popupCharacters="@string/alternates_for_a_umlaut"
android:keyWidth="8.75%p"
android:keyEdgeFlags="right" />
</Row>
@@ -129,23 +129,23 @@
<Key
android:keyLabel="z"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż" />
+ android:popupCharacters="@string/alternates_for_z" />
<Key
android:keyLabel="x" />
<Key
android:keyLabel="c"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćč" />
+ android:popupCharacters="@string/alternates_for_c" />
<Key
android:keyLabel="v"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w" />
+ android:popupCharacters="@string/alternates_for_v" />
<Key
android:keyLabel="b" />
<Key
android:keyLabel="n"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň" />
+ android:popupCharacters="@string/alternates_for_n" />
<Key
android:keyLabel="m" />
<Key
diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml
index 3325829..68caa3e 100644
--- a/java/res/xml-sv/kbd_qwerty_black.xml
+++ b/java/res/xml-sv/kbd_qwerty_black.xml
@@ -43,31 +43,31 @@
<Key
android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€" />
+ android:popupCharacters="@string/alternates_for_e" />
<Key
android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ř" />
+ android:popupCharacters="@string/alternates_for_r" />
<Key
android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ" />
+ android:popupCharacters="@string/alternates_for_t" />
<Key
android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿü" />
+ android:popupCharacters="@string/alternates_for_y" />
<Key
android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="úùûū" />
+ android:popupCharacters="@string/alternates_for_u" />
<Key
android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="íìîï" />
+ android:popupCharacters="@string/alternates_for_i" />
<Key
android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="óòôõ" />
+ android:popupCharacters="@string/alternates_for_o" />
<Key
android:keyLabel="p" />
<Key
@@ -79,17 +79,17 @@
<Key
android:keyLabel="a"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="áàâąã"
+ android:popupCharacters="@string/alternates_for_a"
android:keyWidth="8.75%p"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß" />
+ android:popupCharacters="@string/alternates_for_s" />
<Key
android:keyLabel="d"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðď" />
+ android:popupCharacters="@string/alternates_for_d" />
<Key
android:keyLabel="f" />
<Key
@@ -103,15 +103,15 @@
<Key
android:keyLabel="l"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ł" />
+ android:popupCharacters="@string/alternates_for_l" />
<Key
android:keyLabel="ö"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="øœ" />
+ android:popupCharacters="@string/alternates_for_o_umlaut" />
<Key
android:keyLabel="ä"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="æ"
+ android:popupCharacters="@string/alternates_for_a_umlaut"
android:keyWidth="8.75%p"
android:keyEdgeFlags="right" />
</Row>
@@ -129,23 +129,23 @@
<Key
android:keyLabel="z"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż" />
+ android:popupCharacters="@string/alternates_for_z" />
<Key
android:keyLabel="x" />
<Key
android:keyLabel="c"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćč" />
+ android:popupCharacters="@string/alternates_for_c" />
<Key
android:keyLabel="v"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w" />
+ android:popupCharacters="@string/alternates_for_v" />
<Key
android:keyLabel="b" />
<Key
android:keyLabel="n"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň" />
+ android:popupCharacters="@string/alternates_for_n" />
<Key
android:keyLabel="m" />
<Key