diff options
Diffstat (limited to 'java/res')
-rw-r--r-- | java/res/values-in/strings.xml | 2 | ||||
-rw-r--r-- | java/res/values-ja/strings.xml | 2 | ||||
-rw-r--r-- | java/res/values-ms-rMY/strings.xml | 3 | ||||
-rw-r--r-- | java/res/values-nb/strings.xml | 2 | ||||
-rw-r--r-- | java/res/values-ne-rNP/strings.xml | 2 | ||||
-rw-r--r-- | java/res/values-ro/strings.xml | 3 | ||||
-rw-r--r-- | java/res/values-zu/strings.xml | 2 | ||||
-rw-r--r-- | java/res/values/strings.xml | 18 | ||||
-rw-r--r-- | java/res/xml-sw600dp/rows_myanmar.xml | 22 | ||||
-rw-r--r-- | java/res/xml/method.xml | 15 | ||||
-rw-r--r-- | java/res/xml/rowkeys_greek1.xml | 8 | ||||
-rw-r--r-- | java/res/xml/rowkeys_myanmar1.xml | 53 | ||||
-rw-r--r-- | java/res/xml/rowkeys_myanmar2.xml | 48 | ||||
-rw-r--r-- | java/res/xml/rowkeys_myanmar3.xml | 75 | ||||
-rw-r--r-- | java/res/xml/rowkeys_myanmar4.xml | 58 | ||||
-rw-r--r-- | java/res/xml/rows_myanmar.xml | 9 |
16 files changed, 156 insertions, 166 deletions
diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml index 3b5cf9192..c5f0fc3b0 100644 --- a/java/res/values-in/strings.xml +++ b/java/res/values-in/strings.xml @@ -194,7 +194,7 @@ <string name="dictionary_provider_name" msgid="3027315045397363079">"Penyedia Kamus"</string> <string name="dictionary_service_name" msgid="6237472350693511448">"Layanan Kamus"</string> <string name="download_description" msgid="6014835283119198591">"Informasi pembaruan kamus"</string> - <string name="dictionary_settings_title" msgid="8091417676045693313">"Kamus add-on"</string> + <string name="dictionary_settings_title" msgid="8091417676045693313">"Kamus pengaya"</string> <string name="dictionary_install_over_metered_network_prompt" msgid="3587517870006332980">"Kamus yang tersedia"</string> <string name="dictionary_settings_summary" msgid="5305694987799824349">"Setelan untuk kamus"</string> <string name="user_dictionaries" msgid="3582332055892252845">"Kamus pengguna"</string> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index 4567ec925..c4b185225 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -135,7 +135,7 @@ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"英語(英国)(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"英語(米国)(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> <string name="subtype_with_layout_es_US" msgid="510930471167541338">"スペイン語(米国)(<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> - <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(繁体)"</string> + <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g>(伝統言語)"</string> <string name="subtype_no_language" msgid="7137390094240139495">"言語なし(アルファベット)"</string> <string name="subtype_no_language_qwerty" msgid="244337630616742604">"アルファベット(QWERTY)"</string> <string name="subtype_no_language_qwertz" msgid="443066912507547976">"アルファベット(QWERTZ)"</string> diff --git a/java/res/values-ms-rMY/strings.xml b/java/res/values-ms-rMY/strings.xml index 96735c0b4..294dd7f4f 100644 --- a/java/res/values-ms-rMY/strings.xml +++ b/java/res/values-ms-rMY/strings.xml @@ -135,8 +135,7 @@ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Bahasa Inggeris (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Bahasa Inggeris (AS) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Bahasa Sepanyol (AS) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> - <!-- no translation found for subtype_generic_traditional (8584594350973800586) --> - <skip /> + <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Tradisional)"</string> <string name="subtype_no_language" msgid="7137390094240139495">"Tiada bahasa (Abjad)"</string> <string name="subtype_no_language_qwerty" msgid="244337630616742604">"Abjad (QWERTY)"</string> <string name="subtype_no_language_qwertz" msgid="443066912507547976">"Abjad (QWERTZ)"</string> diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index fe38a863f..02cc7deb6 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -135,7 +135,7 @@ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Engelsk (Storbritannia) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Engelsk (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spansk (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> - <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradisjonell)"</string> + <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradisjonelt)"</string> <string name="subtype_no_language" msgid="7137390094240139495">"Ingen språk (alfabet)"</string> <string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabet (QWERTY)"</string> <string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabet (QWERTZ)"</string> diff --git a/java/res/values-ne-rNP/strings.xml b/java/res/values-ne-rNP/strings.xml index 2bf1fb70d..055d16ccf 100644 --- a/java/res/values-ne-rNP/strings.xml +++ b/java/res/values-ne-rNP/strings.xml @@ -167,7 +167,7 @@ <string name="read_external_dictionary_multiple_files_title" msgid="7637749044265808628">"स्थापना गर्न कुनै शब्दकोश फाइल चयन गर्नुहोस्"</string> <string name="read_external_dictionary_confirm_install_message" msgid="4782116251651288054">"वास्तवमै <xliff:g id="LANGUAGE_NAME">%s</xliff:g> को लागि यो फाइल स्थापना गर्नुहुन्छ?"</string> <string name="error" msgid="8940763624668513648">"कुनै त्रुटि भयो"</string> - <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"सम्पर्क शब्दकोश डम्प गर्नुहोस्"</string> + <string name="prefs_dump_contacts_dict" msgid="7227327764402323097">"सम्पर्क शब्दकोश भेला गर्नुहोस्"</string> <string name="prefs_dump_user_dict" msgid="294870685041741951">"व्यक्तिगत शब्दकोश डम्प गर्नुहोस्"</string> <string name="prefs_dump_user_history_dict" msgid="6821075152449554628">"प्रयोगकर्ता इतिहास शब्दकोश डम्प गर"</string> <string name="prefs_dump_personalization_dict" msgid="7558387996151745284">"निजीकरण शब्दकोश डम्प गर्नुहोस्"</string> diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml index 2d5fd1f18..96a774449 100644 --- a/java/res/values-ro/strings.xml +++ b/java/res/values-ro/strings.xml @@ -135,8 +135,7 @@ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Engleză (Regatul Unit) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Engleză (S.U.A.) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Spaniolă (S.U.A.) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string> - <!-- no translation found for subtype_generic_traditional (8584594350973800586) --> - <skip /> + <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradițională)"</string> <string name="subtype_no_language" msgid="7137390094240139495">"Nicio limbă (alfabet)"</string> <string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabet (QWERTY)"</string> <string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabet (QWERTZ)"</string> diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml index e499bd902..1fd1e0363 100644 --- a/java/res/values-zu/strings.xml +++ b/java/res/values-zu/strings.xml @@ -135,7 +135,7 @@ <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"I-English (UK) ( <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g> )"</string> <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"I-English (US) ( <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g> )"</string> <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Isi-Spanish (US) ( <xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g> )"</string> - <string name="subtype_generic_traditional" msgid="8584594350973800586">"Isi-<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Eyosiko)"</string> + <string name="subtype_generic_traditional" msgid="8584594350973800586">"Isi-<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (Tradition)"</string> <string name="subtype_no_language" msgid="7137390094240139495">"Alikho ulimi (Alfabhethi)"</string> <string name="subtype_no_language_qwerty" msgid="244337630616742604">"Alfabhethi (QWERTY)"</string> <string name="subtype_no_language_qwertz" msgid="443066912507547976">"Alfabhethi (QWERTZ)"</string> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 937a79933..a4e2d2914 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -365,18 +365,12 @@ (Compact) can be an abbreviation to fit in the CHAR LIMIT. TODO: Remove translatable=false once we are settled down with the naming. --> <string name="subtype_generic_compact" translatable="false"><xliff:g id="LANGUAGE_NAME" example="Hindi">%s</xliff:g> (Compact)</string> - <!-- TODO: Uncomment once we can handle IETF language tag with script name specified. - Description for Serbian Cyrillic keyboard subtype [CHAR LIMIT=25] - (Cyrillic) can be an abbreviation to fit in the CHAR LIMIT. - <string name="subtype_serbian_cyrillic">Serbian (Cyrillic)</string> - Description for Serbian Latin keyboard subtype [CHAR LIMIT=25] - (Latin) can be an abbreviation to fit in the CHAR LIMIT. - <string name="subtype_serbian_latin">Serbian (Latin)</string> - Description for Serbian Latin keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] - (Latin) can be an abbreviation to fit in the CHAR LIMIT. - This should be identical to subtype_serbian_latin aside from the trailing (%s). - <string name="subtype_with_layout_sr-Latn">Serbian (Latin) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> - --> + <!-- Description for "LANGUAGE_NAME" (Cyrillic) keyboard subtype [CHAR LIMIT=25] + (Cyrillic) can be an abbreviation to fit in the CHAR LIMIT. --> + <string name="subtype_generic_cyrillic"><xliff:g id="LANGUAGE_NAME" example="Serbian">%s</xliff:g> (Cyrillic)</string> + <!-- Description for "LANGUAGE_NAME" (Latin) keyboard subtype [CHAR LIMIT=25] + (Latin) can be an abbreviation to fit in the CHAR LIMIT. --> + <string name="subtype_generic_latin"><xliff:g id="LANGUAGE_NAME" example="Serbian">%s</xliff:g> (Latin)</string> <!-- This string is displayed in a language list that allows to choose a language for suggestions in a software keyboard. This setting won't give suggestions in any particular language, hence "No language". diff --git a/java/res/xml-sw600dp/rows_myanmar.xml b/java/res/xml-sw600dp/rows_myanmar.xml index 778b330af..8eedf9d2f 100644 --- a/java/res/xml-sw600dp/rows_myanmar.xml +++ b/java/res/xml-sw600dp/rows_myanmar.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="8.1818%p" + latin:keyWidth="9.0%p" > <include latin:keyboardLayout="@xml/rowkeys_myanmar1" /> @@ -33,40 +33,30 @@ latin:keyWidth="fillRight" /> </Row> <Row - latin:keyWidth="8.1818%p" + latin:keyWidth="9.0%p" > <include latin:keyboardLayout="@xml/rowkeys_myanmar2" /> </Row> <Row - latin:keyWidth="8.1818%p" + latin:keyWidth="9.0%p" > <include - latin:keyXPos="4.0909%p" latin:keyboardLayout="@xml/rowkeys_myanmar3" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillRight" /> </Row> <Row - latin:keyWidth="8.1818%p" + latin:keyWidth="9.0%p" > <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.0%p" /> <include latin:keyboardLayout="@xml/rowkeys_myanmar4" /> - <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > - <Spacer /> - </case> - <default> - <include - latin:keyboardLayout="@xml/keys_exclamation_question" /> - </default> - </switch> + <include + latin:keyboardLayout="@xml/keys_exclamation_question" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 6d8f78773..28eceb8db 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -57,6 +57,7 @@ in: Indonesian/qwerty # "id" is the official language code of Indonesian. is: Icelandic/qwerty it: Italian/qwerty + it_CH: Italian (Switzerland)/swiss iw: Hebrew/hebrew # "he" is the official language code of Hebrew. ka_GE: Georgian (Georgia)/georgian kk: Kazakh/east_slavic @@ -328,6 +329,8 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi,EmojiCapable" android:isAsciiCapable="false" /> + <!-- TODO: This hindi_compact 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_compact" android:subtypeId="0xe49c89a1" @@ -385,6 +388,14 @@ android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" android:isAsciiCapable="true" /> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0xd914fe1a" + android:imeSubtypeLocale="it_CH" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" + /> <!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -466,8 +477,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable" android:isAsciiCapable="false" /> - <!-- TODO: This Myanmar 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="0x84c87c61" @@ -476,6 +485,8 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" android:isAsciiCapable="true" /> + <!-- TODO: This Myanmar 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="0xea266ea4" diff --git a/java/res/xml/rowkeys_greek1.xml b/java/res/xml/rowkeys_greek1.xml index c5033d029..6d767794c 100644 --- a/java/res/xml/rowkeys_greek1.xml +++ b/java/res/xml/rowkeys_greek1.xml @@ -69,7 +69,7 @@ latin:keySpec="ε" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="έ" /> + latin:moreKeys="έ,%" /> <!-- U+03C1: "ρ" GREEK SMALL LETTER RHO --> <Key latin:keySpec="ρ" @@ -88,7 +88,7 @@ latin:keySpec="υ" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="ύ,ϋ,ΰ" /> + latin:moreKeys="ύ,%,ϋ,ΰ" /> <!-- U+03B8: "θ" GREEK SMALL LETTER THETA --> <Key latin:keySpec="θ" @@ -102,14 +102,14 @@ latin:keySpec="ι" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="ί,ϊ,ΐ" /> + latin:moreKeys="ί,%,ϊ,ΐ" /> <!-- U+03BF: "ο" GREEK SMALL LETTER OMICRON U+03CC: "ό" GREEK SMALL LETTER OMICRON WITH TONOS --> <Key latin:keySpec="ο" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="ό" /> + latin:moreKeys="ό,%" /> <!-- U+03C0: "π" GREEK SMALL LETTER PI --> <Key latin:keySpec="π" diff --git a/java/res/xml/rowkeys_myanmar1.xml b/java/res/xml/rowkeys_myanmar1.xml index 6460af565..b7c820922 100644 --- a/java/res/xml/rowkeys_myanmar1.xml +++ b/java/res/xml/rowkeys_myanmar1.xml @@ -25,50 +25,49 @@ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > - <!-- U+100E: "ဎ" MYANMAR LETTER DDHA --> + <!-- U+1027: "ဧ" MYANMAR LETTER E --> <Key - latin:keySpec="ဎ" + latin:keySpec="ဧ" latin:keyLabelFlags="fontNormal" /> - <!-- U+100D: "ဍ" MYANMAR LETTER DDA --> + <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE --> <Key - latin:keySpec="ဍ" + latin:keySpec="၏" latin:keyLabelFlags="fontNormal" /> - <!-- U+1052: "ၒ" MYANMAR LETTER VOCALIC R --> + <!-- U+1024: "ဤ" MYANMAR LETTER II --> <Key - latin:keySpec="ၒ" + latin:keySpec="ဤ" latin:keyLabelFlags="fontNormal" /> - <!-- U+100B: "ဋ" MYANMAR LETTER TTA --> + <!-- U+1023: "ဣ" MYANMAR LETTER I --> <Key - latin:keySpec="ဋ" + latin:keySpec="ဣ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1053: "ၓ" MYANMAR LETTER VOCALIC RR --> + <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED --> <Key - latin:keySpec="ၓ" + latin:keySpec="၎" latin:keyLabelFlags="fontNormal" /> - <!-- U+1054: "ၔ" MYANMAR LETTER VOCALIC L --> + <!-- U+1000/U+103B/U+1015/U+103A: "ကျပ်" + MYANMAR LETTER KA/MYANMAR CONSONANT SIGN MEDIAL YA/MYANMAR LETTER PA/MYANMAR SIGN ASAT --> <Key - latin:keySpec="ၔ" - latin:keyLabelFlags="fontNormal" /> - <!-- U+1055: "ၕ" MYANMAR LETTER VOCALIC LL --> - <Key - latin:keySpec="ၕ" - latin:keyLabelFlags="fontNormal" /> - <!-- U+101B: "ရ" MYANMAR LETTER RA --> + latin:keySpec="ကျပ်" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" /> + <!-- U+1029: "ဩ" MYANMAR LETTER O --> <Key - latin:keySpec="ရ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ဩ" + latin:keyLabelFlags="fontNormal|autoScale" /> + <!-- U+102A: "ဪ" MYANMAR LETTER AU --> <Key - latin:keySpec="*" /> + latin:keySpec="ဪ" + latin:keyLabelFlags="fontNormal|autoScale" /> + <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED --> <Key - latin:keySpec="(" /> + latin:keySpec="၍" + latin:keyLabelFlags="fontNormal" /> + <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE --> <Key - latin:keySpec=")" /> + latin:keySpec="၌" + latin:keyLabelFlags="fontNormal" /> </case> <default> - <!-- U+1050: "ၐ" MYANMAR LETTER SHA --> - <Key - latin:keySpec="ၐ" - latin:keyLabelFlags="fontNormal" /> <!-- U+1041: "၁" MYANMAR DIGIT ONE --> <Key latin:keySpec="၁" diff --git a/java/res/xml/rowkeys_myanmar2.xml b/java/res/xml/rowkeys_myanmar2.xml index 558c38d4d..5f0115f39 100644 --- a/java/res/xml/rowkeys_myanmar2.xml +++ b/java/res/xml/rowkeys_myanmar2.xml @@ -25,49 +25,45 @@ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > - <!-- U+1008: "ဈ" MYANMAR LETTER JHA --> + <!-- U+1017: "ဗ" MYANMAR LETTER BA --> <Key - latin:keySpec="ဈ" + latin:keySpec="ဗ" latin:keyLabelFlags="fontNormal" /> - <!-- U+101D: "ဝ" MYANMAR LETTER WA --> + <!-- U+1012: "ဒ" MYANMAR LETTER DA --> <Key - latin:keySpec="ဝ" + latin:keySpec="ဒ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1023: "ဣ" MYANMAR LETTER I --> + <!-- U+1013: "ဓ" MYANMAR LETTER DHA --> <Key - latin:keySpec="ဣ" + latin:keySpec="ဓ" latin:keyLabelFlags="fontNormal" /> - <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED --> + <!-- U+1003: "ဃ" MYANMAR LETTER GHA --> <Key - latin:keySpec="၎" + latin:keySpec="ဃ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1024: "ဤ" MYANMAR LETTER II --> + <!-- U+100E: "ဎ" MYANMAR LETTER DDHA --> <Key - latin:keySpec="ဤ" + latin:keySpec="ဎ" latin:keyLabelFlags="fontNormal" /> - <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE --> + <!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA --> <Key - latin:keySpec="၌" + latin:keySpec="ဿ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1025: "ဥ" MYANMAR LETTER U --> + <!-- U+100F: "ဏ" MYANMAR LETTER NNA --> <Key - latin:keySpec="ဥ" + latin:keySpec="ဏ" latin:keyLabelFlags="fontNormal" /> - <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED --> + <!-- U+1008: "ဈ" MYANMAR LETTER JHA --> <Key - latin:keySpec="၍" + latin:keySpec="ဈ" latin:keyLabelFlags="fontNormal" /> - <!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA --> - <Key - latin:keySpec="ဿ" - latin:keyLabelFlags="fontNormal|autoXScale" /> - <!-- U+100F: "ဏ" MYANMAR LETTER NNA --> + <!-- U+1007: "ဇ" MYANMAR LETTER JA --> <Key - latin:keySpec="ဏ" + latin:keySpec="ဇ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1027: "ဧ" MYANMAR LETTER E --> + <!-- U+1002: "ဂ" MYANMAR LETTER GA --> <Key - latin:keySpec="ဧ" + latin:keySpec="ဂ" latin:keyLabelFlags="fontNormal" /> </case> <default> @@ -111,10 +107,6 @@ <Key latin:keySpec="စ" latin:keyLabelFlags="fontNormal" /> - <!-- U+101F: "ဟ" MYANMAR LETTER HA --> - <Key - latin:keySpec="ဟ" - latin:keyLabelFlags="fontNormal" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_myanmar3.xml b/java/res/xml/rowkeys_myanmar3.xml index 2d0d48cc7..612bcd31b 100644 --- a/java/res/xml/rowkeys_myanmar3.xml +++ b/java/res/xml/rowkeys_myanmar3.xml @@ -25,10 +25,18 @@ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > - <!-- U+1017: "ဗ" MYANMAR LETTER BA --> + <!-- U+101A: "ယ" MYANMAR LETTER YA --> <Key - latin:keySpec="ဗ" + latin:keySpec="ယ" latin:keyLabelFlags="fontNormal" /> + <!-- U+1039: "္" MYANMAR SIGN VIRAMA --> + <Key + latin:keySpec="္" + latin:keyLabelFlags="fontNormal" /> + <!-- U+1004/U+103A/U+1039: "င်္င" MYANMAR LETTER NGA/MYANMAR SIGN ASAT/MYANMAR SIGN VIRAMA --> + <Key + latin:keySpec="င်္" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> <!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA --> <Key latin:keySpec="ှ" @@ -37,33 +45,25 @@ <Key latin:keySpec="ီ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1039: "္" MYANMAR SIGN VIRAMA --> - <Key - latin:keySpec="္" - latin:keyLabelFlags="fontNormal" /> - <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA --> + <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU --> <Key - latin:keySpec="ွ" + latin:keySpec="ူ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA --> + <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA --> <Key - latin:keySpec="ံ" + latin:keySpec="ါ" latin:keyLabelFlags="fontNormal" /> <!-- U+1032: "ဲ" MYANMAR VOWEL SIGN AI --> <Key latin:keySpec="ဲ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1012: "ဒ" MYANMAR LETTER DA --> - <Key - latin:keySpec="ဒ" - latin:keyLabelFlags="fontNormal" /> - <!-- U+1013: "ဓ" MYANMAR LETTER DHA --> + <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA --> <Key - latin:keySpec="ဓ" + latin:keySpec="ံ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1002: "ဂ" MYANMAR LETTER GA --> + <!-- U+101F: "ဟ" MYANMAR LETTER HA --> <Key - latin:keySpec="ဂ" + latin:keySpec="ဟ" latin:keyLabelFlags="fontNormal" /> </case> <default> @@ -75,33 +75,44 @@ <Key latin:keySpec="ျ" latin:keyLabelFlags="fontNormal" /> - <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I --> + <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA --> <Key - latin:keySpec="ိ" + latin:keySpec="ြ" latin:keyLabelFlags="fontNormal" /> - <!-- U+103A: "်" MYANMAR SIGN ASAT --> + <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA + U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA + U+103D/U+103E: "ွှ" MYANMAR CONSONANT SIGN MEDIAL WA/MYANMAR CONSONANT SIGN MEDIAL HA --> <Key - latin:keySpec="်" + latin:keySpec="ွ" + latin:moreKeys="ှ,ွှ" latin:keyLabelFlags="fontNormal" /> - <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA --> + <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I + U+102E: "ီ" MYANMAR VOWEL SIGN II --> <Key - latin:keySpec="ါ" + latin:keySpec="ိ" + latin:moreKeys="ီ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1037: "့" MYANMAR SIGN DOT BELOW --> + <!-- U+102F: "ု" MYANMAR VOWEL SIGN U + U+1030: "ူ" MYANMAR VOWEL SIGN UU --> <Key - latin:keySpec="့" + latin:keySpec="ု" + latin:moreKeys="ူ" latin:keyLabelFlags="fontNormal" /> - <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA --> + <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA --> <Key - latin:keySpec="ြ" + latin:keySpec="ာ" latin:keyLabelFlags="fontNormal" /> - <!-- U+102F: "ု" MYANMAR VOWEL SIGN U --> + <!-- U+103A: "်" MYANMAR SIGN ASAT + U+1032: "ဲ" MYANMAR VOWEL SIGN AI --> <Key - latin:keySpec="ု" + latin:keySpec="်" + latin:moreKeys="ဲ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU --> + <!-- U+1037: "့" MYANMAR SIGN DOT BELOW + U+1036: "ံ" MYANMAR SIGN ANUSVARA --> <Key - latin:keySpec="ူ" + latin:keySpec="့" + latin:moreKeys="ံ" latin:keyLabelFlags="fontNormal" /> <!-- U+1038: "း" MYANMAR SIGN VISARGA --> <Key diff --git a/java/res/xml/rowkeys_myanmar4.xml b/java/res/xml/rowkeys_myanmar4.xml index cfd11123c..57466c565 100644 --- a/java/res/xml/rowkeys_myanmar4.xml +++ b/java/res/xml/rowkeys_myanmar4.xml @@ -25,42 +25,40 @@ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > - <!-- U+1007: "ဇ" MYANMAR LETTER JA --> + <!-- U+1025: "ဥ" MYANMAR LETTER U --> <Key - latin:keySpec="ဇ" + latin:keySpec="ဥ" latin:keyLabelFlags="fontNormal" /> - <!-- U+100C: "ဌ" MYANMAR LETTER TTHA --> - <Key - latin:keySpec="ဌ" - latin:keyLabelFlags="fontNormal" /> - <!-- U+1003: "ဃ" MYANMAR LETTER GHA --> + <!-- U+1026: "ဦ" MYANMAR LETTER UU --> <Key - latin:keySpec="ဃ" + latin:keySpec="ဦ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1020: "ဠ" MYANMAR LETTER LLA --> + <!-- U+100C: "ဌ" MYANMAR LETTER TTHA --> <Key - latin:keySpec="ဠ" + latin:keySpec="ဌ" latin:keyLabelFlags="fontNormal" /> - <!-- U+101A: "ယ" MYANMAR LETTER YA --> + <!-- U+100B: "ဋ" MYANMAR LETTER TTA --> <Key - latin:keySpec="ယ" + latin:keySpec="ဋ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1009: "ဉ" MYANMAR LETTER NYA --> + <!-- U+100D: "ဍ" MYANMAR LETTER DDA --> <Key - latin:keySpec="ဉ" + latin:keySpec="ဍ" latin:keyLabelFlags="fontNormal" /> - <!-- U+1026: "ဦ" MYANMAR LETTER UU --> + <!-- U+1020: "ဠ" MYANMAR LETTER LLA --> <Key - latin:keySpec="ဦ" + latin:keySpec="ဠ" latin:keyLabelFlags="fontNormal" /> - <!-- U+102A: "ဪ" MYANMAR LETTER AU --> + <!-- U+100B/U+1039/U+100C: "ဋ္ဌ" MYANMAR LETTER TTA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA --> <Key - latin:keySpec="ဪ" - latin:keyLabelFlags="fontNormal|autoXScale" /> - <!-- U+1051: "ၑ" MYANMAR LETTER SSA --> + latin:keySpec="ဋ္ဌ" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+100F/U+1039/U+100D: "ဏ္ဍ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER DDA + U+100F/U+1039/U+100C: "ဏ္ဌ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA --> <Key - latin:keySpec="ၑ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ဏ္ဍ" + latin:moreKeys="ဏ္ဌ" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> </case> <default> <!-- U+1016: "ဖ" MYANMAR LETTER PHA --> @@ -83,21 +81,19 @@ <Key latin:keySpec="ဘ" latin:keyLabelFlags="fontNormal" /> - <!-- U+100A: "ည" MYANMAR LETTER NNYA --> + <!-- U+100A: "ည" MYANMAR LETTER NNYA + U+1009: "ဉ" MYANMAR LETTER NYA --> <Key latin:keySpec="ည" + latin:moreKeys="ဉ" latin:keyLabelFlags="fontNormal" /> - <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA --> - <Key - latin:keySpec="ာ" - latin:keyLabelFlags="fontNormal" /> - <!-- U+1029: "ဩ" MYANMAR LETTER O --> + <!-- U+101B: "ရ" MYANMAR LETTER RA --> <Key - latin:keySpec="ဩ" + latin:keySpec="ရ" latin:keyLabelFlags="fontNormal" /> - <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE --> + <!-- U+101D: "ဝ" MYANMAR LETTER WA --> <Key - latin:keySpec="၏" + latin:keySpec="ဝ" latin:keyLabelFlags="fontNormal" /> </default> </switch> diff --git a/java/res/xml/rows_myanmar.xml b/java/res/xml/rows_myanmar.xml index 32c923dec..5de47f7b8 100644 --- a/java/res/xml/rows_myanmar.xml +++ b/java/res/xml/rows_myanmar.xml @@ -24,26 +24,25 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="9.0909%p" + latin:keyWidth="10.0%p" > <include latin:keyboardLayout="@xml/rowkeys_myanmar1" /> </Row> <Row - latin:keyWidth="9.0909%p" + latin:keyWidth="10.0%p" > <include latin:keyboardLayout="@xml/rowkeys_myanmar2" /> </Row> <Row - latin:keyWidth="9.0909%p" + latin:keyWidth="10.0%p" > <include - latin:keyXPos="4.5454%p" latin:keyboardLayout="@xml/rowkeys_myanmar3" /> </Row> <Row - latin:keyWidth="9.0909%p" + latin:keyWidth="10.0%p" > <Key latin:keyStyle="shiftKeyStyle" /> |