Cleanup Slavic keyboard resources
* Name keylabel_for string based on layout and position
* Move all default resources to individual donottranslate-morekeys.xml
And empty the default resources. This is much easier to maintain
* Rename scandinavian resource name to nordic
Change-Id: I34c43238d0cc4e9773a6d355f73a1fe11589e23e
diff --git a/java/res/values-be/donottranslate-more-keys.xml b/java/res/values-be/donottranslate-more-keys.xml
index 1550ddb..835553a 100644
--- a/java/res/values-be/donottranslate-more-keys.xml
+++ b/java/res/values-be/donottranslate-more-keys.xml
@@ -19,7 +19,13 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- U+045E: "ў" CYRILLIC SMALL LETTER SHORT U -->
- <string name="keylabel_for_cyrillic_shcha">ў</string>
+ <string name="keylabel_for_east_slavic_row1_9">ў</string>
+ <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
+ <string name="keylabel_for_east_slavic_row2_1">ы</string>
<!-- U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
- <string name="keylabel_for_cyrillic_i">і</string>
+ <string name="keylabel_for_east_slavic_row3_5">і</string>
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_cyrillic_ha">ъ</string>
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_cyrillic_soft_sign">ъ</string>
</resources>
diff --git a/java/res/values-da/donottranslate-more-keys.xml b/java/res/values-da/donottranslate-more-keys.xml
index 739ab09..acc0c53 100644
--- a/java/res/values-da/donottranslate-more-keys.xml
+++ b/java/res/values-da/donottranslate-more-keys.xml
@@ -59,13 +59,13 @@
<!-- U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
<string name="more_keys_for_l">ł</string>
<!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
- <string name="keylabel_for_scandinavia_row1_11">å</string>
+ <string name="keylabel_for_nordic_row1_11">å</string>
<!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
- <string name="keylabel_for_scandinavia_row2_10">æ</string>
+ <string name="keylabel_for_nordic_row2_10">æ</string>
<!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
- <string name="keylabel_for_scandinavia_row2_11">ø</string>
+ <string name="keylabel_for_nordic_row2_11">ø</string>
<!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
- <string name="more_keys_for_scandinavia_row2_10">ä</string>
+ <string name="more_keys_for_nordic_row2_10">ä</string>
<!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
- <string name="more_keys_for_scandinavia_row2_11">ö</string>
+ <string name="more_keys_for_nordic_row2_11">ö</string>
</resources>
diff --git a/java/res/values-et/donottranslate-more-keys.xml b/java/res/values-et/donottranslate-more-keys.xml
index be66b42..69cf654 100644
--- a/java/res/values-et/donottranslate-more-keys.xml
+++ b/java/res/values-et/donottranslate-more-keys.xml
@@ -104,11 +104,11 @@
U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE -->
<string name="more_keys_for_g">ģ,ğ</string>
<!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS -->
- <string name="keylabel_for_scandinavia_row1_11">ü</string>
+ <string name="keylabel_for_nordic_row1_11">ü</string>
<!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
- <string name="keylabel_for_scandinavia_row2_10">ö</string>
+ <string name="keylabel_for_nordic_row2_10">ö</string>
<!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
- <string name="keylabel_for_scandinavia_row2_11">ä</string>
+ <string name="keylabel_for_nordic_row2_11">ä</string>
<!-- U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE -->
- <string name="more_keys_for_scandinavia_row2_10">õ</string>
+ <string name="more_keys_for_nordic_row2_10">õ</string>
</resources>
diff --git a/java/res/values-fi/donottranslate-more-keys.xml b/java/res/values-fi/donottranslate-more-keys.xml
index 9b5fa78..25b7858 100644
--- a/java/res/values-fi/donottranslate-more-keys.xml
+++ b/java/res/values-fi/donottranslate-more-keys.xml
@@ -44,13 +44,13 @@
U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE -->
<string name="more_keys_for_z">ž,ź,ż</string>
<!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
- <string name="keylabel_for_scandinavia_row1_11">å</string>
+ <string name="keylabel_for_nordic_row1_11">å</string>
<!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
- <string name="keylabel_for_scandinavia_row2_10">ö</string>
+ <string name="keylabel_for_nordic_row2_10">ö</string>
<!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
- <string name="keylabel_for_scandinavia_row2_11">ä</string>
+ <string name="keylabel_for_nordic_row2_11">ä</string>
<!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
- <string name="more_keys_for_scandinavia_row2_10">ø</string>
+ <string name="more_keys_for_nordic_row2_10">ø</string>
<!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
- <string name="more_keys_for_scandinavia_row2_11">æ</string>
+ <string name="more_keys_for_nordic_row2_11">æ</string>
</resources>
diff --git a/java/res/values-is/donottranslate-more-keys.xml b/java/res/values-is/donottranslate-more-keys.xml
index 2c3fa1e..284aae9 100644
--- a/java/res/values-is/donottranslate-more-keys.xml
+++ b/java/res/values-is/donottranslate-more-keys.xml
@@ -65,9 +65,9 @@
<!-- U+00FE: "þ" LATIN SMALL LETTER THORN -->
<string name="more_keys_for_t">þ</string>
<!-- U+00F0: "ð" LATIN SMALL LETTER ETH -->
- <string name="keylabel_for_scandinavia_row1_11">ð</string>
+ <string name="keylabel_for_nordic_row1_11">ð</string>
<!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
- <string name="keylabel_for_scandinavia_row2_10">æ</string>
+ <string name="keylabel_for_nordic_row2_10">æ</string>
<!-- U+00FE: "þ" LATIN SMALL LETTER THORN -->
- <string name="keylabel_for_scandinavia_row2_11">þ</string>
+ <string name="keylabel_for_nordic_row2_11">þ</string>
</resources>
diff --git a/java/res/values-ky/donottranslate-more-keys.xml b/java/res/values-ky/donottranslate-more-keys.xml
index b67a9f1..fd90248 100644
--- a/java/res/values-ky/donottranslate-more-keys.xml
+++ b/java/res/values-ky/donottranslate-more-keys.xml
@@ -18,10 +18,20 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+ <string name="keylabel_for_east_slavic_row1_9">щ</string>
+ <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
+ <string name="keylabel_for_east_slavic_row2_1">ы</string>
+ <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
+ <string name="keylabel_for_east_slavic_row3_5">и</string>
<!-- U+04AF: "ү" CYRILLIC SMALL LETTER STRAIGHT U -->
<string name="more_keys_for_cyrillic_u">ү</string>
<!-- U+04A3: "ң" CYRILLIC SMALL LETTER EN WITH DESCENDER -->
<string name="more_keys_for_cyrillic_en">ң</string>
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_cyrillic_ha">ъ</string>
<!-- U+04E9: "ө" CYRILLIC SMALL LETTER BARRED O -->
<string name="more_keys_for_cyrillic_o">ө</string>
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_cyrillic_soft_sign">ъ</string>
</resources>
diff --git a/java/res/values-mk/donottranslate-more-keys.xml b/java/res/values-mk/donottranslate-more-keys.xml
index e96a306..d0cccf6 100644
--- a/java/res/values-mk/donottranslate-more-keys.xml
+++ b/java/res/values-mk/donottranslate-more-keys.xml
@@ -18,15 +18,14 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- NOTE: Macedonian layouts are based on Serbian ones with the following key replacements. -->
<!-- U+0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
- <string name="keylabel_for_cyrillic_ze">ѕ</string>
+ <string name="keylabel_for_south_slavic_row1_6">ѕ</string>
<!-- U+045C: "ќ" CYRILLIC SMALL LETTER KJE -->
- <string name="keylabel_for_cyrillic_tshe">ќ</string>
+ <string name="keylabel_for_south_slavic_row2_11">ќ</string>
<!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
- <string name="keylabel_for_cyrillic_dze">з</string>
+ <string name="keylabel_for_south_slavic_row3_1">з</string>
<!-- U+0453: "ѓ" CYRILLIC SMALL LETTER GJE -->
- <string name="keylabel_for_cyrillic_dje">ѓ</string>
+ <string name="keylabel_for_south_slavic_row3_8">ѓ</string>
<!-- U+0450: "ѐ" CYRILLIC SMALL LETTER IE WITH GRAVE -->
<string name="more_keys_for_cyrillic_ie">ѐ</string>
<!-- U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
diff --git a/java/res/values-nb/donottranslate-more-keys.xml b/java/res/values-nb/donottranslate-more-keys.xml
index 7248d98..49e6d5f 100644
--- a/java/res/values-nb/donottranslate-more-keys.xml
+++ b/java/res/values-nb/donottranslate-more-keys.xml
@@ -48,13 +48,13 @@
U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
<string name="more_keys_for_u">ü,û,ù,ú,ū</string>
<!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
- <string name="keylabel_for_scandinavia_row1_11">å</string>
+ <string name="keylabel_for_nordic_row1_11">å</string>
<!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
- <string name="keylabel_for_scandinavia_row2_10">ø</string>
+ <string name="keylabel_for_nordic_row2_10">ø</string>
<!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
- <string name="keylabel_for_scandinavia_row2_11">æ</string>
+ <string name="keylabel_for_nordic_row2_11">æ</string>
<!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
- <string name="more_keys_for_scandinavia_row2_10">ö</string>
+ <string name="more_keys_for_nordic_row2_10">ö</string>
<!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
- <string name="more_keys_for_scandinavia_row2_11">ä</string>
+ <string name="more_keys_for_nordic_row2_11">ä</string>
</resources>
diff --git a/java/res/values-ru/donottranslate-more-keys.xml b/java/res/values-ru/donottranslate-more-keys.xml
index a1a22e5..0bb5707 100644
--- a/java/res/values-ru/donottranslate-more-keys.xml
+++ b/java/res/values-ru/donottranslate-more-keys.xml
@@ -18,6 +18,16 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+ <string name="keylabel_for_east_slavic_row1_9">щ</string>
+ <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
+ <string name="keylabel_for_east_slavic_row2_1">ы</string>
+ <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
+ <string name="keylabel_for_east_slavic_row3_5">и</string>
<!-- U+0451: "ё" CYRILLIC SMALL LETTER IO -->
<string name="more_keys_for_cyrillic_ye">ё</string>
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_cyrillic_ha">ъ</string>
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_cyrillic_soft_sign">ъ</string>
</resources>
diff --git a/java/res/values-sr/donottranslate-more-keys.xml b/java/res/values-sr/donottranslate-more-keys.xml
new file mode 100644
index 0000000..e85d3d7
--- /dev/null
+++ b/java/res/values-sr/donottranslate-more-keys.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <string name="keylabel_for_south_slavic_row1_6">з</string>
+ <!-- U+045B: "ћ" CYRILLIC SMALL LETTER TSHE -->
+ <string name="keylabel_for_south_slavic_row2_11">ћ</string>
+ <!-- U+0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
+ <string name="keylabel_for_south_slavic_row3_1">ѕ</string>
+ <!-- U+0452: "ђ" CYRILLIC SMALL LETTER DJE -->
+ <string name="keylabel_for_south_slavic_row3_8">ђ</string>
+ <!-- U+0450: "ѐ" CYRILLIC SMALL LETTER IE WITH GRAVE -->
+ <string name="more_keys_for_cyrillic_ie">ѐ</string>
+ <!-- U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
+ <string name="more_keys_for_cyrillic_i">ѝ</string>
+ <!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK
+ U+2019: "’" RIGHT SINGLE QUOTATION MARK
+ U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
+ U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+ U+201C: "“" LEFT DOUBLE QUOTATION MARK
+ U+201D: "”" RIGHT DOUBLE QUOTATION MARK
+ U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
+ U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+ <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+ <!-- <string name="more_keys_for_double_quote">!fixedColumnOrder!6,„,“,”,‟,«,»</string> -->
+ <string name="more_keys_for_double_quote">!fixedColumnOrder!5,„,“,”,«,»</string>
+ <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+ <!-- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,“,”,„,‟,«,»,‘,’,‚,‛</string> -->
+ <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!5,„,“,”,«,»,‘,’,‚,‛</string>
+</resources>
diff --git a/java/res/values-sv/donottranslate-more-keys.xml b/java/res/values-sv/donottranslate-more-keys.xml
index e3662df..d479191 100644
--- a/java/res/values-sv/donottranslate-more-keys.xml
+++ b/java/res/values-sv/donottranslate-more-keys.xml
@@ -42,13 +42,13 @@
U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
<string name="more_keys_for_s">ß,ś,š</string>
<!-- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE -->
- <string name="keylabel_for_scandinavia_row1_11">å</string>
+ <string name="keylabel_for_nordic_row1_11">å</string>
<!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS -->
- <string name="keylabel_for_scandinavia_row2_10">ö</string>
+ <string name="keylabel_for_nordic_row2_10">ö</string>
<!-- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS -->
- <string name="keylabel_for_scandinavia_row2_11">ä</string>
+ <string name="keylabel_for_nordic_row2_11">ä</string>
<!-- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE -->
- <string name="more_keys_for_scandinavia_row2_10">ø</string>
+ <string name="more_keys_for_nordic_row2_10">ø</string>
<!-- U+00E6: "æ" LATIN SMALL LETTER AE -->
- <string name="more_keys_for_scandinavia_row2_11">æ</string>
+ <string name="more_keys_for_nordic_row2_11">æ</string>
</resources>
diff --git a/java/res/values-uk/donottranslate-more-keys.xml b/java/res/values-uk/donottranslate-more-keys.xml
index 323eaaf..3239704 100644
--- a/java/res/values-uk/donottranslate-more-keys.xml
+++ b/java/res/values-uk/donottranslate-more-keys.xml
@@ -18,8 +18,16 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+ <string name="keylabel_for_east_slavic_row1_9">щ</string>
<!-- U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
- <string name="keylabel_for_cyrillic_yery">і</string>
+ <string name="keylabel_for_east_slavic_row2_1">і</string>
+ <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
+ <string name="keylabel_for_east_slavic_row3_5">и</string>
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_cyrillic_ha">ъ</string>
<!-- U+0457: "ї" CYRILLIC SMALL LETTER YI -->
- <string name="more_keys_for_cyrillic_yery">ї</string>
+ <string name="more_keys_for_east_slavic_row2_1">ї</string>
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_cyrillic_soft_sign">ъ</string>
</resources>
diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml
index 79e12f8..8fbb2ef 100644
--- a/java/res/values/donottranslate-more-keys.xml
+++ b/java/res/values/donottranslate-more-keys.xml
@@ -35,34 +35,25 @@
<string name="more_keys_for_l"></string>
<string name="more_keys_for_g"></string>
<string name="more_keys_for_v"></string>
- <string name="keylabel_for_scandinavia_row1_11"></string>
- <string name="keylabel_for_scandinavia_row2_10"></string>
- <string name="keylabel_for_scandinavia_row2_11"></string>
- <string name="more_keys_for_scandinavia_row2_10"></string>
- <string name="more_keys_for_scandinavia_row2_11"></string>
- <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
- <string name="keylabel_for_cyrillic_shcha">щ</string>
- <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
- <string name="keylabel_for_cyrillic_yery">ы</string>
- <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
- <string name="keylabel_for_cyrillic_i">и</string>
- <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
- <string name="keylabel_for_cyrillic_ze">з</string>
- <!-- U+045B: "ћ" CYRILLIC SMALL LETTER TSHE -->
- <string name="keylabel_for_cyrillic_tshe">ћ</string>
- <!-- U+0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
- <string name="keylabel_for_cyrillic_dze">ѕ</string>
- <!-- U+0452: "ђ" CYRILLIC SMALL LETTER DJE -->
- <string name="keylabel_for_cyrillic_dje">ђ</string>
+ <string name="keylabel_for_nordic_row1_11"></string>
+ <string name="keylabel_for_nordic_row2_10"></string>
+ <string name="keylabel_for_nordic_row2_11"></string>
+ <string name="more_keys_for_nordic_row2_10"></string>
+ <string name="more_keys_for_nordic_row2_11"></string>
+ <string name="keylabel_for_east_slavic_row1_9"></string>
+ <string name="keylabel_for_east_slavic_row2_1"></string>
+ <string name="keylabel_for_east_slavic_row3_5"></string>
<string name="more_keys_for_cyrillic_u"></string>
<string name="more_keys_for_cyrillic_ye"></string>
<string name="more_keys_for_cyrillic_en"></string>
- <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
- <string name="more_keys_for_cyrillic_ha">ъ</string>
- <string name="more_keys_for_cyrillic_yery"></string>
+ <string name="more_keys_for_cyrillic_ha"></string>
+ <string name="more_keys_for_east_slavic_row2_1"></string>
<string name="more_keys_for_cyrillic_o"></string>
- <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
- <string name="more_keys_for_cyrillic_soft_sign">ъ</string>
+ <string name="more_keys_for_cyrillic_soft_sign"></string>
+ <string name="keylabel_for_south_slavic_row1_6"></string>
+ <string name="keylabel_for_south_slavic_row2_11"></string>
+ <string name="keylabel_for_south_slavic_row3_1"></string>
+ <string name="keylabel_for_south_slavic_row3_8"></string>
<string name="more_keys_for_cyrillic_ie"></string>
<string name="more_keys_for_cyrillic_i"></string>
<!-- U+00A2: "¢" CENT SIGN
diff --git a/java/res/xml/rowkeys_east_slavic1.xml b/java/res/xml/rowkeys_east_slavic1.xml
index ab83d99..04c6ef6 100644
--- a/java/res/xml/rowkeys_east_slavic1.xml
+++ b/java/res/xml/rowkeys_east_slavic1.xml
@@ -65,7 +65,7 @@
latin:keyHintLabel="8"
latin:additionalMoreKeys="8" />
<Key
- latin:keyLabel="@string/keylabel_for_cyrillic_shcha"
+ latin:keyLabel="@string/keylabel_for_east_slavic_row1_9"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9" />
<!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
diff --git a/java/res/xml/rowkeys_east_slavic2.xml b/java/res/xml/rowkeys_east_slavic2.xml
index 20415bc..57b0373 100644
--- a/java/res/xml/rowkeys_east_slavic2.xml
+++ b/java/res/xml/rowkeys_east_slavic2.xml
@@ -25,8 +25,8 @@
<Key
latin:keyLabel="ф" />
<Key
- latin:keyLabel="@string/keylabel_for_cyrillic_yery"
- latin:moreKeys="@string/more_keys_for_cyrillic_yery" />
+ latin:keyLabel="@string/keylabel_for_east_slavic_row2_1"
+ latin:moreKeys="@string/more_keys_for_east_slavic_row2_1" />
<!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
<Key
latin:keyLabel="в" />
diff --git a/java/res/xml/rowkeys_east_slavic3.xml b/java/res/xml/rowkeys_east_slavic3.xml
index bb67223..b0f7aed 100644
--- a/java/res/xml/rowkeys_east_slavic3.xml
+++ b/java/res/xml/rowkeys_east_slavic3.xml
@@ -34,7 +34,7 @@
<Key
latin:keyLabel="м" />
<Key
- latin:keyLabel="@string/keylabel_for_cyrillic_i" />
+ latin:keyLabel="@string/keylabel_for_east_slavic_row3_5" />
<!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
<Key
latin:keyLabel="т" />
diff --git a/java/res/xml/rowkeys_nordic1.xml b/java/res/xml/rowkeys_nordic1.xml
index 355b626..056895f 100644
--- a/java/res/xml/rowkeys_nordic1.xml
+++ b/java/res/xml/rowkeys_nordic1.xml
@@ -24,5 +24,5 @@
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1" />
<Key
- latin:keyLabel="@string/keylabel_for_scandinavia_row1_11" />
+ latin:keyLabel="@string/keylabel_for_nordic_row1_11" />
</merge>
diff --git a/java/res/xml/rowkeys_nordic2.xml b/java/res/xml/rowkeys_nordic2.xml
index 58e6bc2..0033ea1 100644
--- a/java/res/xml/rowkeys_nordic2.xml
+++ b/java/res/xml/rowkeys_nordic2.xml
@@ -24,9 +24,9 @@
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2" />
<Key
- latin:keyLabel="@string/keylabel_for_scandinavia_row2_10"
- latin:moreKeys="@string/more_keys_for_scandinavia_row2_10" />
+ latin:keyLabel="@string/keylabel_for_nordic_row2_10"
+ latin:moreKeys="@string/more_keys_for_nordic_row2_10" />
<Key
- latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
- latin:moreKeys="@string/more_keys_for_scandinavia_row2_11" />
+ latin:keyLabel="@string/keylabel_for_nordic_row2_11"
+ latin:moreKeys="@string/more_keys_for_nordic_row2_11" />
</merge>
diff --git a/java/res/xml/rowkeys_south_slavic1.xml b/java/res/xml/rowkeys_south_slavic1.xml
index 5485d86..e3cb89c 100644
--- a/java/res/xml/rowkeys_south_slavic1.xml
+++ b/java/res/xml/rowkeys_south_slavic1.xml
@@ -48,7 +48,7 @@
latin:keyHintLabel="5"
latin:additionalMoreKeys="5" />
<Key
- latin:keyLabel="@string/keylabel_for_cyrillic_ze"
+ latin:keyLabel="@string/keylabel_for_south_slavic_row1_6"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6" />
<!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
diff --git a/java/res/xml/rowkeys_south_slavic2.xml b/java/res/xml/rowkeys_south_slavic2.xml
index f30f42c..5a7ecd4 100644
--- a/java/res/xml/rowkeys_south_slavic2.xml
+++ b/java/res/xml/rowkeys_south_slavic2.xml
@@ -52,5 +52,5 @@
<Key
latin:keyLabel="ч" />
<Key
- latin:keyLabel="@string/keylabel_for_cyrillic_tshe" />
+ latin:keyLabel="@string/keylabel_for_south_slavic_row2_11" />
</merge>
diff --git a/java/res/xml/rowkeys_south_slavic3.xml b/java/res/xml/rowkeys_south_slavic3.xml
index 303fad8..97ff51e 100644
--- a/java/res/xml/rowkeys_south_slavic3.xml
+++ b/java/res/xml/rowkeys_south_slavic3.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="@string/keylabel_for_cyrillic_dze" />
+ latin:keyLabel="@string/keylabel_for_south_slavic_row3_1" />
<!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
<Key
latin:keyLabel="џ" />
@@ -42,7 +42,7 @@
<Key
latin:keyLabel="м" />
<Key
- latin:keyLabel="@string/keylabel_for_cyrillic_dje" />
+ latin:keyLabel="@string/keylabel_for_south_slavic_row3_8" />
<!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
<Key
latin:keyLabel="ж" />