Merge "More meaningful Emoji descriptions"
diff --git a/java/res/values-af/strings-talkback-descriptions.xml b/java/res/values-af/strings-talkback-descriptions.xml
index 3529e5a..75f2e8f 100644
--- a/java/res/values-af/strings-talkback-descriptions.xml
+++ b/java/res/values-af/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Vorige"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift geaktiveer"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Bokas-slot geaktiveer"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift gedeaktiveer"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Simboolmodus"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Lettermodus"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Foonmodus"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Foonsimbool-modus"</string>
diff --git a/java/res/values-am/strings-talkback-descriptions.xml b/java/res/values-am/strings-talkback-descriptions.xml
index 2d6f0e5..3ed2192 100644
--- a/java/res/values-am/strings-talkback-descriptions.xml
+++ b/java/res/values-am/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"ቀዳሚ"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"መቀያየሪያ ቁልፍ ነቅቷል"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"አብይ ፊደል ማድረጊያ ቁልፍ ነቅቷል"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"መቀያየሪያ ቁልፍ ተሰናክሏል"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"የምልክቶች ሁኔታ"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"የደብዳቤዎች ሁኔታ"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"የስልክ ሁኔታ"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"የስልክ ምልክቶች ሁኔታ"</string>
diff --git a/java/res/values-ar/strings-talkback-descriptions.xml b/java/res/values-ar/strings-talkback-descriptions.xml
index 9d2eab5..9f8d565 100644
--- a/java/res/values-ar/strings-talkback-descriptions.xml
+++ b/java/res/values-ar/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"السابق"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"تم تمكين Shift"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"تم تمكين Caps lock"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"تم تعطيل Shift"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"وضع الرموز"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"وضع الأحرف"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"وضع الهاتف"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"وضع رموز الهاتف"</string>
diff --git a/java/res/values-az-rAZ/strings-talkback-descriptions.xml b/java/res/values-az-rAZ/strings-talkback-descriptions.xml
index c5abc5c..e27d3e9 100644
--- a/java/res/values-az-rAZ/strings-talkback-descriptions.xml
+++ b/java/res/values-az-rAZ/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Əvvəlki"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Sürüşdürmə aktivdir"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Böyük hərf kilidi aktivdir"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Sürüşdürmə deaktivdir"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Simvol rejimi"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Hərf rejimi"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefon rejimi"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefon simvol rejimi"</string>
diff --git a/java/res/values-bg/strings-talkback-descriptions.xml b/java/res/values-bg/strings-talkback-descriptions.xml
index c944c57..e95bb80 100644
--- a/java/res/values-bg/strings-talkback-descriptions.xml
+++ b/java/res/values-bg/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Назад"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"„Shift“ е активиран"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"„Caps Lock“ е активиран"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"„Shift“ е деактивиран"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Режим за символи"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Режим за букви"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Режим за телефонни номера"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Режим за символи на телефона"</string>
diff --git a/java/res/values-ca/strings-talkback-descriptions.xml b/java/res/values-ca/strings-talkback-descriptions.xml
index 389200b..b0e30a0 100644
--- a/java/res/values-ca/strings-talkback-descriptions.xml
+++ b/java/res/values-ca/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Anterior"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Maj activat"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Bloq Maj activat"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Maj desactivat"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Mode de símbols"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Mode de lletres"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Mode de telèfon"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Mode de símbols de telèfon"</string>
diff --git a/java/res/values-cs/strings-talkback-descriptions.xml b/java/res/values-cs/strings-talkback-descriptions.xml
index 7ba691c..7df00d7 100644
--- a/java/res/values-cs/strings-talkback-descriptions.xml
+++ b/java/res/values-cs/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Předchozí"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Klávesa Shift je aktivní"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Klávesa Caps Lock je aktivní"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Klávesa Shift je neaktivní"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Režim symbolů"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Režim písmen"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Režim telefonu"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Režim telefonních symbolů"</string>
diff --git a/java/res/values-da/strings-talkback-descriptions.xml b/java/res/values-da/strings-talkback-descriptions.xml
index 2d613d6..29a3529 100644
--- a/java/res/values-da/strings-talkback-descriptions.xml
+++ b/java/res/values-da/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Forrige"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift er aktiveret"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock er aktiveret"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift er deaktiveret"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symboltilstand"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Bogstavtilstand"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefontilstand"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefonsymboltilstand"</string>
diff --git a/java/res/values-de/strings-talkback-descriptions.xml b/java/res/values-de/strings-talkback-descriptions.xml
index 9fef632..34bbd0f 100644
--- a/java/res/values-de/strings-talkback-descriptions.xml
+++ b/java/res/values-de/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Zurück"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Umschalttaste aktiviert"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Feststelltaste aktiviert"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Umschalttaste deaktiviert"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbolmodus"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Buchstabenmodus"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefonmodus"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefon-Symbolmodus"</string>
diff --git a/java/res/values-el/strings-talkback-descriptions.xml b/java/res/values-el/strings-talkback-descriptions.xml
index 7393e63..95765d4 100644
--- a/java/res/values-el/strings-talkback-descriptions.xml
+++ b/java/res/values-el/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Προηγούμενο"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Το Shift είναι ενεργοποιημένο"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Το Caps lock είναι ενεργοποιημένο"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Το Shift είναι απενεργοποιημένο"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Λειτουργία συμβόλων"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Λειτουργία γραμμάτων"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Λειτουργία τηλεφώνου"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Λειτουργία συμβόλων τηλεφώνου"</string>
diff --git a/java/res/values-en-rGB/strings-talkback-descriptions.xml b/java/res/values-en-rGB/strings-talkback-descriptions.xml
index c9393ee..21083d6 100644
--- a/java/res/values-en-rGB/strings-talkback-descriptions.xml
+++ b/java/res/values-en-rGB/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Previous"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift enabled"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock enabled"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift disabled"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbols mode"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Letters mode"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Phone mode"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Phone symbols mode"</string>
diff --git a/java/res/values-en-rIN/strings-talkback-descriptions.xml b/java/res/values-en-rIN/strings-talkback-descriptions.xml
index c9393ee..21083d6 100644
--- a/java/res/values-en-rIN/strings-talkback-descriptions.xml
+++ b/java/res/values-en-rIN/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Previous"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift enabled"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock enabled"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift disabled"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbols mode"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Letters mode"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Phone mode"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Phone symbols mode"</string>
diff --git a/java/res/values-es-rUS/strings-talkback-descriptions.xml b/java/res/values-es-rUS/strings-talkback-descriptions.xml
index ab4979f..e8f2bd4 100644
--- a/java/res/values-es-rUS/strings-talkback-descriptions.xml
+++ b/java/res/values-es-rUS/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Anterior"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Mayúsculas activado"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Bloqueo de mayúsculas activado"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Mayúsculas desactivado"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modo Símbolos"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modo Letras"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modo Teléfono"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modo Símbolos del teléfono"</string>
diff --git a/java/res/values-es/strings-talkback-descriptions.xml b/java/res/values-es/strings-talkback-descriptions.xml
index 72bb6f1..07fbdac 100644
--- a/java/res/values-es/strings-talkback-descriptions.xml
+++ b/java/res/values-es/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Anterior"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Mayúsculas habilitadas"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Bloq Mayús habilitado"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Mayúsculas inhabilitadas"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modo de símbolos"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modo de letras"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modo de teléfono"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modo de símbolos de teléfono"</string>
diff --git a/java/res/values-et-rEE/strings-talkback-descriptions.xml b/java/res/values-et-rEE/strings-talkback-descriptions.xml
index 5a359c1..d980eff 100644
--- a/java/res/values-et-rEE/strings-talkback-descriptions.xml
+++ b/java/res/values-et-rEE/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Eelmine"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Tõstuklahv on lubatud"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Suurtähelukk on lubatud"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Tõstuklahv on keelatud"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Sümbolite režiim"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Tähtede režiim"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefonirežiim"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefoni sümbolite režiim"</string>
diff --git a/java/res/values-fa/strings-talkback-descriptions.xml b/java/res/values-fa/strings-talkback-descriptions.xml
index 26e99cb..25d263f 100644
--- a/java/res/values-fa/strings-talkback-descriptions.xml
+++ b/java/res/values-fa/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"قبلی"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift فعال شد"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock فعال شد"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift غیرفعال شد"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"حالت نمادها"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"حالت حروف"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"حالت تلفن"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"حالت نمادهای تلفن"</string>
diff --git a/java/res/values-fi/strings-talkback-descriptions.xml b/java/res/values-fi/strings-talkback-descriptions.xml
index 2d0d7a7..48c39ff 100644
--- a/java/res/values-fi/strings-talkback-descriptions.xml
+++ b/java/res/values-fi/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Edellinen"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Vaihto päällä"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock päällä"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Vaihto pois päältä"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbolit-tila"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Näppäimistötila"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Puhelintila"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Puhelinsymbolit-tila"</string>
diff --git a/java/res/values-fr-rCA/strings-talkback-descriptions.xml b/java/res/values-fr-rCA/strings-talkback-descriptions.xml
index b632edc..4b95545 100644
--- a/java/res/values-fr-rCA/strings-talkback-descriptions.xml
+++ b/java/res/values-fr-rCA/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Précédente"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Touche Maj activée"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Verrouillage des majuscules activé"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Touche Majuscule désactivée"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Mode Symboles"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Mode Lettres"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Mode Téléphone"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Mode Symboles du téléphone"</string>
diff --git a/java/res/values-fr/strings-talkback-descriptions.xml b/java/res/values-fr/strings-talkback-descriptions.xml
index efa140b..1f59628 100644
--- a/java/res/values-fr/strings-talkback-descriptions.xml
+++ b/java/res/values-fr/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Précédent"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"La touche Maj a bien été activée."</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Le verrouillage des majuscules a bien été activé."</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"La touche Maj a bien été désactivée."</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Mode Symboles"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Mode Lettres"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Mode Téléphone"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Mode Symboles du téléphone"</string>
diff --git a/java/res/values-hi/strings-talkback-descriptions.xml b/java/res/values-hi/strings-talkback-descriptions.xml
index df95119..d040e98 100644
--- a/java/res/values-hi/strings-talkback-descriptions.xml
+++ b/java/res/values-hi/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"पिछला"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"शिफ़्ट सक्षम किया गया"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"कैप्स लॉक सक्षम किया गया"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"शिफ़्ट अक्षम किया गया"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"प्रतीक मोड"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"अक्षर मोड"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"फ़ोन मोड"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"फ़ोन प्रतीक मोड"</string>
diff --git a/java/res/values-hr/strings-talkback-descriptions.xml b/java/res/values-hr/strings-talkback-descriptions.xml
index 31c7eb5..f0be91c 100644
--- a/java/res/values-hr/strings-talkback-descriptions.xml
+++ b/java/res/values-hr/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Prethodna"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Omogućena je tipka Shift"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Omogućen je Caps Lock"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Tipka Shift onemogućena je"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Način unosa simbola"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Način unosa slova"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefonski način rada"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Način unosa telefonskih simbola"</string>
diff --git a/java/res/values-hu/strings-talkback-descriptions.xml b/java/res/values-hu/strings-talkback-descriptions.xml
index ec2c353..88c5e01 100644
--- a/java/res/values-hu/strings-talkback-descriptions.xml
+++ b/java/res/values-hu/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Előző"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift bekapcsolva"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock bekapcsolva"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift kikapcsolva"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"„Szimbólumok” mód"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"„Betű” mód"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"„Telefon” mód"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"„Telefonos szimbólumok” mód"</string>
diff --git a/java/res/values-hy-rAM/strings-talkback-descriptions.xml b/java/res/values-hy-rAM/strings-talkback-descriptions.xml
index e5b1ce6..11ce95a 100644
--- a/java/res/values-hy-rAM/strings-talkback-descriptions.xml
+++ b/java/res/values-hy-rAM/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Նախորդը"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift-ը միացված է"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock-ը միացված է"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift-ն անջատված է"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Նշանների ռեժիմ"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Տառերի ռեժիմ"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Հեռախոսային ռեժիմ"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Հեռախոսի նշանների ռեժիմ"</string>
diff --git a/java/res/values-in/strings-talkback-descriptions.xml b/java/res/values-in/strings-talkback-descriptions.xml
index 73bf712..e526f0d 100644
--- a/java/res/values-in/strings-talkback-descriptions.xml
+++ b/java/res/values-in/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Sebelumnya"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift diaktifkan"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock diaktifkan"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift dinonaktifkan"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Mode simbol"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Mode huruf"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Mode telepon"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Mode simbol telepon"</string>
diff --git a/java/res/values-it/strings-talkback-descriptions.xml b/java/res/values-it/strings-talkback-descriptions.xml
index 760db69..3d203d0 100644
--- a/java/res/values-it/strings-talkback-descriptions.xml
+++ b/java/res/values-it/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Precedente"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Maiusc attivo"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Bloc Maiusc attivo"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Maiusc disattivato"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modalità simboli"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modalità lettere"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modalità telefono"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modalità simboli telefono"</string>
diff --git a/java/res/values-iw/strings-talkback-descriptions.xml b/java/res/values-iw/strings-talkback-descriptions.xml
index e6344fb..651ea63 100644
--- a/java/res/values-iw/strings-talkback-descriptions.xml
+++ b/java/res/values-iw/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"הקודם"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift פועל"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock פועל"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift מושבת"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"מצב סמלים"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"מצב אותיות"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"מצב טלפון"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"מצב סמלי טלפון"</string>
diff --git a/java/res/values-ja/strings-talkback-descriptions.xml b/java/res/values-ja/strings-talkback-descriptions.xml
index 990774e..c626a97 100644
--- a/java/res/values-ja/strings-talkback-descriptions.xml
+++ b/java/res/values-ja/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"前へ"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift有効"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"CapsLock有効"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift解除"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"記号モード"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"英数モード"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"電話モード"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"電話記号モード"</string>
diff --git a/java/res/values-ka-rGE/strings-talkback-descriptions.xml b/java/res/values-ka-rGE/strings-talkback-descriptions.xml
index c4fd659..971749c 100644
--- a/java/res/values-ka-rGE/strings-talkback-descriptions.xml
+++ b/java/res/values-ka-rGE/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"წინა"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift ჩართულია"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"ჩართულია Caps"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift გამორთულია"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"სიმბოლოების რეჟიმი"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"ასოების რეჟიმი"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"ტელეფონის რეჟიმი"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"ტელეფონის სიმბოლოების რეჟიმი"</string>
diff --git a/java/res/values-km-rKH/strings-talkback-descriptions.xml b/java/res/values-km-rKH/strings-talkback-descriptions.xml
index 76bc35f..0a2bbed 100644
--- a/java/res/values-km-rKH/strings-talkback-descriptions.xml
+++ b/java/res/values-km-rKH/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"មុន"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"បានបើក Shift"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"បានបើក Caps lock"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"បានបិទ Shift"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"របៀបនិមិត្តសញ្ញា"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"របៀបអក្សរ"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"របៀបទូរស័ព្ទ"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"របៀបនិមិត្តសញ្ញាទូរស័ព្ទ"</string>
diff --git a/java/res/values-ko/strings-talkback-descriptions.xml b/java/res/values-ko/strings-talkback-descriptions.xml
index 6142c6a..a199d86 100644
--- a/java/res/values-ko/strings-talkback-descriptions.xml
+++ b/java/res/values-ko/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"이전"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift 사용"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock 사용"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift 사용 중지됨"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"기호 모드"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"문자 모드"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"다이얼 모드"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"전화 기호 모드"</string>
diff --git a/java/res/values-lo-rLA/strings-talkback-descriptions.xml b/java/res/values-lo-rLA/strings-talkback-descriptions.xml
index 681a213..bd67827 100644
--- a/java/res/values-lo-rLA/strings-talkback-descriptions.xml
+++ b/java/res/values-lo-rLA/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"ກ່ອນໜ້ານີ້"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift ເປີດນຳໃຊ້ຢູ່"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock ເປີດນຳໃຊ້ຢູ່"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift ປິດນຳໃຊ້ຢູ່"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"ໂຫມດສັນຍາລັກ"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"ໂຫມດໂຕອັກສອນ"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"ໂຫມດໂທລະສັບ"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"ໂຫມດສັນຍາລັກໂທລະສັບ"</string>
diff --git a/java/res/values-lt/strings-talkback-descriptions.xml b/java/res/values-lt/strings-talkback-descriptions.xml
index 07119cb..5f6bf93 100644
--- a/java/res/values-lt/strings-talkback-descriptions.xml
+++ b/java/res/values-lt/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Ankstesnis"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Klavišas „Shift“ įgalintas"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Didžiųjų raidžių klavišas įgalintas"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Klavišas „Shift“ išjungtas"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Simbolių režimas"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Raidžių režimas"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefonų numerių režimas"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefonų numerių simbolių režimas"</string>
diff --git a/java/res/values-lv/strings-talkback-descriptions.xml b/java/res/values-lv/strings-talkback-descriptions.xml
index eb32e9d..6df46cb 100644
--- a/java/res/values-lv/strings-talkback-descriptions.xml
+++ b/java/res/values-lv/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Atpakaļ"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Pārslēgšanas režīms ir iespējots"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Burtslēgs ir iespējots"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Pārslēgšanas režīms ir atspējots"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Simbolu režīms"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Burtu režīms"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Tālruņa režīms"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Tālruņa simbolu režīms"</string>
diff --git a/java/res/values-mn-rMN/strings-talkback-descriptions.xml b/java/res/values-mn-rMN/strings-talkback-descriptions.xml
index 7eb3167..c11e8c7 100644
--- a/java/res/values-mn-rMN/strings-talkback-descriptions.xml
+++ b/java/res/values-mn-rMN/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Өмнөх"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Сэлгэхийг идэвхжүүлсэн"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Томоор бичихийг идэвхжүүлсэн"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Сэлгэхийг идэвхжүүлээгүй"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Симбол төлөв"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Үсэгнүүд төлөв"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Утасны төлөв"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Утасны символ төлөв"</string>
diff --git a/java/res/values-ms-rMY/strings-talkback-descriptions.xml b/java/res/values-ms-rMY/strings-talkback-descriptions.xml
index 29c5fd8..ef38104 100644
--- a/java/res/values-ms-rMY/strings-talkback-descriptions.xml
+++ b/java/res/values-ms-rMY/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Sebelumnya"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Kunci anjak didayakan"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Kunci huruf besar didayakan"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Kunci anjak dilumpuhkan"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Mod simbol"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Mod huruf"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Mod telefon"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Mod simbol telefon"</string>
diff --git a/java/res/values-nb/strings-talkback-descriptions.xml b/java/res/values-nb/strings-talkback-descriptions.xml
index 96edf38..ff03021 100644
--- a/java/res/values-nb/strings-talkback-descriptions.xml
+++ b/java/res/values-nb/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Forrige"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift er aktivert"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock er aktivert"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift er deaktivert"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbolmodus"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Bokstavmodus"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Ringemodus"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Ringemodus med symboler"</string>
diff --git a/java/res/values-ne-rNP/strings-talkback-descriptions.xml b/java/res/values-ne-rNP/strings-talkback-descriptions.xml
index cffed33..cdf7598 100644
--- a/java/res/values-ne-rNP/strings-talkback-descriptions.xml
+++ b/java/res/values-ne-rNP/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"अघिल्लो"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"सिफ्ट सक्षम पारिएको छ"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"क्याप्स लक सक्षम पारिएको छ"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"सिफ्ट असक्षम पारिएको छ"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"प्रतिक ढाँचा"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"अक्षर ढाँचा"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"फोन ढाँचा"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"फोन प्रतिक मोड"</string>
diff --git a/java/res/values-nl/strings-talkback-descriptions.xml b/java/res/values-nl/strings-talkback-descriptions.xml
index 8dcd574..52a5171 100644
--- a/java/res/values-nl/strings-talkback-descriptions.xml
+++ b/java/res/values-nl/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Vorige"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift ingeschakeld"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock ingeschakeld"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift uitgeschakeld"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbolen"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Alfanumeriek toetsenbord"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Toetsenbord telefoon"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefoonsymbolen"</string>
diff --git a/java/res/values-pl/strings-talkback-descriptions.xml b/java/res/values-pl/strings-talkback-descriptions.xml
index 567bb3b..2f8ea68 100644
--- a/java/res/values-pl/strings-talkback-descriptions.xml
+++ b/java/res/values-pl/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Wstecz"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift włączony"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock włączony"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift wyłączony"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Tryb symboli"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Tryb liter"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Tryb telefonu"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Tryb symboli telefonu"</string>
diff --git a/java/res/values-pt-rPT/strings-talkback-descriptions.xml b/java/res/values-pt-rPT/strings-talkback-descriptions.xml
index bf51caa..9c3e2f0 100644
--- a/java/res/values-pt-rPT/strings-talkback-descriptions.xml
+++ b/java/res/values-pt-rPT/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Anterior"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift ativado"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock ativado"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift desativado"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modo de símbolos"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modo de letras"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modo de telemóvel"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modo de símbolos de telemóvel"</string>
diff --git a/java/res/values-pt/strings-talkback-descriptions.xml b/java/res/values-pt/strings-talkback-descriptions.xml
index 01aac39..0eb9ca6 100644
--- a/java/res/values-pt/strings-talkback-descriptions.xml
+++ b/java/res/values-pt/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Anterior"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift ativado"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock ativado"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift desativado"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modo de símbolos"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modo de letras"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modo de telefone"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modo de símbolos do telefone"</string>
diff --git a/java/res/values-ro/strings-talkback-descriptions.xml b/java/res/values-ro/strings-talkback-descriptions.xml
index 2b428eb..7226763 100644
--- a/java/res/values-ro/strings-talkback-descriptions.xml
+++ b/java/res/values-ro/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Înapoi"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Tasta Shift a fost activată"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Tasta Caps Lock este activată"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Tasta Shift a fost dezactivată"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Modul Simboluri"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Modul Alfanumeric"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Modul Telefon"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Modul Telefon cu simboluri"</string>
diff --git a/java/res/values-ru/strings-talkback-descriptions.xml b/java/res/values-ru/strings-talkback-descriptions.xml
index 7e64f11..9ae00ed 100644
--- a/java/res/values-ru/strings-talkback-descriptions.xml
+++ b/java/res/values-ru/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Назад."</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Верхний регистр включен."</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock включен."</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Верхний регистр отключен."</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Режим добавления символов."</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Режим ввода текста."</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Режим набора номера."</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Режим телефонных символов."</string>
diff --git a/java/res/values-sk/strings-talkback-descriptions.xml b/java/res/values-sk/strings-talkback-descriptions.xml
index 605aceb..80972f5 100644
--- a/java/res/values-sk/strings-talkback-descriptions.xml
+++ b/java/res/values-sk/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Naspäť"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Kláves Shift je povolený"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Kláves Caps Lock je povolený"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Kláves Shift je zakázaný"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Režim symbolov"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Režim písmen"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Režim telefónu"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Režim telefónnych symbolov"</string>
diff --git a/java/res/values-sl/strings-talkback-descriptions.xml b/java/res/values-sl/strings-talkback-descriptions.xml
index 280393a..bbe6112 100644
--- a/java/res/values-sl/strings-talkback-descriptions.xml
+++ b/java/res/values-sl/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Nazaj"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Način »Shift« je omogočen"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Funkcija »Caps Lock« je omogočena"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Način »Shift« je onemogočen"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Način simbolov"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Način črk"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Način telefona"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Način simbolov telefona"</string>
diff --git a/java/res/values-sr/strings-talkback-descriptions.xml b/java/res/values-sr/strings-talkback-descriptions.xml
index 402d45b..7ffb792 100644
--- a/java/res/values-sr/strings-talkback-descriptions.xml
+++ b/java/res/values-sr/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Следеће"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift је омогућен"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock је омогућен"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift је онемогућен"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Режим симбола"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Режим слова"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Режим телефона"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Режим симбола телефона"</string>
diff --git a/java/res/values-sv/strings-talkback-descriptions.xml b/java/res/values-sv/strings-talkback-descriptions.xml
index 140202d..d8818f9 100644
--- a/java/res/values-sv/strings-talkback-descriptions.xml
+++ b/java/res/values-sv/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Föregående"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Skift aktiverat"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock är aktiverat"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Skift är inaktiverat"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbolläge"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Bokstavsläge"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefonläge"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefonsymbolläge"</string>
diff --git a/java/res/values-sw/strings-talkback-descriptions.xml b/java/res/values-sw/strings-talkback-descriptions.xml
index e9ca282..5e9d59d 100644
--- a/java/res/values-sw/strings-talkback-descriptions.xml
+++ b/java/res/values-sw/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Iililotangulia"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift imewashwa"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock imewashwa"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift imezimwa"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Hali ya alama"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Hali ya herufi"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Hali ya simu"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Hali ya alama za simu"</string>
diff --git a/java/res/values-th/strings-talkback-descriptions.xml b/java/res/values-th/strings-talkback-descriptions.xml
index eb712ae..7c8af54 100644
--- a/java/res/values-th/strings-talkback-descriptions.xml
+++ b/java/res/values-th/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"ก่อนหน้า"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"เปิดใช้งาน Shift แล้ว"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"เปิดใช้งาน Caps Lock แล้ว"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"ปิดใช้งาน Shift แล้ว"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"โหมดสัญลักษณ์"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"โหมดตัวอักษร"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"โหมดโทรศัพท์"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"โหมดสัญลักษณ์โทรศัพท์"</string>
diff --git a/java/res/values-tl/strings-talkback-descriptions.xml b/java/res/values-tl/strings-talkback-descriptions.xml
index fbf276b..cb297b0 100644
--- a/java/res/values-tl/strings-talkback-descriptions.xml
+++ b/java/res/values-tl/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Nauna"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Naka-enable ang shift"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Naka-enable ang caps lock"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Naka-disable ang shift"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbols mode"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Letters mode"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Phone mode"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Phone symbols mode"</string>
diff --git a/java/res/values-tr/strings-talkback-descriptions.xml b/java/res/values-tr/strings-talkback-descriptions.xml
index d06c900..a1000fe 100644
--- a/java/res/values-tr/strings-talkback-descriptions.xml
+++ b/java/res/values-tr/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Önceki"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Üst karakter etkin"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Büyük harf etkin"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Üst karakter devre dışı"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Sembol modu"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Harf modu"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Telefon modu"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Telefon sembolleri modu"</string>
diff --git a/java/res/values-uk/strings-talkback-descriptions.xml b/java/res/values-uk/strings-talkback-descriptions.xml
index 9b6d114..888fe19 100644
--- a/java/res/values-uk/strings-talkback-descriptions.xml
+++ b/java/res/values-uk/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Назад"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift увімкнено"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock увімкнено"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift вимкнено"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Режим символів"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Режим літер"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Режим номерів телефону"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Режим телефонних символів"</string>
diff --git a/java/res/values-vi/strings-talkback-descriptions.xml b/java/res/values-vi/strings-talkback-descriptions.xml
index 9202883..04a94ef 100644
--- a/java/res/values-vi/strings-talkback-descriptions.xml
+++ b/java/res/values-vi/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Trước"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Đã bật Shift"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Đã bật Caps lock"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Đã tắt Shift"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Chế độ biểu tượng"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Chế độ chữ cái"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Chế độ điện thoại"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Chế độ biểu tượng điện thoại"</string>
diff --git a/java/res/values-zh-rCN/strings-talkback-descriptions.xml b/java/res/values-zh-rCN/strings-talkback-descriptions.xml
index 93f89e0..44e9514 100644
--- a/java/res/values-zh-rCN/strings-talkback-descriptions.xml
+++ b/java/res/values-zh-rCN/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"上一个"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"已开启Shift模式"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"已锁定大写模式"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"已关闭Shift模式"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"符号模式"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"字母模式"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"电话模式"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"电话符号模式"</string>
diff --git a/java/res/values-zh-rHK/strings-talkback-descriptions.xml b/java/res/values-zh-rHK/strings-talkback-descriptions.xml
index 8b60504..5226f5d 100644
--- a/java/res/values-zh-rHK/strings-talkback-descriptions.xml
+++ b/java/res/values-zh-rHK/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"上一個"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift 鍵已啟用"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"大寫鎖定已啟用"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift 鍵已停用"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"符號模式"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"字母模式"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"撥號模式"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"符號撥號模式"</string>
diff --git a/java/res/values-zh-rTW/strings-talkback-descriptions.xml b/java/res/values-zh-rTW/strings-talkback-descriptions.xml
index 6351a98..9c2937a 100644
--- a/java/res/values-zh-rTW/strings-talkback-descriptions.xml
+++ b/java/res/values-zh-rTW/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"上一個"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift 鍵已啟用"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"大寫鎖定已啟用"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"Shift 鍵已停用"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"符號模式"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"字母模式"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"撥號模式"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"撥號符號模式"</string>
diff --git a/java/res/values-zu/strings-talkback-descriptions.xml b/java/res/values-zu/strings-talkback-descriptions.xml
index e01f734..be8d7f2 100644
--- a/java/res/values-zu/strings-talkback-descriptions.xml
+++ b/java/res/values-zu/strings-talkback-descriptions.xml
@@ -46,8 +46,9 @@
<string name="spoken_description_action_previous" msgid="2919072174697865110">"Okwangaphambilini"</string>
<string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"U-Shift uvunyelwe"</string>
<string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Ofeleba bavunyelwe"</string>
- <string name="spoken_description_shiftmode_off" msgid="5039126122829961331">"U-Shift uvimbelwe"</string>
<string name="spoken_description_mode_symbol" msgid="111186851131446691">"Imodi yezimpawu"</string>
+ <!-- no translation found for spoken_description_mode_symbol_shift (3940566070908816492) -->
+ <skip />
<string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Imodi yezinhlamvu"</string>
<string name="spoken_description_mode_phone" msgid="2061220553756692903">"Imodi yefoni"</string>
<string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Imodi yezimpawu zefoni"</string>
diff --git a/java/res/xml-sw600dp/rows_marathi.xml b/java/res/xml-sw600dp/rows_marathi.xml
new file mode 100644
index 0000000..51dc7a2
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_marathi.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="8.182%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_marathi1" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="8.182%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_marathi2" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row
+ latin:keyWidth="8.182%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_marathi3" />
+ <include
+ latin:keyboardLayout="@xml/keys_exclamation_question" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
index 71439d6..405aebc 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
@@ -36,6 +36,15 @@
latin:styleName="moreKeysDevanagariSignAnusvara"
latin:moreKeys="ः,ँ,़" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA
+ U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignAnusvara"
+ latin:moreKeys="ः,ँ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariSignAnusvara" />
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
index 0c3a29b..73248e4 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
@@ -34,6 +34,14 @@
latin:styleName="moreKeysDevanagariSignVirama"
latin:moreKeys="्" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0905: "अ" DEVANAGARI LETTER A -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignVirama"
+ latin:moreKeys="अ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariSignVirama" />
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
index 5bb0351..cd07999 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
@@ -43,6 +43,14 @@
latin:styleName="moreKeysDevanagariVowelSignAa"
latin:moreKeys="ा,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAa"
+ latin:moreKeys="आ,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignAa" />
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
index 8edf6eb..75a49b1 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
@@ -43,6 +43,14 @@
latin:moreKeys="ै,%" />
</case>
<case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAi"
+ latin:moreKeys="ऐ,%" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
index 212e058..26f1aca 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
@@ -42,6 +42,14 @@
latin:styleName="moreKeysDevanagariVowelSignAu"
latin:moreKeys="ौ,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAu"
+ latin:moreKeys="औ,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignAu" />
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
index ef2c3f1..ec056a3 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -34,9 +34,23 @@
latin:styleName="moreKeysDevanagariVowelSignCandraE"
latin:moreKeys="ॅ" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraE"
+ latin:moreKeys="ऍ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignCandraE" />
</default>
</switch>
+ <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
+ <key-style
+ latin:styleName="baseKeyDevanagariVowelSignCandraE"
+ latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
+ latin:keySpec="ॅ"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
index ac01d37..fb4d4eb 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -34,6 +34,14 @@
latin:styleName="moreKeysDevanagariVowelSignCandraO"
latin:moreKeys="ॉ" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraO"
+ latin:moreKeys="ऑ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignCandraO" />
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
index 77d6eb5..965bccb 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
@@ -43,6 +43,14 @@
latin:moreKeys="े" />
</case>
<case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignE"
+ latin:moreKeys="ए" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0903: "ः" DEVANAGARI SIGN VISARGA
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
index d79447b..ec71c4d 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
@@ -42,6 +42,14 @@
latin:styleName="moreKeysDevanagariVowelSignI"
latin:moreKeys="ि" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0907: "इ" DEVANAGARI LETTER I -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignI"
+ latin:moreKeys="इ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignI" />
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
index 0e10f31..9a9f915 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
@@ -42,6 +42,14 @@
latin:styleName="moreKeysDevanagariVowelSignIi"
latin:moreKeys="ी,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0908: "ई" DEVANAGARI LETTER II -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignIi"
+ latin:moreKeys="ई,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignIi" />
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
index 47ca906..77389c2 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
@@ -44,6 +44,14 @@
latin:styleName="moreKeysDevanagariVowelSignO"
latin:moreKeys="ो" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignO"
+ latin:moreKeys="ओ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignO" />
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
index 694e4ab..e2167bf 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
@@ -43,6 +43,14 @@
latin:styleName="moreKeysDevanagariVowelSignU"
latin:moreKeys="ु" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0909: "उ" DEVANAGARI LETTER U -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignU"
+ latin:moreKeys="उ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignU" />
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
index f17489e..7452368 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
@@ -43,6 +43,14 @@
latin:styleName="moreKeysDevanagariVowelSignUu"
latin:moreKeys="ू,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignUu"
+ latin:moreKeys="ऊ,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignUu" />
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 2709846..9c930d3 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -44,6 +44,16 @@
latin:moreKeys="ऋ,ृ" />
</case>
<case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
+ U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
+ U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignVocalicR"
+ latin:moreKeys="ऱ,ऋ,ृ" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0913: "ओ" DEVANAGARI LETTER O -->
diff --git a/java/res/xml/kbd_marathi.xml b/java/res/xml/kbd_marathi.xml
new file mode 100644
index 0000000..4328cd6
--- /dev/null
+++ b/java/res/xml/kbd_marathi.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_marathi" />
+</Keyboard>
diff --git a/java/res/xml/keyboard_layout_set_marathi.xml b/java/res/xml/keyboard_layout_set_marathi.xml
new file mode 100644
index 0000000..e5c68e7
--- /dev/null
+++ b/java/res/xml/keyboard_layout_set_marathi.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<KeyboardLayoutSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_marathi"
+ latin:enableProximityCharsCorrection="true" />
+ <Element
+ latin:elementName="symbols"
+ latin:elementKeyboard="@xml/kbd_symbols" />
+ <Element
+ latin:elementName="symbolsShifted"
+ latin:elementKeyboard="@xml/kbd_symbols_shift" />
+ <Element
+ latin:elementName="phone"
+ latin:elementKeyboard="@xml/kbd_phone" />
+ <Element
+ latin:elementName="phoneSymbols"
+ latin:elementKeyboard="@xml/kbd_phone_symbols" />
+ <Element
+ latin:elementName="number"
+ latin:elementKeyboard="@xml/kbd_number" />
+</KeyboardLayoutSet>
diff --git a/java/res/xml/keystyle_devanagari_sign_anusvara.xml b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
index 6dc9b7e..a7e421d 100644
--- a/java/res/xml/keystyle_devanagari_sign_anusvara.xml
+++ b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
@@ -37,6 +37,16 @@
latin:styleName="moreKeysDevanagariSignAnusvara"
latin:moreKeys="◌ः|ः,◌ँ|ँ,◌़|़" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0903: "ः" DEVANAGARI SIGN VISARGA
+ U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignAnusvara"
+ latin:moreKeys="◌ः|ः,◌ँ|ँ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariSignAnusvara" />
diff --git a/java/res/xml/keystyle_devanagari_sign_virama.xml b/java/res/xml/keystyle_devanagari_sign_virama.xml
index 96506e2..58dd42a 100644
--- a/java/res/xml/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml/keystyle_devanagari_sign_virama.xml
@@ -35,6 +35,14 @@
latin:styleName="moreKeysDevanagariSignVirama"
latin:moreKeys="◌्|्" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0905: "अ" DEVANAGARI LETTER A -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignVirama"
+ latin:moreKeys="अ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariSignVirama" />
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
index 4b87650..1a60ca2 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
@@ -45,6 +45,14 @@
latin:styleName="moreKeysDevanagariVowelSignAa"
latin:moreKeys="◌ा|ा,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAa"
+ latin:moreKeys="आ,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignAa" />
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
index 050a7ce..e6b64e5 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
@@ -45,6 +45,14 @@
latin:moreKeys="◌ै|ै,%" />
</case>
<case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAi"
+ latin:moreKeys="ऐ,%" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
index 49e67da..3e129ec 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
@@ -44,6 +44,14 @@
latin:styleName="moreKeysDevanagariVowelSignAu"
latin:moreKeys="◌ौ|ौ,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAu"
+ latin:moreKeys="औ,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignAu" />
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
index 86f68d3..b7d0908 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -35,9 +35,24 @@
latin:styleName="moreKeysDevanagariVowelSignCandraE"
latin:moreKeys="◌ॅ|ॅ" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraE"
+ latin:moreKeys="ऍ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignCandraE" />
</default>
</switch>
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
+ <key-style
+ latin:styleName="baseKeyDevanagariVowelSignCandraE"
+ latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
+ latin:keySpec="◌ॅ|ॅ"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
index fd711e0..861dd1a 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -35,6 +35,14 @@
latin:styleName="moreKeysDevanagariVowelSignCandraO"
latin:moreKeys="◌ॉ|ॉ" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraO"
+ latin:moreKeys="ऑ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignCandraO" />
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
index 88f6a74..95d85a9 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
@@ -45,6 +45,14 @@
latin:moreKeys="◌े|े" />
</case>
<case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignE"
+ latin:moreKeys="ए" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
@@ -59,6 +67,8 @@
latin:styleName="moreKeysDevanagariVowelSignE" />
</default>
</switch>
+ <!-- U+25CC: "◌" DOTTED CIRCLE
+ U+0947: "े" DEVANAGARI VOWEL SIGN E -->
<key-style
latin:styleName="baseKeyDevanagariVowelSignE"
latin:parentStyle="moreKeysDevanagariVowelSignE"
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
index a84fdb4..5817be1 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
@@ -44,6 +44,14 @@
latin:styleName="moreKeysDevanagariVowelSignI"
latin:moreKeys="◌ि|ि" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0907: "इ" DEVANAGARI LETTER I -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignI"
+ latin:moreKeys="इ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignI" />
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
index 6f6eb0f..a7863c6 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
@@ -44,6 +44,14 @@
latin:styleName="moreKeysDevanagariVowelSignIi"
latin:moreKeys="◌ी|ी,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0908: "ई" DEVANAGARI LETTER II -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignIi"
+ latin:moreKeys="ई,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignIi" />
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
index 68b176a..3dc874e 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
@@ -46,6 +46,14 @@
latin:styleName="moreKeysDevanagariVowelSignO"
latin:moreKeys="◌ो|ो" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignO"
+ latin:moreKeys="ओ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignO" />
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
index 7c058b1..226c11a 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
@@ -45,6 +45,14 @@
latin:styleName="moreKeysDevanagariVowelSignU"
latin:moreKeys="◌ु|ु" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0909: "उ" DEVANAGARI LETTER U -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignU"
+ latin:moreKeys="उ" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignU" />
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
index 73ab63c..7a9f47d 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
@@ -45,6 +45,14 @@
latin:styleName="moreKeysDevanagariVowelSignUu"
latin:moreKeys="◌ू|ू,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignUu"
+ latin:moreKeys="ऊ,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignUu" />
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 29b083e..56b7396 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -46,6 +46,17 @@
latin:moreKeys="ऋ,◌ृ|ृ" />
</case>
<case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
+ U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
+ U+25CC: "◌" DOTTED CIRCLE
+ U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignVocalicR"
+ latin:moreKeys="ऱ,ऋ,◌ृ|ृ" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0913: "ओ" DEVANAGARI LETTER O -->
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 28eceb8..0156996 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -68,6 +68,7 @@
lv: Latvian/qwerty
mk: Macedonian/south_slavic
mn_MN: Mongolian (Mongolia)/mongolian
+ (mr_IN: Marathi (India)/marathi) # This is a preliminary keyboard layout.
ms_MY: Malay (Malaysia)/qwerty
(my_MM: Myanmar (Myanmar)/myanmar) # This is a preliminary keyboard layout.
nb: Norwegian Bokmål/nordic
@@ -477,6 +478,16 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable"
android:isAsciiCapable="false"
/>
+ <!-- TODO: This marathi keyboard is a preliminary layout.
+ This isn't based on the final specification. -->
+ <subtype android:icon="@drawable/ic_ime_switcher_dark"
+ android:label="@string/subtype_generic"
+ android:subtypeId="0x747b9f03"
+ android:imeSubtypeLocale="mr_IN"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=marathi,EmojiCapable"
+ android:isAsciiCapable="false"
+ />
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x84c87c61"
diff --git a/java/res/xml/rowkeys_marathi1.xml b/java/res/xml/rowkeys_marathi1.xml
new file mode 100644
index 0000000..810e71e
--- /dev/null
+++ b/java/res/xml/rowkeys_marathi1.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+ <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignAu"
+ latin:keyHintLabel="1"
+ latin:additionalMoreKeys="१,1" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+ <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignAi"
+ latin:keyHintLabel="2"
+ latin:additionalMoreKeys="२,2" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+ <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignAa"
+ latin:keyHintLabel="3"
+ latin:additionalMoreKeys="३,3" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+ <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignIi"
+ latin:keyHintLabel="4"
+ latin:additionalMoreKeys="४,4" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+ <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignUu"
+ latin:keyHintLabel="5"
+ latin:additionalMoreKeys="५,5" />
+ <!-- U+092C: "ब" DEVANAGARI LETTER BA
+ U+092D: "भ" DEVANAGARI LETTER BHA
+ U+096C: "६" DEVANAGARI DIGIT SIX -->
+ <Key
+ latin:keySpec="ब"
+ latin:moreKeys="भ,%"
+ latin:keyHintLabel="6"
+ latin:additionalMoreKeys="६,6"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0939: "ह" DEVANAGARI LETTER HA
+ U+096D: "७" DEVANAGARI DIGIT SEVEN -->
+ <Key
+ latin:keySpec="ह"
+ latin:keyHintLabel="7"
+ latin:additionalMoreKeys="७,7"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0917: "ग" DEVANAGARI LETTER GA
+ U+0918: "घ" DEVANAGARI LETTER GHA
+ U+096E: "८" DEVANAGARI DIGIT EIGHT -->
+ <Key
+ latin:keySpec="ग"
+ latin:moreKeys="घ,%"
+ latin:keyHintLabel="8"
+ latin:additionalMoreKeys="८,8"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0926: "द" DEVANAGARI LETTER DA
+ U+0927: "ध" DEVANAGARI LETTER DHA
+ U+096F: "९" DEVANAGARI DIGIT NINE -->
+ <Key
+ latin:keySpec="द"
+ latin:moreKeys="ध,%"
+ latin:keyHintLabel="9"
+ latin:additionalMoreKeys="९,9"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+091C: "ज" DEVANAGARI LETTER JA
+ U+091D: "झ" DEVANAGARI LETTER JHA
+ U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER JHA -->
+ <Key
+ latin:keySpec="ज"
+ latin:moreKeys="झ,ज्ञ,%"
+ latin:keyHintLabel="0"
+ latin:additionalMoreKeys="०,0"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0921: "ड" DEVANAGARI LETTER DDA
+ U+0922: "ढ" DEVANAGARI LETTER DDHA -->
+ <Key
+ latin:keySpec="ड"
+ latin:moreKeys="ढ"
+ latin:keyLabelFlags="fontNormal" />
+</merge>
diff --git a/java/res/xml/rowkeys_marathi2.xml b/java/res/xml/rowkeys_marathi2.xml
new file mode 100644
index 0000000..f950915
--- /dev/null
+++ b/java/res/xml/rowkeys_marathi2.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignO" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignE" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignVirama" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignI" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignU" />
+ <!-- U+092A: "प" DEVANAGARI LETTER PA
+ U+092B: "फ" DEVANAGARI LETTER PHA -->
+ <Key
+ latin:keySpec="प"
+ latin:moreKeys="फ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+ <!-- U+0930: "र" DEVANAGARI LETTER RA -->
+ <Key
+ latin:keySpec="र"
+ latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0915: "क" DEVANAGARI LETTER KA
+ U+0916: "ख" DEVANAGARI LETTER KHA -->
+ <Key
+ latin:keySpec="क"
+ latin:moreKeys="ख"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0924: "त" DEVANAGARI LETTER TA
+ U+0925: "थ" DEVANAGARI LETTER THA
+ U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
+ <Key
+ latin:keySpec="त"
+ latin:moreKeys="थ,त्र"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+091A: "च" DEVANAGARI LETTER CA
+ U+091B: "छ" DEVANAGARI LETTER CHA -->
+ <Key
+ latin:keySpec="च"
+ latin:moreKeys="छ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+091F: "ट" DEVANAGARI LETTER TTA
+ U+0920: "ठ" DEVANAGARI LETTER TTHA -->
+ <Key
+ latin:keySpec="ट"
+ latin:moreKeys="ठ"
+ latin:keyLabelFlags="fontNormal" />
+</merge>
diff --git a/java/res/xml/rowkeys_marathi3.xml b/java/res/xml/rowkeys_marathi3.xml
new file mode 100644
index 0000000..17fc5ac
--- /dev/null
+++ b/java/res/xml/rowkeys_marathi3.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariVowelSignCandraE" />
+ <!-- Because the font rendering system prior to API version 16 can't automatically
+ render dotted circle for incomplete combining letter of some scripts, different
+ set of Key definitions are needed based on the API version. -->
+ <include
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key
+ latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+ <!-- U+092E: "म" DEVANAGARI LETTER MA -->
+ <Key
+ latin:keySpec="म"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0928: "न" DEVANAGARI LETTER NA
+ U+0923: "ण" DEVANAGARI LETTER NNA
+ U+091E: "ञ" DEVANAGARI LETTER NYA
+ U+0919: "ङ" DEVANAGARI LETTER NGA -->
+ <Key
+ latin:keySpec="न"
+ latin:moreKeys="ण,ञ,ङ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0935: "व" DEVANAGARI LETTER VA -->
+ <Key
+ latin:keySpec="व"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0932: "ल" DEVANAGARI LETTER LA
+ U+0933: "ळ" DEVANAGARI LETTER LLA -->
+ <Key
+ latin:keySpec="ल"
+ latin:moreKeys="ळ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0938: "स" DEVANAGARI LETTER SA
+ U+0936: "श" DEVANAGARI LETTER SHA
+ U+0937: "ष" DEVANAGARI LETTER SSA
+ U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
+ <Key
+ latin:keySpec="स"
+ latin:moreKeys="श,ष,श्र"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+092F: "य" DEVANAGARI LETTER YA -->
+ <Key
+ latin:keySpec="य"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA -->
+ <Key
+ latin:keySpec="क्ष"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+</merge>
diff --git a/java/res/xml/rows_marathi.xml b/java/res/xml/rows_marathi.xml
new file mode 100644
index 0000000..42a0363
--- /dev/null
+++ b/java/res/xml/rows_marathi.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/key_styles_common" />
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_marathi1" />
+ </Row>
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_marathi2" />
+ </Row>
+ <Row
+ latin:keyWidth="9.091%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/rowkeys_marathi3" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
index 14fa767..0f9645e 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -95,18 +95,18 @@
/* 5:23 */ "morekeys_c",
/* 6:23 */ "double_quotes",
/* 7:22 */ "morekeys_n",
- /* 8:22 */ "single_quotes",
- /* 9:21 */ "keylabel_to_alpha",
+ /* 8:22 */ "keylabel_to_alpha",
+ /* 9:22 */ "single_quotes",
/* 10:20 */ "morekeys_s",
/* 11:14 */ "morekeys_y",
/* 12:13 */ "morekeys_d",
/* 13:12 */ "morekeys_z",
/* 14:10 */ "morekeys_t",
/* 15:10 */ "morekeys_l",
- /* 16: 9 */ "morekeys_g",
- /* 17: 9 */ "single_angle_quotes",
- /* 18: 9 */ "double_angle_quotes",
- /* 19: 9 */ "keyspec_currency",
+ /* 16:10 */ "keyspec_currency",
+ /* 17: 9 */ "morekeys_g",
+ /* 18: 9 */ "single_angle_quotes",
+ /* 19: 9 */ "double_angle_quotes",
/* 20: 8 */ "morekeys_r",
/* 21: 6 */ "morekeys_k",
/* 22: 6 */ "morekeys_cyrillic_ie",
@@ -119,29 +119,29 @@
/* 29: 5 */ "keyspec_east_slavic_row2_11",
/* 30: 5 */ "keyspec_east_slavic_row3_5",
/* 31: 5 */ "morekeys_cyrillic_soft_sign",
- /* 32: 4 */ "morekeys_nordic_row2_11",
- /* 33: 4 */ "morekeys_punctuation",
- /* 34: 4 */ "keyspec_symbols_1",
- /* 35: 4 */ "keyspec_symbols_2",
- /* 36: 4 */ "keyspec_symbols_3",
- /* 37: 4 */ "keyspec_symbols_4",
- /* 38: 4 */ "keyspec_symbols_5",
- /* 39: 4 */ "keyspec_symbols_6",
- /* 40: 4 */ "keyspec_symbols_7",
- /* 41: 4 */ "keyspec_symbols_8",
- /* 42: 4 */ "keyspec_symbols_9",
- /* 43: 4 */ "keyspec_symbols_0",
- /* 44: 4 */ "keylabel_to_symbol",
- /* 45: 4 */ "additional_morekeys_symbols_1",
- /* 46: 4 */ "additional_morekeys_symbols_2",
- /* 47: 4 */ "additional_morekeys_symbols_3",
- /* 48: 4 */ "additional_morekeys_symbols_4",
- /* 49: 4 */ "additional_morekeys_symbols_5",
- /* 50: 4 */ "additional_morekeys_symbols_6",
- /* 51: 4 */ "additional_morekeys_symbols_7",
- /* 52: 4 */ "additional_morekeys_symbols_8",
- /* 53: 4 */ "additional_morekeys_symbols_9",
- /* 54: 4 */ "additional_morekeys_symbols_0",
+ /* 32: 5 */ "keyspec_symbols_1",
+ /* 33: 5 */ "keyspec_symbols_2",
+ /* 34: 5 */ "keyspec_symbols_3",
+ /* 35: 5 */ "keyspec_symbols_4",
+ /* 36: 5 */ "keyspec_symbols_5",
+ /* 37: 5 */ "keyspec_symbols_6",
+ /* 38: 5 */ "keyspec_symbols_7",
+ /* 39: 5 */ "keyspec_symbols_8",
+ /* 40: 5 */ "keyspec_symbols_9",
+ /* 41: 5 */ "keyspec_symbols_0",
+ /* 42: 5 */ "keylabel_to_symbol",
+ /* 43: 5 */ "additional_morekeys_symbols_1",
+ /* 44: 5 */ "additional_morekeys_symbols_2",
+ /* 45: 5 */ "additional_morekeys_symbols_3",
+ /* 46: 5 */ "additional_morekeys_symbols_4",
+ /* 47: 5 */ "additional_morekeys_symbols_5",
+ /* 48: 5 */ "additional_morekeys_symbols_6",
+ /* 49: 5 */ "additional_morekeys_symbols_7",
+ /* 50: 5 */ "additional_morekeys_symbols_8",
+ /* 51: 5 */ "additional_morekeys_symbols_9",
+ /* 52: 5 */ "additional_morekeys_symbols_0",
+ /* 53: 4 */ "morekeys_nordic_row2_11",
+ /* 54: 4 */ "morekeys_punctuation",
/* 55: 4 */ "keyspec_tablet_comma",
/* 56: 3 */ "keyspec_swiss_row1_11",
/* 57: 3 */ "keyspec_swiss_row2_10",
@@ -266,19 +266,19 @@
/* ~ morekeys_c */
/* double_quotes */ "!text/double_lqm_rqm",
/* morekeys_n */ EMPTY,
- /* single_quotes */ "!text/single_lqm_rqm",
// Label for "switch to alphabetic" key.
/* keylabel_to_alpha */ "ABC",
+ /* single_quotes */ "!text/single_lqm_rqm",
/* morekeys_s ~ */
- EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
- /* ~ morekeys_g */
+ EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
+ /* ~ morekeys_l */
+ /* keyspec_currency */ "$",
+ /* morekeys_g */ EMPTY,
/* single_angle_quotes */ "!text/single_laqm_raqm",
/* double_angle_quotes */ "!text/double_laqm_raqm",
- /* keyspec_currency */ "$",
/* morekeys_r ~ */
- EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
- /* ~ morekeys_nordic_row2_11 */
- /* morekeys_punctuation */ "!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&",
+ EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
+ /* ~ morekeys_cyrillic_soft_sign */
/* keyspec_symbols_1 */ "1",
/* keyspec_symbols_2 */ "2",
/* keyspec_symbols_3 */ "3",
@@ -292,8 +292,9 @@
// Label for "switch to symbols" key.
/* keylabel_to_symbol */ "?123",
/* additional_morekeys_symbols_1 ~ */
- EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
- /* ~ additional_morekeys_symbols_0 */
+ EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
+ /* ~ morekeys_nordic_row2_11 */
+ /* morekeys_punctuation */ "!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&",
/* keyspec_tablet_comma */ ",",
/* keyspec_swiss_row1_11 ~ */
EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
@@ -515,7 +516,7 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u00F1,\u0144",
- /* single_quotes ~ */
+ /* keylabel_to_alpha ~ */
null, null, null,
/* ~ morekeys_s */
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
@@ -526,18 +527,18 @@
/* Locale ar: Arabic */
private static final String[] TEXTS_ar = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
// U+200C: ZERO WIDTH NON-JOINER
// U+0628: "ب" ARABIC LETTER BEH
// U+062C: "ج" ARABIC LETTER JEEM
/* keylabel_to_alpha */ "\u0623\u200C\u0628\u200C\u062C",
- /* morekeys_s ~ */
+ /* single_quotes ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null, null, null, null,
- /* ~ morekeys_punctuation */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_cyrillic_soft_sign */
// U+0661: "١" ARABIC-INDIC DIGIT ONE
/* keyspec_symbols_1 */ "\u0661",
// U+0662: "٢" ARABIC-INDIC DIGIT TWO
@@ -573,6 +574,8 @@
// U+066B: "٫" ARABIC DECIMAL SEPARATOR
// U+066C: "٬" ARABIC THOUSANDS SEPARATOR
/* additional_morekeys_symbols_0 */ "0,\u066B,\u066C",
+ /* morekeys_nordic_row2_11 */ null,
+ /* morekeys_punctuation */ null,
// U+061F: "؟" ARABIC QUESTION MARK
// U+060C: "،" ARABIC COMMA
// U+061B: "؛" ARABIC SEMICOLON
@@ -688,15 +691,15 @@
/* morekeys_c */ "\u00E7,\u0107,\u010D",
/* double_quotes ~ */
null, null, null, null,
- /* ~ keylabel_to_alpha */
+ /* ~ single_quotes */
// U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
/* morekeys_s */ "\u015F,\u00DF,\u015B,\u0161",
/* morekeys_y ~ */
- null, null, null, null, null,
- /* ~ morekeys_l */
+ null, null, null, null, null, null,
+ /* ~ keyspec_currency */
// U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
/* morekeys_g */ "\u011F",
};
@@ -708,12 +711,12 @@
/* ~ morekeys_c */
/* double_quotes */ "!text/double_9qm_lqm",
/* morekeys_n */ null,
- /* single_quotes */ "!text/single_9qm_lqm",
// Label for "switch to alphabetic" key.
// U+0410: "А" CYRILLIC CAPITAL LETTER A
// U+0411: "Б" CYRILLIC CAPITAL LETTER BE
// U+0412: "В" CYRILLIC CAPITAL LETTER VE
/* keylabel_to_alpha */ "\u0410\u0411\u0412",
+ /* single_quotes */ "!text/single_9qm_lqm",
/* morekeys_s ~ */
null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_k */
@@ -742,7 +745,6 @@
// single_quotes of Bulgarian is default single_quotes_right_left.
/* double_quotes */ "!text/double_9qm_lqm",
/* morekeys_n */ null,
- /* single_quotes */ null,
// Label for "switch to alphabetic" key.
// U+0410: "А" CYRILLIC CAPITAL LETTER A
// U+0411: "Б" CYRILLIC CAPITAL LETTER BE
@@ -802,23 +804,23 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u00F1,\u0144",
- /* single_quotes ~ */
+ /* keylabel_to_alpha ~ */
null, null, null, null, null, null, null,
/* ~ morekeys_t */
// U+00B7: "·" MIDDLE DOT
// U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
/* morekeys_l */ "l\u00B7l,\u0142",
- /* morekeys_g ~ */
+ /* keyspec_currency ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null,
/* ~ morekeys_nordic_row2_11 */
// U+00B7: "·" MIDDLE DOT
/* morekeys_punctuation */ "!autoColumnOrder!9,\\,,?,!,\u00B7,#,),(,/,;,',@,:,-,\",+,\\%,&",
- /* keyspec_symbols_1 ~ */
+ /* keyspec_tablet_comma ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null,
/* ~ keyspec_south_slavic_row3_8 */
/* morekeys_tablet_punctuation */ "!autoColumnOrder!8,\\,,',\u00B7,#,),(,/,;,@,:,-,\",+,\\%,&",
// U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
@@ -877,8 +879,8 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u0148,\u00F1,\u0144",
- /* single_quotes */ "!text/single_9qm_lqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_lqm",
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@@ -894,11 +896,11 @@
/* morekeys_z */ "\u017E,\u017A,\u017C",
// U+0165: "ť" LATIN SMALL LETTER T WITH CARON
/* morekeys_t */ "\u0165",
- /* morekeys_l */ null,
- /* morekeys_g */ null,
+ /* morekeys_l ~ */
+ null, null, null,
+ /* ~ morekeys_g */
/* single_angle_quotes */ "!text/single_raqm_laqm",
/* double_angle_quotes */ "!text/double_raqm_laqm",
- /* keyspec_currency */ null,
// U+0159: "ř" LATIN SMALL LETTER R WITH CARON
/* morekeys_r */ "\u0159",
};
@@ -936,8 +938,8 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u00F1,\u0144",
- /* single_quotes */ "!text/single_9qm_lqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_lqm",
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
@@ -951,11 +953,12 @@
/* morekeys_t */ null,
// U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
/* morekeys_l */ "\u0142",
+ /* keyspec_currency */ null,
/* morekeys_g */ null,
/* single_angle_quotes */ "!text/single_raqm_laqm",
/* double_angle_quotes */ "!text/double_raqm_laqm",
- /* keyspec_currency ~ */
- null, null, null, null,
+ /* morekeys_r ~ */
+ null, null, null,
/* ~ morekeys_cyrillic_ie */
// U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
/* keyspec_nordic_row1_11 */ "\u00E5",
@@ -966,8 +969,9 @@
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
/* morekeys_nordic_row2_10 */ "\u00E4",
/* keyspec_east_slavic_row1_9 ~ */
- null, null, null, null, null,
- /* ~ morekeys_cyrillic_soft_sign */
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null,
+ /* ~ additional_morekeys_symbols_0 */
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
/* morekeys_nordic_row2_11 */ "\u00F6",
};
@@ -1010,21 +1014,21 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u00F1,\u0144",
- /* single_quotes */ "!text/single_9qm_lqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_lqm",
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
/* morekeys_s */ "\u00DF,\u015B,\u0161",
/* morekeys_y ~ */
- null, null, null, null, null, null,
+ null, null, null, null, null, null, null,
/* ~ morekeys_g */
/* single_angle_quotes */ "!text/single_raqm_laqm",
/* double_angle_quotes */ "!text/double_raqm_laqm",
- /* keyspec_currency ~ */
+ /* morekeys_r ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null, null,
+ null, null, null, null, null, null,
/* ~ keyspec_tablet_comma */
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
/* keyspec_swiss_row1_11 */ "\u00FC",
@@ -1043,8 +1047,8 @@
/* Locale el: Greek */
private static final String[] TEXTS_el = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0391: "Α" GREEK CAPITAL LETTER ALPHA
// U+0392: "Β" GREEK CAPITAL LETTER BETA
@@ -1095,8 +1099,8 @@
/* double_quotes */ null,
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
/* morekeys_n */ "\u00F1",
- /* single_quotes */ null,
/* keylabel_to_alpha */ null,
+ /* single_quotes */ null,
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
/* morekeys_s */ "\u00DF",
};
@@ -1169,8 +1173,8 @@
// U+0149: "ʼn" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
// U+014B: "ŋ" LATIN SMALL LETTER ENG
/* morekeys_n */ "\u00F1,\u0144,\u0146,\u0148,\u0149,\u014B",
- /* single_quotes */ null,
/* keylabel_to_alpha */ null,
+ /* single_quotes */ null,
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@@ -1201,13 +1205,13 @@
// U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT
// U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
/* morekeys_l */ "\u013A,\u013C,\u013E,\u0140,\u0142",
+ /* keyspec_currency */ null,
// U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
// U+0121: "ġ" LATIN SMALL LETTER G WITH DOT ABOVE
// U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
/* morekeys_g */ "\u011F,\u0121,\u0123",
- /* single_angle_quotes ~ */
- null, null, null,
- /* ~ keyspec_currency */
+ /* single_angle_quotes */ null,
+ /* double_angle_quotes */ null,
// U+0159: "ř" LATIN SMALL LETTER R WITH CARON
// U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
// U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
@@ -1301,9 +1305,11 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u00F1,\u0144",
- /* single_quotes ~ */
+ /* keylabel_to_alpha ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null,
/* ~ morekeys_nordic_row2_11 */
// U+00A1: "¡" INVERTED EXCLAMATION MARK
// U+00BF: "¿" INVERTED QUESTION MARK
@@ -1366,8 +1372,8 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u0146,\u00F1,\u0144",
- /* single_quotes */ "!text/single_9qm_lqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_lqm",
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@@ -1390,12 +1396,12 @@
// U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
// U+013E: "ľ" LATIN SMALL LETTER L WITH CARON
/* morekeys_l */ "\u013C,\u0142,\u013A,\u013E",
+ /* keyspec_currency */ null,
// U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
// U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
/* morekeys_g */ "\u0123,\u011F",
- /* single_angle_quotes ~ */
- null, null, null,
- /* ~ keyspec_currency */
+ /* single_angle_quotes */ null,
+ /* double_angle_quotes */ null,
// U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
// U+0159: "ř" LATIN SMALL LETTER R WITH CARON
// U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
@@ -1470,22 +1476,22 @@
/* Locale fa: Persian */
private static final String[] TEXTS_fa = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0627: "ا" ARABIC LETTER ALEF
// U+200C: ZERO WIDTH NON-JOINER
// U+0628: "ب" ARABIC LETTER BEH
// U+067E: "پ" ARABIC LETTER PEH
/* keylabel_to_alpha */ "\u0627\u200C\u0628\u200C\u067E",
- /* morekeys_s ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ double_angle_quotes */
+ /* single_quotes ~ */
+ null, null, null, null, null, null, null,
+ /* ~ morekeys_l */
// U+FDFC: "﷼" RIAL SIGN
/* keyspec_currency */ "\uFDFC",
- /* morekeys_r ~ */
- null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- /* ~ morekeys_punctuation */
+ /* morekeys_g ~ */
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ /* ~ morekeys_cyrillic_soft_sign */
// U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE
/* keyspec_symbols_1 */ "\u06F1",
// U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO
@@ -1521,6 +1527,8 @@
// U+066B: "٫" ARABIC DECIMAL SEPARATOR
// U+066C: "٬" ARABIC THOUSANDS SEPARATOR
/* additional_morekeys_symbols_0 */ "0,\u066B,\u066C",
+ /* morekeys_nordic_row2_11 */ null,
+ /* morekeys_punctuation */ null,
// U+060C: "،" ARABIC COMMA
// U+061B: "؛" ARABIC SEMICOLON
// U+061F: "؟" ARABIC QUESTION MARK
@@ -1629,7 +1637,7 @@
/* morekeys_u */ "\u00FC",
/* morekeys_e ~ */
null, null, null, null, null, null, null,
- /* ~ keylabel_to_alpha */
+ /* ~ single_quotes */
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@@ -1652,8 +1660,9 @@
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
/* morekeys_nordic_row2_10 */ "\u00F8",
/* keyspec_east_slavic_row1_9 ~ */
- null, null, null, null, null,
- /* ~ morekeys_cyrillic_soft_sign */
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null,
+ /* ~ additional_morekeys_symbols_0 */
// U+00E6: "æ" LATIN SMALL LETTER AE
/* morekeys_nordic_row2_11 */ "\u00E6",
};
@@ -1786,21 +1795,21 @@
/* Locale hi: Hindi */
private static final String[] TEXTS_hi = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0915: "क" DEVANAGARI LETTER KA
// U+0916: "ख" DEVANAGARI LETTER KHA
// U+0917: "ग" DEVANAGARI LETTER GA
/* keylabel_to_alpha */ "\u0915\u0916\u0917",
- /* morekeys_s ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ double_angle_quotes */
+ /* single_quotes ~ */
+ null, null, null, null, null, null, null,
+ /* ~ morekeys_l */
// U+20B9: "₹" INDIAN RUPEE SIGN
/* keyspec_currency */ "\u20B9",
- /* morekeys_r ~ */
- null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- /* ~ morekeys_punctuation */
+ /* morekeys_g ~ */
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ /* ~ morekeys_cyrillic_soft_sign */
// U+0967: "१" DEVANAGARI DIGIT ONE
/* keyspec_symbols_1 */ "\u0967",
// U+0968: "२" DEVANAGARI DIGIT TWO
@@ -1848,8 +1857,8 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u00F1,\u0144",
- /* single_quotes */ "!text/single_9qm_rqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_rqm",
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
@@ -1862,7 +1871,7 @@
// U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
/* morekeys_z */ "\u017E,\u017A,\u017C",
/* morekeys_t ~ */
- null, null, null,
+ null, null, null, null,
/* ~ morekeys_g */
/* single_angle_quotes */ "!text/single_raqm_laqm",
/* double_angle_quotes */ "!text/double_raqm_laqm",
@@ -1914,8 +1923,9 @@
/* morekeys_c */ null,
/* double_quotes */ "!text/double_9qm_rqm",
/* morekeys_n */ null,
+ /* keylabel_to_alpha */ null,
/* single_quotes */ "!text/single_9qm_rqm",
- /* keylabel_to_alpha ~ */
+ /* morekeys_s ~ */
null, null, null, null, null, null, null, null,
/* ~ morekeys_g */
/* single_angle_quotes */ "!text/single_raqm_laqm",
@@ -1925,16 +1935,17 @@
/* Locale hy_AM: Armenian (Armenia) */
private static final String[] TEXTS_hy_AM = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0531: "Ա" ARMENIAN CAPITAL LETTER AYB
// U+0532: "Բ" ARMENIAN CAPITAL LETTER BEN
// U+0533: "Գ" ARMENIAN CAPITAL LETTER GIM
/* keylabel_to_alpha */ "\u0531\u0532\u0533",
- /* morekeys_s ~ */
+ /* single_quotes ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_nordic_row2_11 */
// U+055E: "՞" ARMENIAN QUESTION MARK
// U+055C: "՜" ARMENIAN EXCLAMATION MARK
@@ -1947,10 +1958,6 @@
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+055F: "՟" ARMENIAN ABBREVIATION MARK
/* morekeys_punctuation */ "!autoColumnOrder!8,\\,,\u055E,\u055C,.,\u055A,\u0559,?,!,\u055D,\u055B,\u058A,\u00BB,\u00AB,\u055F,;,:",
- /* keyspec_symbols_1 ~ */
- null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null,
- /* ~ additional_morekeys_symbols_0 */
// U+058F: "֏" ARMENIAN DRAM SIGN
// TODO: Enable this when we have glyph for the following letter
// <string name="keyspec_currency">֏</string>
@@ -2026,8 +2033,8 @@
/* morekeys_c */ null,
/* double_quotes */ "!text/double_9qm_lqm",
/* morekeys_n */ null,
- /* single_quotes */ "!text/single_9qm_lqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_lqm",
/* morekeys_s */ null,
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
@@ -2109,21 +2116,21 @@
/* ~ morekeys_c */
/* double_quotes */ "!text/double_rqm_9qm",
/* morekeys_n */ null,
- /* single_quotes */ "!text/single_rqm_9qm",
// Label for "switch to alphabetic" key.
// U+05D0: "א" HEBREW LETTER ALEF
// U+05D1: "ב" HEBREW LETTER BET
// U+05D2: "ג" HEBREW LETTER GIMEL
/* keylabel_to_alpha */ "\u05D0\u05D1\u05D2",
+ /* single_quotes */ "!text/single_rqm_9qm",
/* morekeys_s ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ double_angle_quotes */
+ null, null, null, null, null, null,
+ /* ~ morekeys_l */
// U+20AA: "₪" NEW SHEQEL SIGN
/* keyspec_currency */ "\u20AA",
- /* morekeys_r ~ */
+ /* morekeys_g ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_swiss_row2_11 */
// U+2605: "★" BLACK STAR
/* morekeys_star */ "\u2605",
@@ -2166,26 +2173,26 @@
/* ~ morekeys_c */
/* double_quotes */ "!text/double_9qm_lqm",
/* morekeys_n */ null,
- /* single_quotes */ "!text/single_9qm_lqm",
// Label for "switch to alphabetic" key.
// U+10D0: "ა" GEORGIAN LETTER AN
// U+10D1: "ბ" GEORGIAN LETTER BAN
// U+10D2: "გ" GEORGIAN LETTER GAN
/* keylabel_to_alpha */ "\u10D0\u10D1\u10D2",
+ /* single_quotes */ "!text/single_9qm_lqm",
};
/* Locale kk: Kazakh */
private static final String[] TEXTS_kk = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0410: "А" CYRILLIC CAPITAL LETTER A
// U+0411: "Б" CYRILLIC CAPITAL LETTER BE
// U+0412: "В" CYRILLIC CAPITAL LETTER VE
/* keylabel_to_alpha */ "\u0410\u0411\u0412",
- /* morekeys_s ~ */
- null, null, null, null, null, null, null, null, null, null, null, null,
+ /* single_quotes ~ */
+ null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_k */
// U+0451: "ё" CYRILLIC SMALL LETTER IO
/* morekeys_cyrillic_ie */ "\u0451",
@@ -2202,7 +2209,7 @@
/* keyspec_east_slavic_row3_5 */ "\u0438",
// U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN
/* morekeys_cyrillic_soft_sign */ "\u044A",
- /* morekeys_nordic_row2_11 ~ */
+ /* keyspec_symbols_1 ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
@@ -2234,14 +2241,14 @@
/* Locale km_KH: Khmer (Cambodia) */
private static final String[] TEXTS_km_KH = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+1780: "ក" KHMER LETTER KA
// U+1781: "ខ" KHMER LETTER KHA
// U+1782: "គ" KHMER LETTER KO
/* keylabel_to_alpha */ "\u1780\u1781\u1782",
- /* morekeys_s ~ */
+ /* single_quotes ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
@@ -2249,7 +2256,7 @@
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null,
+ null, null, null, null, null, null, null,
/* ~ morekeys_cyrillic_a */
// U+17DB: "៛" KHMER CURRENCY SYMBOL RIEL
/* morekeys_currency_dollar */ "\u17DB,\u00A2,\u00A3,\u20AC,\u00A5,\u20B1",
@@ -2258,15 +2265,15 @@
/* Locale ky: Kirghiz */
private static final String[] TEXTS_ky = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0410: "А" CYRILLIC CAPITAL LETTER A
// U+0411: "Б" CYRILLIC CAPITAL LETTER BE
// U+0412: "В" CYRILLIC CAPITAL LETTER VE
/* keylabel_to_alpha */ "\u0410\u0411\u0412",
- /* morekeys_s ~ */
- null, null, null, null, null, null, null, null, null, null, null, null,
+ /* single_quotes ~ */
+ null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_k */
// U+0451: "ё" CYRILLIC SMALL LETTER IO
/* morekeys_cyrillic_ie */ "\u0451",
@@ -2283,7 +2290,7 @@
/* keyspec_east_slavic_row3_5 */ "\u0438",
// U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN
/* morekeys_cyrillic_soft_sign */ "\u044A",
- /* morekeys_nordic_row2_11 ~ */
+ /* keyspec_symbols_1 ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
@@ -2301,16 +2308,16 @@
/* Locale lo_LA: Lao (Laos) */
private static final String[] TEXTS_lo_LA = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0E81: "ກ" LAO LETTER KO
// U+0E82: "ຂ" LAO LETTER KHO SUNG
// U+0E84: "ຄ" LAO LETTER KHO TAM
/* keylabel_to_alpha */ "\u0E81\u0E82\u0E84",
- /* morekeys_s ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ double_angle_quotes */
+ /* single_quotes ~ */
+ null, null, null, null, null, null, null,
+ /* ~ morekeys_l */
// U+20AD: "₭" KIP SIGN
/* keyspec_currency */ "\u20AD",
};
@@ -2372,8 +2379,8 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u0146,\u00F1,\u0144",
- /* single_quotes */ "!text/single_9qm_lqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_lqm",
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@@ -2396,12 +2403,12 @@
// U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
// U+013E: "ľ" LATIN SMALL LETTER L WITH CARON
/* morekeys_l */ "\u013C,\u0142,\u013A,\u013E",
+ /* keyspec_currency */ null,
// U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
// U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
/* morekeys_g */ "\u0123,\u011F",
- /* single_angle_quotes ~ */
- null, null, null,
- /* ~ keyspec_currency */
+ /* single_angle_quotes */ null,
+ /* double_angle_quotes */ null,
// U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
// U+0159: "ř" LATIN SMALL LETTER R WITH CARON
// U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
@@ -2466,8 +2473,8 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u0146,\u00F1,\u0144",
- /* single_quotes */ "!text/single_9qm_lqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_lqm",
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@@ -2490,12 +2497,12 @@
// U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
// U+013E: "ľ" LATIN SMALL LETTER L WITH CARON
/* morekeys_l */ "\u013C,\u0142,\u013A,\u013E",
+ /* keyspec_currency */ null,
// U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
// U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
/* morekeys_g */ "\u0123,\u011F",
- /* single_angle_quotes ~ */
- null, null, null,
- /* ~ keyspec_currency */
+ /* single_angle_quotes */ null,
+ /* double_angle_quotes */ null,
// U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
// U+0159: "ř" LATIN SMALL LETTER R WITH CARON
// U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
@@ -2511,12 +2518,12 @@
/* ~ morekeys_c */
/* double_quotes */ "!text/double_9qm_lqm",
/* morekeys_n */ null,
- /* single_quotes */ "!text/single_9qm_lqm",
// Label for "switch to alphabetic" key.
// U+0410: "А" CYRILLIC CAPITAL LETTER A
// U+0411: "Б" CYRILLIC CAPITAL LETTER BE
// U+0412: "В" CYRILLIC CAPITAL LETTER VE
/* keylabel_to_alpha */ "\u0410\u0411\u0412",
+ /* single_quotes */ "!text/single_9qm_lqm",
/* morekeys_s ~ */
null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_k */
@@ -2544,39 +2551,88 @@
/* Locale mn_MN: Mongolian (Mongolia) */
private static final String[] TEXTS_mn_MN = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0410: "А" CYRILLIC CAPITAL LETTER A
// U+0411: "Б" CYRILLIC CAPITAL LETTER BE
// U+0412: "В" CYRILLIC CAPITAL LETTER VE
/* keylabel_to_alpha */ "\u0410\u0411\u0412",
- /* morekeys_s ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ double_angle_quotes */
+ /* single_quotes ~ */
+ null, null, null, null, null, null, null,
+ /* ~ morekeys_l */
// U+20AE: "₮" TUGRIK SIGN
/* keyspec_currency */ "\u20AE",
};
+ /* Locale mr_IN: Marathi (India) */
+ private static final String[] TEXTS_mr_IN = {
+ /* morekeys_a ~ */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
+ // Label for "switch to alphabetic" key.
+ // U+0915: "क" DEVANAGARI LETTER KA
+ // U+0916: "ख" DEVANAGARI LETTER KHA
+ // U+0917: "ग" DEVANAGARI LETTER GA
+ /* keylabel_to_alpha */ "\u0915\u0916\u0917",
+ /* single_quotes ~ */
+ null, null, null, null, null, null, null,
+ /* ~ morekeys_l */
+ // U+20B9: "₹" INDIAN RUPEE SIGN
+ /* keyspec_currency */ "\u20B9",
+ /* morekeys_g ~ */
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ /* ~ morekeys_cyrillic_soft_sign */
+ // U+0967: "१" DEVANAGARI DIGIT ONE
+ /* keyspec_symbols_1 */ "\u0967",
+ // U+0968: "२" DEVANAGARI DIGIT TWO
+ /* keyspec_symbols_2 */ "\u0968",
+ // U+0969: "३" DEVANAGARI DIGIT THREE
+ /* keyspec_symbols_3 */ "\u0969",
+ // U+096A: "४" DEVANAGARI DIGIT FOUR
+ /* keyspec_symbols_4 */ "\u096A",
+ // U+096B: "५" DEVANAGARI DIGIT FIVE
+ /* keyspec_symbols_5 */ "\u096B",
+ // U+096C: "६" DEVANAGARI DIGIT SIX
+ /* keyspec_symbols_6 */ "\u096C",
+ // U+096D: "७" DEVANAGARI DIGIT SEVEN
+ /* keyspec_symbols_7 */ "\u096D",
+ // U+096E: "८" DEVANAGARI DIGIT EIGHT
+ /* keyspec_symbols_8 */ "\u096E",
+ // U+096F: "९" DEVANAGARI DIGIT NINE
+ /* keyspec_symbols_9 */ "\u096F",
+ // U+0966: "०" DEVANAGARI DIGIT ZERO
+ /* keyspec_symbols_0 */ "\u0966",
+ // Label for "switch to symbols" key.
+ /* keylabel_to_symbol */ "?\u0967\u0968\u0969",
+ /* additional_morekeys_symbols_1 */ "1",
+ /* additional_morekeys_symbols_2 */ "2",
+ /* additional_morekeys_symbols_3 */ "3",
+ /* additional_morekeys_symbols_4 */ "4",
+ /* additional_morekeys_symbols_5 */ "5",
+ /* additional_morekeys_symbols_6 */ "6",
+ /* additional_morekeys_symbols_7 */ "7",
+ /* additional_morekeys_symbols_8 */ "8",
+ /* additional_morekeys_symbols_9 */ "9",
+ /* additional_morekeys_symbols_0 */ "0",
+ };
+
/* Locale my_MM: Burmese (Myanmar) */
private static final String[] TEXTS_my_MM = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+1000: "က" MYANMAR LETTER KA
// U+1001: "ခ" MYANMAR LETTER KHA
// U+1002: "ဂ" MYANMAR LETTER GA
/* keylabel_to_alpha */ "\u1000\u1001\u1002",
- /* morekeys_s ~ */
+ /* single_quotes ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_nordic_row2_11 */
/* morekeys_punctuation */ "!autoColumnOrder!9,\u104A,.,?,!,#,),(,/,;,...,',@,:,-,\",+,\\%,&",
- /* keyspec_symbols_1 ~ */
- null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null,
- /* ~ additional_morekeys_symbols_0 */
// U+104A: "၊" MYANMAR SIGN LITTLE SECTION
// U+104B: "။" MYANMAR SIGN SECTION
/* keyspec_tablet_comma */ "\u104A",
@@ -2633,9 +2689,10 @@
/* morekeys_c */ null,
/* double_quotes */ "!text/double_9qm_rqm",
/* morekeys_n */ null,
+ /* keylabel_to_alpha */ null,
/* single_quotes */ "!text/single_9qm_rqm",
- /* keylabel_to_alpha ~ */
- null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ /* morekeys_s ~ */
+ null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_cyrillic_ie */
// U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
/* keyspec_nordic_row1_11 */ "\u00E5",
@@ -2646,8 +2703,9 @@
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
/* morekeys_nordic_row2_10 */ "\u00F6",
/* keyspec_east_slavic_row1_9 ~ */
- null, null, null, null, null,
- /* ~ morekeys_cyrillic_soft_sign */
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null,
+ /* ~ additional_morekeys_symbols_0 */
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
/* morekeys_nordic_row2_11 */ "\u00E4",
};
@@ -2655,21 +2713,21 @@
/* Locale ne_NP: Nepali (Nepal) */
private static final String[] TEXTS_ne_NP = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0915: "क" DEVANAGARI LETTER KA
// U+0916: "ख" DEVANAGARI LETTER KHA
// U+0917: "ग" DEVANAGARI LETTER GA
/* keylabel_to_alpha */ "\u0915\u0916\u0917",
- /* morekeys_s ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ double_angle_quotes */
+ /* single_quotes ~ */
+ null, null, null, null, null, null, null,
+ /* ~ morekeys_l */
// U+0930/U+0941/U+002E "रु." NEPALESE RUPEE SIGN
/* keyspec_currency */ "\u0930\u0941.",
- /* morekeys_r ~ */
- null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- /* ~ morekeys_punctuation */
+ /* morekeys_g ~ */
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ /* ~ morekeys_cyrillic_soft_sign */
// U+0967: "१" DEVANAGARI DIGIT ONE
/* keyspec_symbols_1 */ "\u0967",
// U+0968: "२" DEVANAGARI DIGIT TWO
@@ -2751,8 +2809,8 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u00F1,\u0144",
- /* single_quotes */ "!text/single_9qm_rqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_rqm",
/* morekeys_s */ null,
// U+0133: "ij" LATIN SMALL LIGATURE IJ
/* morekeys_y */ "\u0133",
@@ -2797,8 +2855,8 @@
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
/* morekeys_n */ "\u0144,\u00F1",
- /* single_quotes */ "!text/single_9qm_rqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_rqm",
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
@@ -2900,8 +2958,8 @@
/* morekeys_c */ null,
/* double_quotes */ "!text/double_9qm_rqm",
/* morekeys_n */ null,
- /* single_quotes */ "!text/single_9qm_rqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_rqm",
// U+0219: "ș" LATIN SMALL LETTER S WITH COMMA BELOW
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@@ -2921,12 +2979,12 @@
/* ~ morekeys_c */
/* double_quotes */ "!text/double_9qm_lqm",
/* morekeys_n */ null,
- /* single_quotes */ "!text/single_9qm_lqm",
// Label for "switch to alphabetic" key.
// U+0410: "А" CYRILLIC CAPITAL LETTER A
// U+0411: "Б" CYRILLIC CAPITAL LETTER BE
// U+0412: "В" CYRILLIC CAPITAL LETTER VE
/* keylabel_to_alpha */ "\u0410\u0411\u0412",
+ /* single_quotes */ "!text/single_9qm_lqm",
/* morekeys_s ~ */
null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_k */
@@ -3004,8 +3062,8 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
/* morekeys_n */ "\u0148,\u0146,\u00F1,\u0144",
- /* single_quotes */ "!text/single_9qm_lqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_lqm",
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@@ -3028,12 +3086,12 @@
// U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
// U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
/* morekeys_l */ "\u013E,\u013A,\u013C,\u0142",
+ /* keyspec_currency */ null,
// U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
// U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
/* morekeys_g */ "\u0123,\u011F",
/* single_angle_quotes */ "!text/single_raqm_laqm",
/* double_angle_quotes */ "!text/double_raqm_laqm",
- /* keyspec_currency */ null,
// U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
// U+0159: "ř" LATIN SMALL LETTER R WITH CARON
// U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
@@ -3052,8 +3110,8 @@
/* morekeys_c */ "\u010D,\u0107",
/* double_quotes */ "!text/double_9qm_lqm",
/* morekeys_n */ null,
- /* single_quotes */ "!text/single_9qm_lqm",
/* keylabel_to_alpha */ null,
+ /* single_quotes */ "!text/single_9qm_lqm",
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
/* morekeys_s */ "\u0161",
/* morekeys_y */ null,
@@ -3062,7 +3120,7 @@
// U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
/* morekeys_z */ "\u017E",
/* morekeys_t ~ */
- null, null, null,
+ null, null, null, null,
/* ~ morekeys_g */
/* single_angle_quotes */ "!text/single_raqm_laqm",
/* double_angle_quotes */ "!text/double_raqm_laqm",
@@ -3075,21 +3133,20 @@
/* ~ morekeys_c */
/* double_quotes */ "!text/double_9qm_lqm",
/* morekeys_n */ null,
- /* single_quotes */ "!text/single_9qm_lqm",
// END: More keys definitions for Serbian (Cyrillic)
// Label for "switch to alphabetic" key.
// U+0410: "А" CYRILLIC CAPITAL LETTER A
// U+0411: "Б" CYRILLIC CAPITAL LETTER BE
// U+0412: "В" CYRILLIC CAPITAL LETTER VE
/* keylabel_to_alpha */ "\u0410\u0411\u0412",
+ /* single_quotes */ "!text/single_9qm_lqm",
/* morekeys_s ~ */
- null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null,
/* ~ morekeys_g */
/* single_angle_quotes */ "!text/single_raqm_laqm",
/* double_angle_quotes */ "!text/double_raqm_laqm",
- /* keyspec_currency ~ */
- null, null, null,
- /* ~ morekeys_k */
+ /* morekeys_r */ null,
+ /* morekeys_k */ null,
// U+0450: "ѐ" CYRILLIC SMALL LETTER IE WITH GRAVE
/* morekeys_cyrillic_ie */ "\u0450",
/* keyspec_nordic_row1_11 ~ */
@@ -3169,8 +3226,8 @@
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0148: "ň" LATIN SMALL LETTER N WITH CARON
/* morekeys_n */ "\u0144,\u00F1,\u0148",
- /* single_quotes */ null,
/* keylabel_to_alpha */ null,
+ /* single_quotes */ null,
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
// U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
@@ -3191,10 +3248,10 @@
/* morekeys_t */ "\u0165,\u00FE",
// U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
/* morekeys_l */ "\u0142",
+ /* keyspec_currency */ null,
/* morekeys_g */ null,
/* single_angle_quotes */ "!text/single_raqm_laqm",
/* double_angle_quotes */ "!text/double_raqm_laqm",
- /* keyspec_currency */ null,
// U+0159: "ř" LATIN SMALL LETTER R WITH CARON
/* morekeys_r */ "\u0159",
/* morekeys_k */ null,
@@ -3209,8 +3266,9 @@
// U+0153: "œ" LATIN SMALL LIGATURE OE
/* morekeys_nordic_row2_10 */ "\u00F8,\u0153",
/* keyspec_east_slavic_row1_9 ~ */
- null, null, null, null, null,
- /* ~ morekeys_cyrillic_soft_sign */
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null, null, null, null, null, null, null, null, null, null, null,
+ /* ~ additional_morekeys_symbols_0 */
// U+00E6: "æ" LATIN SMALL LETTER AE
/* morekeys_nordic_row2_11 */ "\u00E6",
};
@@ -3259,29 +3317,29 @@
/* double_quotes */ null,
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
/* morekeys_n */ "\u00F1",
- /* single_quotes */ null,
/* keylabel_to_alpha */ null,
+ /* single_quotes */ null,
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
/* morekeys_s */ "\u00DF",
/* morekeys_y ~ */
- null, null, null, null, null,
- /* ~ morekeys_l */
+ null, null, null, null, null, null,
+ /* ~ keyspec_currency */
/* morekeys_g */ "g\'",
};
/* Locale th: Thai */
private static final String[] TEXTS_th = {
/* morekeys_a ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ single_quotes */
+ null, null, null, null, null, null, null, null,
+ /* ~ morekeys_n */
// Label for "switch to alphabetic" key.
// U+0E01: "ก" THAI CHARACTER KO KAI
// U+0E02: "ข" THAI CHARACTER KHO KHAI
// U+0E04: "ค" THAI CHARACTER KHO KHWAI
/* keylabel_to_alpha */ "\u0E01\u0E02\u0E04",
- /* morekeys_s ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ double_angle_quotes */
+ /* single_quotes ~ */
+ null, null, null, null, null, null, null,
+ /* ~ morekeys_l */
// U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT
/* keyspec_currency */ "\u0E3F",
};
@@ -3374,15 +3432,15 @@
/* morekeys_c */ "\u00E7,\u0107,\u010D",
/* double_quotes ~ */
null, null, null, null,
- /* ~ keylabel_to_alpha */
+ /* ~ single_quotes */
// U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
/* morekeys_s */ "\u015F,\u00DF,\u015B,\u0161",
/* morekeys_y ~ */
- null, null, null, null, null,
- /* ~ morekeys_l */
+ null, null, null, null, null, null,
+ /* ~ keyspec_currency */
// U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
/* morekeys_g */ "\u011F",
};
@@ -3394,19 +3452,19 @@
/* ~ morekeys_c */
/* double_quotes */ "!text/double_9qm_lqm",
/* morekeys_n */ null,
- /* single_quotes */ "!text/single_9qm_lqm",
// Label for "switch to alphabetic" key.
// U+0410: "А" CYRILLIC CAPITAL LETTER A
// U+0411: "Б" CYRILLIC CAPITAL LETTER BE
// U+0412: "В" CYRILLIC CAPITAL LETTER VE
/* keylabel_to_alpha */ "\u0410\u0411\u0412",
+ /* single_quotes */ "!text/single_9qm_lqm",
/* morekeys_s ~ */
- null, null, null, null, null, null, null, null, null,
- /* ~ double_angle_quotes */
+ null, null, null, null, null, null,
+ /* ~ morekeys_l */
// U+20B4: "₴" HRYVNIA SIGN
/* keyspec_currency */ "\u20B4",
- /* morekeys_r ~ */
- null, null, null, null, null, null, null,
+ /* morekeys_g ~ */
+ null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_nordic_row2_10 */
// U+0449: "щ" CYRILLIC SMALL LETTER SHCHA
/* keyspec_east_slavic_row1_9 */ "\u0449",
@@ -3418,7 +3476,7 @@
/* keyspec_east_slavic_row3_5 */ "\u0438",
// U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN
/* morekeys_cyrillic_soft_sign */ "\u044A",
- /* morekeys_nordic_row2_11 ~ */
+ /* keyspec_symbols_1 ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
@@ -3512,8 +3570,8 @@
// U+0111: "đ" LATIN SMALL LETTER D WITH STROKE
/* morekeys_d */ "\u0111",
/* morekeys_z ~ */
- null, null, null, null, null, null,
- /* ~ double_angle_quotes */
+ null, null, null,
+ /* ~ morekeys_l */
// U+20AB: "₫" DONG SIGN
/* keyspec_currency */ "\u20AB",
};
@@ -3562,8 +3620,8 @@
/* double_quotes */ null,
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
/* morekeys_n */ "\u00F1",
- /* single_quotes */ null,
/* keylabel_to_alpha */ null,
+ /* single_quotes */ null,
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
/* morekeys_s */ "\u00DF",
};
@@ -3640,8 +3698,8 @@
// U+0149: "ʼn" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
// U+014B: "ŋ" LATIN SMALL LETTER ENG
/* morekeys_n */ "\u00F1,\u0144,\u0146,\u0148,\u0149,\u014B",
- /* single_quotes */ null,
/* keylabel_to_alpha */ null,
+ /* single_quotes */ null,
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
// U+015D: "ŝ" LATIN SMALL LETTER S WITH CIRCUMFLEX
@@ -3673,14 +3731,14 @@
// U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT
// U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
/* morekeys_l */ "\u013A,\u013C,\u013E,\u0140,\u0142",
+ /* keyspec_currency */ null,
// U+011D: "ĝ" LATIN SMALL LETTER G WITH CIRCUMFLEX
// U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
// U+0121: "ġ" LATIN SMALL LETTER G WITH DOT ABOVE
// U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA
/* morekeys_g */ "\u011D,\u011F,\u0121,\u0123",
- /* single_angle_quotes ~ */
- null, null, null,
- /* ~ keyspec_currency */
+ /* single_angle_quotes */ null,
+ /* double_angle_quotes */ null,
// U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
// U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA
// U+0159: "ř" LATIN SMALL LETTER R WITH CARON
@@ -3711,26 +3769,26 @@
"DEFAULT", TEXTS_DEFAULT, /* 168/168 DEFAULT */
"af" , TEXTS_af, /* 7/ 12 Afrikaans */
"ar" , TEXTS_ar, /* 55/110 Arabic */
- "az_AZ" , TEXTS_az_AZ, /* 8/ 17 Azerbaijani (Azerbaijan) */
+ "az_AZ" , TEXTS_az_AZ, /* 8/ 18 Azerbaijani (Azerbaijan) */
"be_BY" , TEXTS_be_BY, /* 9/ 32 Belarusian (Belarus) */
- "bg" , TEXTS_bg, /* 2/ 10 Bulgarian */
+ "bg" , TEXTS_bg, /* 2/ 9 Bulgarian */
"ca" , TEXTS_ca, /* 11/ 95 Catalan */
"cs" , TEXTS_cs, /* 17/ 21 Czech */
- "da" , TEXTS_da, /* 19/ 33 Danish */
+ "da" , TEXTS_da, /* 19/ 54 Danish */
"de" , TEXTS_de, /* 16/ 62 German */
- "el" , TEXTS_el, /* 1/ 10 Greek */
+ "el" , TEXTS_el, /* 1/ 9 Greek */
"en" , TEXTS_en, /* 8/ 11 English */
"eo" , TEXTS_eo, /* 26/118 Esperanto */
- "es" , TEXTS_es, /* 8/ 34 Spanish */
+ "es" , TEXTS_es, /* 8/ 55 Spanish */
"et_EE" , TEXTS_et_EE, /* 22/ 27 Estonian (Estonia) */
"eu_ES" , TEXTS_eu_ES, /* 7/ 8 Basque (Spain) */
"fa" , TEXTS_fa, /* 58/125 Persian */
- "fi" , TEXTS_fi, /* 10/ 33 Finnish */
+ "fi" , TEXTS_fi, /* 10/ 54 Finnish */
"fr" , TEXTS_fr, /* 13/ 62 French */
"gl_ES" , TEXTS_gl_ES, /* 7/ 8 Gallegan (Spain) */
- "hi" , TEXTS_hi, /* 23/ 55 Hindi */
- "hr" , TEXTS_hr, /* 9/ 19 Croatian */
- "hu" , TEXTS_hu, /* 9/ 19 Hungarian */
+ "hi" , TEXTS_hi, /* 23/ 53 Hindi */
+ "hr" , TEXTS_hr, /* 9/ 20 Croatian */
+ "hu" , TEXTS_hu, /* 9/ 20 Hungarian */
"hy_AM" , TEXTS_hy_AM, /* 8/126 Armenian (Armenia) */
"is" , TEXTS_is, /* 10/ 15 Icelandic */
"it" , TEXTS_it, /* 11/ 62 Italian */
@@ -3739,14 +3797,15 @@
"kk" , TEXTS_kk, /* 15/121 Kazakh */
"km_KH" , TEXTS_km_KH, /* 2/122 Khmer (Cambodia) */
"ky" , TEXTS_ky, /* 10/ 88 Kirghiz */
- "lo_LA" , TEXTS_lo_LA, /* 2/ 20 Lao (Laos) */
+ "lo_LA" , TEXTS_lo_LA, /* 2/ 17 Lao (Laos) */
"lt" , TEXTS_lt, /* 18/ 22 Lithuanian */
"lv" , TEXTS_lv, /* 18/ 22 Latvian */
"mk" , TEXTS_mk, /* 9/ 93 Macedonian */
- "mn_MN" , TEXTS_mn_MN, /* 2/ 20 Mongolian (Mongolia) */
+ "mn_MN" , TEXTS_mn_MN, /* 2/ 17 Mongolian (Mongolia) */
+ "mr_IN" , TEXTS_mr_IN, /* 23/ 53 Marathi (India) */
"my_MM" , TEXTS_my_MM, /* 8/104 Burmese (Myanmar) */
- "nb" , TEXTS_nb, /* 11/ 33 Norwegian Bokmål */
- "ne_NP" , TEXTS_ne_NP, /* 23/ 55 Nepali (Nepal) */
+ "nb" , TEXTS_nb, /* 11/ 54 Norwegian Bokmål */
+ "ne_NP" , TEXTS_ne_NP, /* 23/ 53 Nepali (Nepal) */
"nl" , TEXTS_nl, /* 9/ 12 Dutch */
"pl" , TEXTS_pl, /* 10/ 16 Polish */
"pt" , TEXTS_pt, /* 6/ 6 Portuguese */
@@ -3754,15 +3813,15 @@
"ro" , TEXTS_ro, /* 6/ 15 Romanian */
"ru" , TEXTS_ru, /* 9/ 32 Russian */
"sk" , TEXTS_sk, /* 20/ 22 Slovak */
- "sl" , TEXTS_sl, /* 8/ 19 Slovenian */
+ "sl" , TEXTS_sl, /* 8/ 20 Slovenian */
"sr" , TEXTS_sr, /* 11/ 93 Serbian */
- "sv" , TEXTS_sv, /* 21/ 33 Swedish */
- "sw" , TEXTS_sw, /* 9/ 17 Swahili */
- "th" , TEXTS_th, /* 2/ 20 Thai */
+ "sv" , TEXTS_sv, /* 21/ 54 Swedish */
+ "sw" , TEXTS_sw, /* 9/ 18 Swahili */
+ "th" , TEXTS_th, /* 2/ 17 Thai */
"tl" , TEXTS_tl, /* 7/ 8 Tagalog */
- "tr" , TEXTS_tr, /* 7/ 17 Turkish */
+ "tr" , TEXTS_tr, /* 7/ 18 Turkish */
"uk" , TEXTS_uk, /* 11/ 87 Ukrainian */
- "vi" , TEXTS_vi, /* 8/ 20 Vietnamese */
+ "vi" , TEXTS_vi, /* 8/ 17 Vietnamese */
"zu" , TEXTS_zu, /* 8/ 11 Zulu */
"zz" , TEXTS_zz, /* 19/112 Alphabet */
};
diff --git a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
index 09d0ea2..9bc01a2 100644
--- a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
@@ -29,6 +29,7 @@
import android.text.TextUtils;
import android.util.Log;
+import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.latin.personalization.AccountUtils;
import com.android.inputmethod.latin.utils.StringUtils;
@@ -61,9 +62,6 @@
/** The number of contacts in the most recent dictionary rebuild. */
static private int sContactCountAtLastRebuild = 0;
- /** The locale for this contacts dictionary. Controls name bigram predictions. */
- public final Locale mLocale;
-
private ContentObserver mObserver;
/**
@@ -71,11 +69,7 @@
*/
private final boolean mUseFirstLastBigrams;
- public ContactsBinaryDictionary(final Context context, final Locale locale) {
- this(context, locale, null /* dictFile */);
- }
-
- public ContactsBinaryDictionary(final Context context, final Locale locale,
+ private ContactsBinaryDictionary(final Context context, final Locale locale,
final File dictFile) {
this(context, locale, dictFile, NAME);
}
@@ -84,12 +78,17 @@
final File dictFile, final String name) {
super(context, getDictName(name, locale, dictFile), locale, Dictionary.TYPE_CONTACTS,
dictFile);
- mLocale = locale;
mUseFirstLastBigrams = useFirstLastBigramsForLocale(locale);
registerObserver(context);
reloadDictionaryIfRequired();
}
+ @UsedForTesting
+ public static ContactsBinaryDictionary getDictionary(final Context context, final Locale locale,
+ final File dictFile) {
+ return new ContactsBinaryDictionary(context, locale, dictFile);
+ }
+
private synchronized void registerObserver(final Context context) {
if (mObserver != null) return;
ContentResolver cres = context.getContentResolver();
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
index c6b0d35..627793f 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -23,8 +23,7 @@
import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.keyboard.ProximityInfo;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.personalization.DecayingExpandableBinaryDictionaryBase;
-import com.android.inputmethod.latin.personalization.PersonalizationHelper;
+import com.android.inputmethod.latin.personalization.PersonalizationDictionary;
import com.android.inputmethod.latin.personalization.UserHistoryDictionary;
import com.android.inputmethod.latin.utils.CollectionUtils;
import com.android.inputmethod.latin.utils.ExecutorUtils;
@@ -32,6 +31,8 @@
import com.android.inputmethod.latin.utils.SuggestionResults;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -65,6 +66,20 @@
Dictionary.TYPE_CONTACTS
};
+ private static final Map<String, Class<? extends ExpandableBinaryDictionary>>
+ DICT_TYPE_TO_CLASS = CollectionUtils.newHashMap();
+
+ static {
+ DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_USER_HISTORY, UserHistoryDictionary.class);
+ DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_PERSONALIZATION, PersonalizationDictionary.class);
+ DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_USER, UserBinaryDictionary.class);
+ DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_CONTACTS, ContactsBinaryDictionary.class);
+ }
+
+ private static final String DICT_FACTORY_METHOD_NAME = "getDictionary";
+ private static final Class<?>[] DICT_FACTORY_METHOD_ARG_TYPES =
+ new Class[] { Context.class, Locale.class, File.class };
+
private static final String[] SUB_DICT_TYPES =
Arrays.copyOfRange(DICT_TYPES_ORDERED_TO_GET_SUGGESTION, 1 /* start */,
DICT_TYPES_ORDERED_TO_GET_SUGGESTION.length);
@@ -74,8 +89,7 @@
*/
private static class Dictionaries {
public final Locale mLocale;
- public final ConcurrentHashMap<String, Dictionary> mDictMap =
- CollectionUtils.newConcurrentHashMap();
+ private Dictionary mMainDict;
public final ConcurrentHashMap<String, ExpandableBinaryDictionary> mSubDictMap =
CollectionUtils.newConcurrentHashMap();
@@ -95,26 +109,25 @@
private void setSubDict(final String dictType, final ExpandableBinaryDictionary dict) {
if (dict != null) {
- mDictMap.put(dictType, dict);
mSubDictMap.put(dictType, dict);
}
}
public void setMainDict(final Dictionary mainDict) {
// Close old dictionary if exists. Main dictionary can be assigned multiple times.
- final Dictionary oldDict;
- if (mainDict != null) {
- oldDict = mDictMap.put(Dictionary.TYPE_MAIN, mainDict);
- } else {
- oldDict = mDictMap.remove(Dictionary.TYPE_MAIN);
- }
+ final Dictionary oldDict = mMainDict;
+ mMainDict = mainDict;
if (oldDict != null && mainDict != oldDict) {
oldDict.close();
}
}
- public Dictionary getMainDict() {
- return mDictMap.get(Dictionary.TYPE_MAIN);
+ public Dictionary getDict(final String dictType) {
+ if (Dictionary.TYPE_MAIN.equals(dictType)) {
+ return mMainDict;
+ } else {
+ return getSubDict(dictType);
+ }
}
public ExpandableBinaryDictionary getSubDict(final String dictType) {
@@ -122,12 +135,20 @@
}
public boolean hasDict(final String dictType) {
- return mDictMap.containsKey(dictType);
+ if (Dictionary.TYPE_MAIN.equals(dictType)) {
+ return mMainDict != null;
+ } else {
+ return mSubDictMap.containsKey(dictType);
+ }
}
public void closeDict(final String dictType) {
- final Dictionary dict = mDictMap.remove(dictType);
- mSubDictMap.remove(dictType);
+ final Dictionary dict;
+ if (Dictionary.TYPE_MAIN.equals(dictType)) {
+ dict = mMainDict;
+ } else {
+ dict = mSubDictMap.remove(dictType);
+ }
if (dict != null) {
dict.close();
}
@@ -146,15 +167,20 @@
private static ExpandableBinaryDictionary getSubDict(final String dictType,
final Context context, final Locale locale, final File dictFile) {
- if (Dictionary.TYPE_CONTACTS.equals(dictType)) {
- return new ContactsBinaryDictionary(context, locale, dictFile);
- } else if (Dictionary.TYPE_USER.equals(dictType)) {
- return new UserBinaryDictionary(context, locale, dictFile);
- } else if (Dictionary.TYPE_USER_HISTORY.equals(dictType)) {
- return PersonalizationHelper.getUserHistoryDictionary(context, locale);
- } else if (Dictionary.TYPE_PERSONALIZATION.equals(dictType)) {
- return PersonalizationHelper.getPersonalizationDictionary(context, locale);
- } else {
+ final Class<? extends ExpandableBinaryDictionary> dictClass =
+ DICT_TYPE_TO_CLASS.get(dictType);
+ if (dictClass == null) {
+ return null;
+ }
+ try {
+ final Method factoryMethod = dictClass.getMethod(DICT_FACTORY_METHOD_NAME,
+ DICT_FACTORY_METHOD_ARG_TYPES);
+ final Object dict = factoryMethod.invoke(null /* obj */,
+ new Object[] { context, locale, dictFile });
+ return (ExpandableBinaryDictionary) dict;
+ } catch (final NoSuchMethodException | SecurityException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException e) {
+ Log.e(TAG, "Cannot create dictionary: " + dictType, e);
return null;
}
}
@@ -166,9 +192,10 @@
final boolean localeHasBeenChanged = !newLocale.equals(mDictionaries.mLocale);
// We always try to have the main dictionary. Other dictionaries can be unused.
final boolean reloadMainDictionary = localeHasBeenChanged || forceReloadMainDictionary;
+ // TODO: Make subDictTypesToUse configurable by resource or a static final list.
final Set<String> subDictTypesToUse = CollectionUtils.newHashSet();
if (useContactsDict) {
- subDictTypesToUse.add(Dictionary.TYPE_USER);
+ subDictTypesToUse.add(Dictionary.TYPE_CONTACTS);
}
subDictTypesToUse.add(Dictionary.TYPE_USER);
if (usePersonalizedDicts) {
@@ -181,7 +208,7 @@
// The main dictionary will be asynchronously loaded.
newMainDict = null;
} else {
- newMainDict = mDictionaries.getMainDict();
+ newMainDict = mDictionaries.getDict(Dictionary.TYPE_MAIN);
}
final Map<String, ExpandableBinaryDictionary> subDicts = CollectionUtils.newHashMap();
@@ -223,7 +250,6 @@
oldDictionaries.closeDict(dictType);
}
}
- oldDictionaries.mDictMap.clear();
oldDictionaries.mSubDictMap.clear();
}
@@ -287,15 +313,15 @@
dictionaries = mDictionaries;
mDictionaries = new Dictionaries();
}
- for (final Dictionary dict : dictionaries.mDictMap.values()) {
- dict.close();
+ for (final String dictType : DICT_TYPES_ORDERED_TO_GET_SUGGESTION) {
+ dictionaries.closeDict(dictType);
}
}
// The main dictionary could have been loaded asynchronously. Don't cache the return value
// of this method.
public boolean hasInitializedMainDictionary() {
- final Dictionary mainDict = mDictionaries.getMainDict();
+ final Dictionary mainDict = mDictionaries.getDict(Dictionary.TYPE_MAIN);
return mainDict != null && mainDict.isInitialized();
}
@@ -372,7 +398,7 @@
// consolidation is done.
// TODO: Remove this hack when ready.
final int lowerCaseFreqInMainDict = dictionaries.hasDict(Dictionary.TYPE_MAIN) ?
- dictionaries.getMainDict().getFrequency(suggestionLowerCase) :
+ dictionaries.getDict(Dictionary.TYPE_MAIN).getFrequency(suggestionLowerCase) :
Dictionary.NOT_A_PROBABILITY;
if (maxFreq < lowerCaseFreqInMainDict
&& lowerCaseFreqInMainDict >= CAPITALIZED_FORM_MAX_PROBABILITY_FOR_INSERT) {
@@ -403,12 +429,11 @@
final boolean blockOffensiveWords, final int[] additionalFeaturesOptions,
final int sessionId, final ArrayList<SuggestedWordInfo> rawSuggestions) {
final Dictionaries dictionaries = mDictionaries;
- final Map<String, Dictionary> dictMap = dictionaries.mDictMap;
final SuggestionResults suggestionResults =
new SuggestionResults(dictionaries.mLocale, SuggestedWords.MAX_SUGGESTIONS);
final float[] languageWeight = new float[] { Dictionary.NOT_A_LANGUAGE_WEIGHT };
for (final String dictType : DICT_TYPES_ORDERED_TO_GET_SUGGESTION) {
- final Dictionary dictionary = dictMap.get(dictType);
+ final Dictionary dictionary = dictionaries.getDict(dictType);
if (null == dictionary) continue;
final ArrayList<SuggestedWordInfo> dictionarySuggestions =
dictionary.getSuggestionsWithSessionId(composer, prevWord, proximityInfo,
@@ -424,11 +449,11 @@
}
public boolean isValidMainDictWord(final String word) {
- final Dictionaries dictionaries = mDictionaries;
- if (TextUtils.isEmpty(word) || !dictionaries.hasDict(Dictionary.TYPE_MAIN)) {
+ final Dictionary mainDict = mDictionaries.getDict(Dictionary.TYPE_MAIN);
+ if (TextUtils.isEmpty(word) || mainDict == null) {
return false;
}
- return dictionaries.getMainDict().isValidWord(word);
+ return mainDict.isValidWord(word);
}
public boolean isValidWord(final String word, final boolean ignoreCase) {
@@ -440,8 +465,8 @@
return false;
}
final String lowerCasedWord = word.toLowerCase(dictionaries.mLocale);
- final Map<String, Dictionary> dictMap = dictionaries.mDictMap;
- for (final Dictionary dictionary : dictMap.values()) {
+ for (final String dictType : DICT_TYPES_ORDERED_TO_GET_SUGGESTION) {
+ final Dictionary dictionary = dictionaries.getDict(dictType);
// Ideally the passed map would come out of a {@link java.util.concurrent.Future} and
// would be immutable once it's finished initializing, but concretely a null test is
// probably good enough for the time being.
@@ -459,8 +484,10 @@
return Dictionary.NOT_A_PROBABILITY;
}
int maxFreq = -1;
- final Map<String, Dictionary> dictMap = mDictionaries.mDictMap;
- for (final Dictionary dictionary : dictMap.values()) {
+ final Dictionaries dictionaries = mDictionaries;
+ for (final String dictType : DICT_TYPES_ORDERED_TO_GET_SUGGESTION) {
+ final Dictionary dictionary = dictionaries.getDict(dictType);
+ if (dictionary == null) continue;
final int tempFreq = dictionary.getFrequency(word);
if (tempFreq >= maxFreq) {
maxFreq = tempFreq;
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index cda429e..c825ca4 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -528,17 +528,17 @@
} else if (mBinaryDictionary == null) {
// Otherwise, load the existing dictionary.
loadBinaryDictionaryLocked();
+ if (mBinaryDictionary != null && !(isValidDictionaryLocked()
+ // TODO: remove the check below
+ && matchesExpectedBinaryDictFormatVersionForThisType(
+ mBinaryDictionary.getFormatVersion()))) {
+ // Binary dictionary or its format version is not valid. Regenerate
+ // the dictionary file. writeBinaryDictionary will remove the
+ // existing files if appropriate.
+ createNewDictionaryLocked();
+ }
}
mNeedsToReload = false;
- if (mBinaryDictionary != null && !(isValidDictionaryLocked()
- // TODO: remove the check below
- && matchesExpectedBinaryDictFormatVersionForThisType(
- mBinaryDictionary.getFormatVersion()))) {
- // Binary dictionary or its format version is not valid. Regenerate
- // the dictionary file. writeBinaryDictionary will remove the
- // existing files if appropriate.
- createNewDictionaryLocked();
- }
} finally {
mIsReloading.set(false);
}
diff --git a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java
index 2006a5c..e1cda69 100644
--- a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java
@@ -28,6 +28,7 @@
import android.text.TextUtils;
import android.util.Log;
+import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.compat.UserDictionaryCompatUtils;
import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
@@ -66,17 +67,8 @@
final private String mLocale;
final private boolean mAlsoUseMoreRestrictiveLocales;
- public UserBinaryDictionary(final Context context, final Locale locale) {
- this(context, locale, false /* alsoUseMoreRestrictiveLocales */, null /* dictFile */);
- }
-
- public UserBinaryDictionary(final Context context, final Locale locale, final File dictFile) {
- this(context, locale, false /* alsoUseMoreRestrictiveLocales */, dictFile);
- }
-
- public UserBinaryDictionary(final Context context, final Locale locale,
- final boolean alsoUseMoreRestrictiveLocales, final File dictFile) {
- this(context, locale, alsoUseMoreRestrictiveLocales, dictFile, NAME);
+ private UserBinaryDictionary(final Context context, final Locale locale, final File dictFile) {
+ this(context, locale, false /* alsoUseMoreRestrictiveLocales */, dictFile, NAME);
}
protected UserBinaryDictionary(final Context context, final Locale locale,
@@ -113,6 +105,12 @@
reloadDictionaryIfRequired();
}
+ @UsedForTesting
+ public static UserBinaryDictionary getDictionary(final Context context, final Locale locale,
+ final File dictFile) {
+ return new UserBinaryDictionary(context, locale, dictFile);
+ }
+
@Override
public synchronized void close() {
if (mObserver != null) {
diff --git a/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java b/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java
index 4afd5b4..1423fce 100644
--- a/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java
+++ b/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java
@@ -18,6 +18,7 @@
import android.content.Context;
+import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.latin.Dictionary;
import java.io.File;
@@ -26,14 +27,16 @@
public class PersonalizationDictionary extends DecayingExpandableBinaryDictionaryBase {
/* package */ static final String NAME = PersonalizationDictionary.class.getSimpleName();
+ // TODO: Make this constructor private
/* package */ PersonalizationDictionary(final Context context, final Locale locale) {
- this(context, locale, null /* dictFile */);
+ super(context, getDictName(NAME, locale, null /* dictFile */), locale,
+ Dictionary.TYPE_PERSONALIZATION, null /* dictFile */);
}
- public PersonalizationDictionary(final Context context, final Locale locale,
- final File dictFile) {
- super(context, getDictName(NAME, locale, dictFile), locale, Dictionary.TYPE_PERSONALIZATION,
- dictFile);
+ @UsedForTesting
+ public static PersonalizationDictionary getDictionary(final Context context,
+ final Locale locale, final File dictFile) {
+ return PersonalizationHelper.getPersonalizationDictionary(context, locale);
}
@Override
diff --git a/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java b/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java
index 8a29c35..818cd9a 100644
--- a/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java
@@ -18,6 +18,7 @@
import android.content.Context;
+import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.latin.Constants;
import com.android.inputmethod.latin.Dictionary;
import com.android.inputmethod.latin.ExpandableBinaryDictionary;
@@ -32,14 +33,16 @@
public class UserHistoryDictionary extends DecayingExpandableBinaryDictionaryBase {
/* package */ static final String NAME = UserHistoryDictionary.class.getSimpleName();
+ // TODO: Make this constructor private
/* package */ UserHistoryDictionary(final Context context, final Locale locale) {
- this(context, locale, null /* dictFile */);
+ super(context, getDictName(NAME, locale, null /* dictFile */), locale,
+ Dictionary.TYPE_USER_HISTORY, null /* dictFile */);
}
- public UserHistoryDictionary(final Context context, final Locale locale,
+ @UsedForTesting
+ public static UserHistoryDictionary getDictionary(final Context context, final Locale locale,
final File dictFile) {
- super(context, getDictName(NAME, locale, dictFile), locale, Dictionary.TYPE_USER_HISTORY,
- dictFile);
+ return PersonalizationHelper.getUserHistoryDictionary(context, locale);
}
@Override
diff --git a/native/jni/src/suggest/policyimpl/dictionary/bigram/ver4_bigram_list_policy.cpp b/native/jni/src/suggest/policyimpl/dictionary/bigram/ver4_bigram_list_policy.cpp
index 5df2096..04e768f 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/bigram/ver4_bigram_list_policy.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/bigram/ver4_bigram_list_policy.cpp
@@ -55,7 +55,7 @@
}
const int bigramListPos = mBigramDictContent->getBigramListHeadPos(terminalId);
if (bigramListPos == NOT_A_DICT_POS) {
- // Updating PtNode doesn't have a bigram list.
+ // Updating PtNode that doesn't have a bigram list.
// Create new bigram list.
if (!mBigramDictContent->createNewBigramList(terminalId)) {
return false;
@@ -98,19 +98,27 @@
if (!mBigramDictContent->createNewBigramList(terminalId)) {
return false;
}
- // Write new entry at a head position of the bigram list.
int writingPos = mBigramDictContent->getBigramListHeadPos(terminalId);
- const BigramEntry newBigramEntry(true /* hasNext */, NOT_A_PROBABILITY, newTargetTerminalId);
+ int tailEntryPos = NOT_A_DICT_POS;
+ // Copy existing bigram list.
+ if (!mBigramDictContent->copyBigramList(bigramListPos, writingPos, &tailEntryPos)) {
+ return false;
+ }
+ // Write new entry at the tail position of the bigram content.
+ const BigramEntry newBigramEntry(false /* hasNext */, NOT_A_PROBABILITY, newTargetTerminalId);
const BigramEntry bigramEntryToWrite = createUpdatedBigramEntryFrom(
&newBigramEntry, newProbability, timestamp);
- if (!mBigramDictContent->writeBigramEntryAndAdvancePosition(&bigramEntryToWrite, &writingPos)) {
+ if (!mBigramDictContent->writeBigramEntryAtTail(&bigramEntryToWrite)) {
+ return false;
+ }
+ // Update has next flag of the tail entry.
+ if (!updateHasNextFlag(true /* hasNext */, tailEntryPos)) {
return false;
}
if (outAddedNewEntry) {
*outAddedNewEntry = true;
}
- // Append existing entries by copying.
- return mBigramDictContent->copyBigramList(bigramListPos, writingPos);
+ return true;
}
bool Ver4BigramListPolicy::removeEntry(const int terminalId, const int targetTerminalId) {
@@ -239,4 +247,10 @@
}
}
+bool Ver4BigramListPolicy::updateHasNextFlag(const bool hasNext, const int bigramEntryPos) {
+ const BigramEntry bigramEntry = mBigramDictContent->getBigramEntry(bigramEntryPos);
+ const BigramEntry updatedBigramEntry = bigramEntry.updateHasNextAndGetEntry(hasNext);
+ return mBigramDictContent->writeBigramEntry(&updatedBigramEntry, bigramEntryPos);
+}
+
} // namespace latinime
diff --git a/native/jni/src/suggest/policyimpl/dictionary/bigram/ver4_bigram_list_policy.h b/native/jni/src/suggest/policyimpl/dictionary/bigram/ver4_bigram_list_policy.h
index 5b6c5a1..d8f7be6 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/bigram/ver4_bigram_list_policy.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/bigram/ver4_bigram_list_policy.h
@@ -61,6 +61,8 @@
const BigramEntry createUpdatedBigramEntryFrom(const BigramEntry *const originalBigramEntry,
const int newProbability, const int timestamp) const;
+ bool updateHasNextFlag(const bool hasNext, const int bigramEntryPos);
+
BigramDictContent *const mBigramDictContent;
const TerminalPositionLookupTable *const mTerminalPositionLookupTable;
const HeaderPolicy *const mHeaderPolicy;
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp
index 279f5b3..56f19db 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp
@@ -113,13 +113,17 @@
return true;
}
-bool BigramDictContent::copyBigramList(const int bigramListPos, const int toPos) {
+bool BigramDictContent::copyBigramList(const int bigramListPos, const int toPos,
+ int *const outTailEntryPos) {
int readingPos = bigramListPos;
int writingPos = toPos;
bool hasNext = true;
while (hasNext) {
const BigramEntry bigramEntry = getBigramEntryAndAdvancePosition(&readingPos);
hasNext = bigramEntry.hasNext();
+ if (!hasNext) {
+ *outTailEntryPos = writingPos;
+ }
if (!writeBigramEntryAndAdvancePosition(&bigramEntry, &writingPos)) {
AKLOGE("Cannot write bigram entry to copy. pos: %d", writingPos);
return false;
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h
index ba2a052..40ece76 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h
@@ -58,6 +58,11 @@
return addressLookupTable->get(terminalId);
}
+ bool writeBigramEntryAtTail(const BigramEntry *const bigramEntryToWrite) {
+ int writingPos = getContentBuffer()->getTailPosition();
+ return writeBigramEntryAndAdvancePosition(bigramEntryToWrite, &writingPos);
+ }
+
bool writeBigramEntry(const BigramEntry *const bigramEntryToWrite, const int entryWritingPos) {
int writingPos = entryWritingPos;
return writeBigramEntryAndAdvancePosition(bigramEntryToWrite, &writingPos);
@@ -71,7 +76,7 @@
return getUpdatableAddressLookupTable()->set(terminalId, bigramListPos);
}
- bool copyBigramList(const int bigramListPos, const int toPos);
+ bool copyBigramList(const int bigramListPos, const int toPos, int *const outTailEntryPos);
bool flushToFile(const char *const dictPath) const {
return flush(dictPath, Ver4DictConstants::BIGRAM_LOOKUP_TABLE_FILE_EXTENSION,
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java
index e4aaf03..13955b8 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java
@@ -25,7 +25,7 @@
@SmallTest
public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {
- private static final int NUMBER_OF_SUBTYPES = 70;
+ private static final int NUMBER_OF_SUBTYPES = 71;
private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 45;
private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Marathi.java b/tests/src/com/android/inputmethod/keyboard/layout/Marathi.java
new file mode 100644
index 0000000..00cf838
--- /dev/null
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Marathi.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.inputmethod.keyboard.layout;
+
+import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+
+import com.android.inputmethod.keyboard.layout.Hindi.HindiCustomizer;
+import com.android.inputmethod.keyboard.layout.Hindi.HindiSymbols;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+
+import java.util.Locale;
+
+/**
+ * The Marathi keyboard.
+ */
+public final class Marathi extends LayoutBase {
+ private static final String LAYOUT_NAME = "marathi";
+
+ public Marathi(final LayoutCustomizer customizer) {
+ super(customizer, HindiSymbols.class, SymbolsShifted.class);
+ }
+
+ @Override
+ public String getName() { return LAYOUT_NAME; }
+
+ public static class MarathiCustomizer extends HindiCustomizer {
+ public MarathiCustomizer(final Locale locale) { super(locale); }
+
+ @Override
+ public ExpectedKey[] getLeftShiftKeys(final boolean isPhone) {
+ return EMPTY_KEYS;
+ }
+ }
+
+ @Override
+ ExpectedKey[][] getCommonAlphabetLayout(boolean isPhone) { return ALPHABET_COMMON; }
+
+ @Override
+ ExpectedKey[][] getCommonAlphabetShiftLayout(final boolean isPhone, final int elementId) {
+ return null;
+ }
+
+ private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
+ .setKeysOfRow(1,
+ // U+094C: "ौ" DEVANAGARI VOWEL SIGN AU
+ // U+0914: "औ" DEVANAGARI LETTER AU
+ // U+0967: "१" DEVANAGARI DIGIT ONE
+ key(VOWEL_SIGN_AU, "\u094C", joinMoreKeys("\u0914", "\u0967", "1")),
+ // U+0948: "ै" DEVANAGARI VOWEL SIGN AI
+ // U+0910: "ऐ" DEVANAGARI LETTER AI
+ // U+0968: "२" DEVANAGARI DIGIT TWO
+ key(VOWEL_SIGN_AI, "\u0948", joinMoreKeys("\u0910", "\u0968", "2")),
+ // U+093E: "ा" DEVANAGARI VOWEL SIGN AA
+ // U+0906: "आ" DEVANAGARI LETTER AA
+ // U+0969: "३" DEVANAGARI DIGIT THREE
+ key(VOWEL_SIGN_AA, "\u093E", joinMoreKeys("\u0906", "\u0969", "3")),
+ // U+0940: "ी" DEVANAGARI VOWEL SIGN II
+ // U+0908: "ई" DEVANAGARI LETTER II
+ // U+096A: "४" DEVANAGARI DIGIT FOUR
+ key(VOWEL_SIGN_II, "\u0940", joinMoreKeys("\u0908", "\u096A", "4")),
+ // U+0942: "ू" DEVANAGARI VOWEL SIGN UU
+ // U+090A: "ऊ" DEVANAGARI LETTER UU
+ // U+096B: "५" DEVANAGARI DIGIT FIVE
+ key(VOWEL_SIGN_UU, "\u0942", joinMoreKeys("\u090A", "\u096B", "5")),
+ // U+092C: "ब" DEVANAGARI LETTER BA
+ // U+092D: "भ" DEVANAGARI LETTER BHA
+ // U+096C: "६" DEVANAGARI DIGIT SIX
+ key("\u092C", joinMoreKeys("\u092D", "\u096C", "6")),
+ // U+0939: "ह" DEVANAGARI LETTER HA
+ // U+096D: "७" DEVANAGARI DIGIT SEVEN
+ key("\u0939", joinMoreKeys("\u096D", "7")),
+ // U+0917: "ग" DEVANAGARI LETTER GA
+ // U+0918: "घ" DEVANAGARI LETTER GHA
+ // U+096E: "८" DEVANAGARI DIGIT EIGHT
+ key("\u0917", joinMoreKeys("\u0918", "\u096E", "8")),
+ // U+0926: "द" DEVANAGARI LETTER DA
+ // U+0927: "ध" DEVANAGARI LETTER DHA
+ // U+096F: "९" DEVANAGARI DIGIT NINE
+ key("\u0926", joinMoreKeys("\u0927", "\u096F", "9")),
+ // U+091C: "ज" DEVANAGARI LETTER JA
+ // U+091D: "झ" DEVANAGARI LETTER JHA
+ // U+091C/U+094D/U+091E:
+ // "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
+ // U+0966: "०" DEVANAGARI DIGIT ZERO
+ key("\u091C", joinMoreKeys("\u091D", "\u091C\u094D\u091E", "\u0966", "0")),
+ // U+0921: "ड" DEVANAGARI LETTER DDA
+ // U+0922: "ढ" DEVANAGARI LETTER DDHA
+ key("\u0921", moreKey("\u0922")))
+ .setKeysOfRow(2,
+ // U+094B: "ो" DEVANAGARI VOWEL SIGN O
+ // U+0913: "ओ" DEVANAGARI LETTER O
+ key(VOWEL_SIGN_O, "\u094B", moreKey("\u0913")),
+ // U+0947: "े" DEVANAGARI VOWEL SIGN E
+ // U+090F: "ए" DEVANAGARI LETTER SHORT E
+ key(VOWEL_SIGN_E, "\u0947", moreKey("\u090F")),
+ // U+094D: "्" DEVANAGARI SIGN VIRAMA
+ // U+0905: "अ" DEVANAGARI LETTER A
+ key(SIGN_VIRAMA, "\u094D", moreKey("\u0905")),
+ // U+093F: "ि" DEVANAGARI VOWEL SIGN I
+ // U+0907: "इ" DEVANAGARI LETTER I
+ key(VOWEL_SIGN_I, "\u093F", moreKey("\u0907")),
+ // U+0941: "ु" DEVANAGARI VOWEL SIGN U
+ // U+0909: "उ" DEVANAGARI LETTER U
+ key(VOWEL_SIGN_U, "\u0941", moreKey("\u0909")),
+ // U+092A: "प" DEVANAGARI LETTER PA
+ // U+092B: "फ" DEVANAGARI LETTER PHA
+ key("\u092A", moreKey("\u092B")),
+ // U+0930: "र" DEVANAGARI LETTER RA
+ // U+0931: "ऱ" DEVANAGARI LETTER RRA
+ // U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
+ // U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R
+ key("\u0930", joinMoreKeys(
+ "\u0931", "\u090B", moreKey(VOWEL_SIGN_VOCALIC_R, "\u0943"))),
+ // U+0915: "क" DEVANAGARI LETTER KA
+ // U+0916: "ख" DEVANAGARI LETTER KHA
+ key("\u0915", moreKey("\u0916")),
+ // U+0924: "त" DEVANAGARI LETTER TA
+ // U+0925: "थ" DEVANAGARI LETTER THA
+ // U+0924/U+094D/U+0930:
+ // "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA
+ key("\u0924", joinMoreKeys("\u0925", "\u0924\u094D\u0930")),
+ // U+091A: "च" DEVANAGARI LETTER CA
+ // U+091B: "छ" DEVANAGARI LETTER CHA
+ key("\u091A", moreKey("\u091B")),
+ // U+091F: "ट" DEVANAGARI LETTER TTA
+ // U+0920: "ठ" DEVANAGARI LETTER TTHA
+ key("\u091F", moreKey("\u0920")))
+ .setKeysOfRow(3,
+ // U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
+ // U+0911: "ऑ" DEVANAGARI LETTER CANDRA O
+ key(VOWEL_SIGN_CANDRA_O, "\u0949", moreKey("\u0911")),
+ // U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E
+ // U+090D: "ऍ" DEVANAGARI LETTER CANDRA E
+ key(VOWEL_SIGN_CANDRA_E, "\u0945", moreKey("\u090D")),
+ // U+0902: "ं" DEVANAGARI SIGN ANUSVARA
+ // U+0903: "ः" DEVANAGARI SIGN VISARGA
+ // U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
+ key(SIGN_ANUSVARA, "\u0902", joinMoreKeys(
+ moreKey(SIGN_VISARGA, "\u0903"), moreKey(SIGN_CANDRABINDU, "\u0901"))),
+ // U+092E: "म" DEVANAGARI LETTER MA
+ "\u092E",
+ // U+0928: "न" DEVANAGARI LETTER NA
+ // U+0923: "ण" DEVANAGARI LETTER NNA
+ // U+091E: "ञ" DEVANAGARI LETTER NYA
+ // U+0919: "ङ" DEVANAGARI LETTER NGA
+ key("\u0928", joinMoreKeys("\u0923", "\u091E", "\u0919")),
+ // U+0935: "व" DEVANAGARI LETTER VA
+ "\u0935",
+ // U+0932: "ल" DEVANAGARI LETTER LA
+ // U+0933: "ळ" DEVANAGARI LETTER LLA
+ key("\u0932", moreKey("\u0933")),
+ // U+0938: "स" DEVANAGARI LETTER SA
+ // U+0936: "श" DEVANAGARI LETTER SHA
+ // U+0937: "ष" DEVANAGARI LETTER SSA
+ // U+0936/U+094D/U+0930:
+ // "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA
+ key("\u0938", joinMoreKeys("\u0936", "\u0937", "\u0936\u094D\u0930")),
+ // U+092F: "य" DEVANAGARI LETTER YA
+ "\u092F",
+ // U+0915/U+094D/U+0937:
+ // "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
+ "\u0915\u094D\u0937")
+ .build();
+}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java
new file mode 100644
index 0000000..b937629
--- /dev/null
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.inputmethod.keyboard.layout.tests;
+
+import android.test.suitebuilder.annotation.SmallTest;
+
+import com.android.inputmethod.keyboard.layout.LayoutBase;
+import com.android.inputmethod.keyboard.layout.Marathi;
+import com.android.inputmethod.keyboard.layout.Marathi.MarathiCustomizer;
+
+import java.util.Locale;
+
+/**
+ * mr_IN: Marathi (India)/marathi
+ */
+@SmallTest
+public final class TestsMarathiIN extends LayoutTestsBase {
+ private static final Locale LOCALE = new Locale("mr", "IN");
+ private static final LayoutBase LAYOUT = new Marathi(new MarathiCustomizer(LOCALE));
+
+ @Override
+ LayoutBase getLayout() { return LAYOUT; }
+}
diff --git a/tools/make-keyboard-text/res/values-mr-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-mr-rIN/donottranslate-more-keys.xml
new file mode 100644
index 0000000..19db16d
--- /dev/null
+++ b/tools/make-keyboard-text/res/values-mr-rIN/donottranslate-more-keys.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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">
+ <!-- Label for "switch to alphabetic" key.
+ U+0915: "क" DEVANAGARI LETTER KA
+ U+0916: "ख" DEVANAGARI LETTER KHA
+ U+0917: "ग" DEVANAGARI LETTER GA -->
+ <string name="keylabel_to_alpha">कखग</string>
+ <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
+ <string name="keyspec_symbols_1">१</string>
+ <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
+ <string name="keyspec_symbols_2">२</string>
+ <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
+ <string name="keyspec_symbols_3">३</string>
+ <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
+ <string name="keyspec_symbols_4">४</string>
+ <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
+ <string name="keyspec_symbols_5">५</string>
+ <!-- U+096C: "६" DEVANAGARI DIGIT SIX -->
+ <string name="keyspec_symbols_6">६</string>
+ <!-- U+096D: "७" DEVANAGARI DIGIT SEVEN -->
+ <string name="keyspec_symbols_7">७</string>
+ <!-- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
+ <string name="keyspec_symbols_8">८</string>
+ <!-- U+096F: "९" DEVANAGARI DIGIT NINE -->
+ <string name="keyspec_symbols_9">९</string>
+ <!-- U+0966: "०" DEVANAGARI DIGIT ZERO -->
+ <string name="keyspec_symbols_0">०</string>
+ <!-- Label for "switch to symbols" key. -->
+ <string name="keylabel_to_symbol">?१२३</string>
+ <string name="additional_morekeys_symbols_1">1</string>
+ <string name="additional_morekeys_symbols_2">2</string>
+ <string name="additional_morekeys_symbols_3">3</string>
+ <string name="additional_morekeys_symbols_4">4</string>
+ <string name="additional_morekeys_symbols_5">5</string>
+ <string name="additional_morekeys_symbols_6">6</string>
+ <string name="additional_morekeys_symbols_7">7</string>
+ <string name="additional_morekeys_symbols_8">8</string>
+ <string name="additional_morekeys_symbols_9">9</string>
+ <string name="additional_morekeys_symbols_0">0</string>
+ <!-- U+20B9: "₹" INDIAN RUPEE SIGN -->
+ <string name="keyspec_currency">₹</string>
+</resources>