diff --git a/java/res/xml-sw600dp/keys_comma_period.xml b/java/res/xml-sw600dp/keys_comma_period.xml
index 5e8bbabb6d7148d9526d4229a1e6e2faf331e539..c5de9c80ba0c8a9752c0d159a7da278ab12a2c2f 100644
--- a/java/res/xml-sw600dp/keys_comma_period.xml
+++ b/java/res/xml-sw600dp/keys_comma_period.xml
@@ -38,9 +38,7 @@
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
- <case
- latin:languageCode="ar|fa"
- >
+ <default>
<Key
latin:keyLabel="!text/keylabel_for_tablet_comma"
latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
@@ -49,36 +47,12 @@
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="."
- latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
+ latin:keyLabel="!text/keylabel_for_tablet_period"
+ latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_arabic_diacritics"
+ latin:moreKeys="!text/more_keys_for_tablet_period"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
- </case>
- <case
- latin:languageCode="hy"
- >
- <!-- U+055D: "Õ" ARMENIAN COMMA -->
- <Key
- latin:keyLabel="՝"
- latin:backgroundType="functional" />
- <!-- U+0589: "Ö‰" ARMENIAN FULL STOP -->
- <Key
- latin:keyLabel="։"
- latin:keyLabelFlags="hasPopupHint"
- latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_punctuation" />
- </case>
- <default>
- <Key
- latin:keyLabel="!text/keylabel_for_tablet_comma"
- latin:moreKeys="!text/more_keys_for_tablet_comma"
- latin:backgroundType="functional" />
- <Key
- latin:keyLabel="."
- latin:moreKeys="!text/more_keys_for_period"
- latin:backgroundType="functional" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/key_nepali_traditional_period.xml b/java/res/xml/key_nepali_traditional_period.xml
deleted file mode 100644
index 1c389b00911ae95be99d04a95c5d94ee7cebb902..0000000000000000000000000000000000000000
--- a/java/res/xml/key_nepali_traditional_period.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
- API version 16 can't automatically render dotted circle for incomplete combining letter
- of Hindi. The files named res/xml/{key,keys}_nepali*.xml have this U+25CC hack, although the
- counterpart files named res/xml-v16/{key,keys}_nepali*.xml don't have this hack. -->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
- <Key
- latin:keyLabel=","
- latin:backgroundType="functional" />
- </case>
- <default>
- <!-- 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" />
- <!-- U+002E: "." FULL STOP -->
- <Key
- latin:keyStyle="baseKeyDevanagariSignVirama"
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!fixedColumnOrder!9,.,!text/more_keys_for_punctuation"
- latin:backgroundType="functional" />
- </default>
- </switch>
-</merge>
diff --git a/java/res/xml/key_period.xml b/java/res/xml/key_period.xml
index 7fc886d19ac65d947caa8cb4e4ad384d55800005..838db25c30365a8781b2c0979c8a43eea9bc3bf8 100644
--- a/java/res/xml/key_period.xml
+++ b/java/res/xml/key_period.xml
@@ -22,38 +22,27 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
- <case
- latin:languageCode="ar|fa"
- >
- <Key
- latin:keyLabel="."
- latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
- latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
- latin:moreKeys="!text/more_keys_for_arabic_diacritics"
- latin:backgroundType="functional" />
- </case>
<case
latin:languageCode="ne"
latin:keyboardLayoutSet="nepali_traditional"
>
+ <!-- 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/key_nepali_traditional_period" />
- </case>
- <case
- latin:languageCode="hy"
- >
- <!-- U+0589: "Ö‰" ARMENIAN FULL STOP -->
+ latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
<Key
- latin:keyLabel="։"
+ latin:keyStyle="baseKeyDevanagariSignVirama"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_punctuation"
latin:backgroundType="functional" />
</case>
<default>
<Key
- latin:keyLabel="."
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_punctuation"
+ latin:keyLabel="!text/keylabel_for_period"
+ latin:keyHintLabel="!text/keyhintlabel_for_period"
+ latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
+ latin:moreKeys="!text/more_keys_for_period"
latin:backgroundType="functional" />
</default>
</switch>
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
index 36a12addd5d37f71c9a7ff0d41079f507f9444c6..eb756eeabbaccb10f4621c8f6daccd226082c9ae 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
@@ -170,91 +170,94 @@ public final class KeyboardTextsSet {
/* 65 */ "more_keys_for_less_than",
/* 66 */ "more_keys_for_greater_than",
/* 67 */ "more_keys_for_arabic_diacritics",
- /* 68 */ "keyhintlabel_for_arabic_diacritics",
- /* 69 */ "keylabel_for_symbols_1",
- /* 70 */ "keylabel_for_symbols_2",
- /* 71 */ "keylabel_for_symbols_3",
- /* 72 */ "keylabel_for_symbols_4",
- /* 73 */ "keylabel_for_symbols_5",
- /* 74 */ "keylabel_for_symbols_6",
- /* 75 */ "keylabel_for_symbols_7",
- /* 76 */ "keylabel_for_symbols_8",
- /* 77 */ "keylabel_for_symbols_9",
- /* 78 */ "keylabel_for_symbols_0",
- /* 79 */ "label_to_symbol_key",
- /* 80 */ "label_to_symbol_with_microphone_key",
- /* 81 */ "additional_more_keys_for_symbols_1",
- /* 82 */ "additional_more_keys_for_symbols_2",
- /* 83 */ "additional_more_keys_for_symbols_3",
- /* 84 */ "additional_more_keys_for_symbols_4",
- /* 85 */ "additional_more_keys_for_symbols_5",
- /* 86 */ "additional_more_keys_for_symbols_6",
- /* 87 */ "additional_more_keys_for_symbols_7",
- /* 88 */ "additional_more_keys_for_symbols_8",
- /* 89 */ "additional_more_keys_for_symbols_9",
- /* 90 */ "additional_more_keys_for_symbols_0",
- /* 91 */ "more_keys_for_symbols_1",
- /* 92 */ "more_keys_for_symbols_2",
- /* 93 */ "more_keys_for_symbols_3",
- /* 94 */ "more_keys_for_symbols_4",
- /* 95 */ "more_keys_for_symbols_5",
- /* 96 */ "more_keys_for_symbols_6",
- /* 97 */ "more_keys_for_symbols_7",
- /* 98 */ "more_keys_for_symbols_8",
- /* 99 */ "more_keys_for_symbols_9",
- /* 100 */ "more_keys_for_symbols_0",
- /* 101 */ "keylabel_for_comma",
- /* 102 */ "more_keys_for_comma",
- /* 103 */ "keylabel_for_symbols_question",
- /* 104 */ "keylabel_for_symbols_semicolon",
- /* 105 */ "keylabel_for_symbols_percent",
- /* 106 */ "more_keys_for_exclamation",
- /* 107 */ "more_keys_for_question",
- /* 108 */ "more_keys_for_symbols_semicolon",
- /* 109 */ "more_keys_for_symbols_percent",
- /* 110 */ "keylabel_for_tablet_comma",
- /* 111 */ "keyhintlabel_for_tablet_comma",
- /* 112 */ "more_keys_for_tablet_comma",
- /* 113 */ "keyhintlabel_for_period",
- /* 114 */ "more_keys_for_period",
- /* 115 */ "more_keys_for_q",
- /* 116 */ "more_keys_for_x",
- /* 117 */ "keylabel_for_q",
- /* 118 */ "keylabel_for_w",
- /* 119 */ "keylabel_for_y",
- /* 120 */ "keylabel_for_x",
- /* 121 */ "keylabel_for_spanish_row2_10",
- /* 122 */ "more_keys_for_am_pm",
- /* 123 */ "settings_as_more_key",
- /* 124 */ "shortcut_as_more_key",
- /* 125 */ "action_next_as_more_key",
- /* 126 */ "action_previous_as_more_key",
- /* 127 */ "label_to_more_symbol_key",
- /* 128 */ "label_to_more_symbol_for_tablet_key",
- /* 129 */ "label_tab_key",
- /* 130 */ "label_to_phone_numeric_key",
- /* 131 */ "label_to_phone_symbols_key",
- /* 132 */ "label_time_am",
- /* 133 */ "label_time_pm",
- /* 134 */ "keylabel_for_popular_domain",
- /* 135 */ "more_keys_for_popular_domain",
- /* 136 */ "more_keys_for_smiley",
- /* 137 */ "single_laqm_raqm",
- /* 138 */ "single_laqm_raqm_rtl",
- /* 139 */ "single_raqm_laqm",
- /* 140 */ "double_laqm_raqm",
- /* 141 */ "double_laqm_raqm_rtl",
- /* 142 */ "double_raqm_laqm",
- /* 143 */ "single_lqm_rqm",
- /* 144 */ "single_9qm_lqm",
- /* 145 */ "single_9qm_rqm",
- /* 146 */ "double_lqm_rqm",
- /* 147 */ "double_9qm_lqm",
- /* 148 */ "double_9qm_rqm",
- /* 149 */ "more_keys_for_single_quote",
- /* 150 */ "more_keys_for_double_quote",
- /* 151 */ "more_keys_for_tablet_double_quote",
- /* 152 */ "emoji_key_as_more_key",
+ /* 68 */ "keylabel_for_symbols_1",
+ /* 69 */ "keylabel_for_symbols_2",
+ /* 70 */ "keylabel_for_symbols_3",
+ /* 71 */ "keylabel_for_symbols_4",
+ /* 72 */ "keylabel_for_symbols_5",
+ /* 73 */ "keylabel_for_symbols_6",
+ /* 74 */ "keylabel_for_symbols_7",
+ /* 75 */ "keylabel_for_symbols_8",
+ /* 76 */ "keylabel_for_symbols_9",
+ /* 77 */ "keylabel_for_symbols_0",
+ /* 78 */ "label_to_symbol_key",
+ /* 79 */ "label_to_symbol_with_microphone_key",
+ /* 80 */ "additional_more_keys_for_symbols_1",
+ /* 81 */ "additional_more_keys_for_symbols_2",
+ /* 82 */ "additional_more_keys_for_symbols_3",
+ /* 83 */ "additional_more_keys_for_symbols_4",
+ /* 84 */ "additional_more_keys_for_symbols_5",
+ /* 85 */ "additional_more_keys_for_symbols_6",
+ /* 86 */ "additional_more_keys_for_symbols_7",
+ /* 87 */ "additional_more_keys_for_symbols_8",
+ /* 88 */ "additional_more_keys_for_symbols_9",
+ /* 89 */ "additional_more_keys_for_symbols_0",
+ /* 90 */ "more_keys_for_symbols_1",
+ /* 91 */ "more_keys_for_symbols_2",
+ /* 92 */ "more_keys_for_symbols_3",
+ /* 93 */ "more_keys_for_symbols_4",
+ /* 94 */ "more_keys_for_symbols_5",
+ /* 95 */ "more_keys_for_symbols_6",
+ /* 96 */ "more_keys_for_symbols_7",
+ /* 97 */ "more_keys_for_symbols_8",
+ /* 98 */ "more_keys_for_symbols_9",
+ /* 99 */ "more_keys_for_symbols_0",
+ /* 100 */ "keylabel_for_comma",
+ /* 101 */ "more_keys_for_comma",
+ /* 102 */ "keylabel_for_tablet_comma",
+ /* 103 */ "keyhintlabel_for_tablet_comma",
+ /* 104 */ "more_keys_for_tablet_comma",
+ /* 105 */ "keylabel_for_period",
+ /* 106 */ "keyhintlabel_for_period",
+ /* 107 */ "more_keys_for_period",
+ /* 108 */ "keylabel_for_tablet_period",
+ /* 109 */ "keyhintlabel_for_tablet_period",
+ /* 110 */ "more_keys_for_tablet_period",
+ /* 111 */ "keylabel_for_symbols_question",
+ /* 112 */ "keylabel_for_symbols_semicolon",
+ /* 113 */ "keylabel_for_symbols_percent",
+ /* 114 */ "more_keys_for_exclamation",
+ /* 115 */ "more_keys_for_question",
+ /* 116 */ "more_keys_for_symbols_semicolon",
+ /* 117 */ "more_keys_for_symbols_percent",
+ /* 118 */ "more_keys_for_q",
+ /* 119 */ "more_keys_for_x",
+ /* 120 */ "keylabel_for_q",
+ /* 121 */ "keylabel_for_w",
+ /* 122 */ "keylabel_for_y",
+ /* 123 */ "keylabel_for_x",
+ /* 124 */ "keylabel_for_spanish_row2_10",
+ /* 125 */ "more_keys_for_am_pm",
+ /* 126 */ "settings_as_more_key",
+ /* 127 */ "shortcut_as_more_key",
+ /* 128 */ "action_next_as_more_key",
+ /* 129 */ "action_previous_as_more_key",
+ /* 130 */ "label_to_more_symbol_key",
+ /* 131 */ "label_to_more_symbol_for_tablet_key",
+ /* 132 */ "label_tab_key",
+ /* 133 */ "label_to_phone_numeric_key",
+ /* 134 */ "label_to_phone_symbols_key",
+ /* 135 */ "label_time_am",
+ /* 136 */ "label_time_pm",
+ /* 137 */ "keylabel_for_popular_domain",
+ /* 138 */ "more_keys_for_popular_domain",
+ /* 139 */ "more_keys_for_smiley",
+ /* 140 */ "single_laqm_raqm",
+ /* 141 */ "single_laqm_raqm_rtl",
+ /* 142 */ "single_raqm_laqm",
+ /* 143 */ "double_laqm_raqm",
+ /* 144 */ "double_laqm_raqm_rtl",
+ /* 145 */ "double_raqm_laqm",
+ /* 146 */ "single_lqm_rqm",
+ /* 147 */ "single_9qm_lqm",
+ /* 148 */ "single_9qm_rqm",
+ /* 149 */ "double_lqm_rqm",
+ /* 150 */ "double_9qm_lqm",
+ /* 151 */ "double_9qm_rqm",
+ /* 152 */ "more_keys_for_single_quote",
+ /* 153 */ "more_keys_for_double_quote",
+ /* 154 */ "more_keys_for_tablet_double_quote",
+ /* 155 */ "emoji_key_as_more_key",
};
private static final String EMPTY = "";
@@ -307,100 +310,105 @@ public final class KeyboardTextsSet {
/* 65 */ "!fixedColumnOrder!3,\u2039,\u2264,\u00AB",
/* 66 */ "!fixedColumnOrder!3,\u203A,\u2265,\u00BB",
/* 67 */ EMPTY,
- /* 68 */ EMPTY,
- /* 69 */ "1",
- /* 70 */ "2",
- /* 71 */ "3",
- /* 72 */ "4",
- /* 73 */ "5",
- /* 74 */ "6",
- /* 75 */ "7",
- /* 76 */ "8",
- /* 77 */ "9",
- /* 78 */ "0",
+ /* 68 */ "1",
+ /* 69 */ "2",
+ /* 70 */ "3",
+ /* 71 */ "4",
+ /* 72 */ "5",
+ /* 73 */ "6",
+ /* 74 */ "7",
+ /* 75 */ "8",
+ /* 76 */ "9",
+ /* 77 */ "0",
// Label for "switch to symbols" key.
- /* 79 */ "?123",
+ /* 78 */ "?123",
// Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
// part because it'll be appended by the code.
- /* 80 */ "123",
- /* 81~ */
+ /* 79 */ "123",
+ /* 80~ */
EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
- /* ~90 */
+ /* ~89 */
// U+00B9: "¹" SUPERSCRIPT ONE
// U+00BD: "½" VULGAR FRACTION ONE HALF
// U+2153: "â…“" VULGAR FRACTION ONE THIRD
// U+00BC: "¼" VULGAR FRACTION ONE QUARTER
// U+215B: "â…›" VULGAR FRACTION ONE EIGHTH
- /* 91 */ "\u00B9,\u00BD,\u2153,\u00BC,\u215B",
+ /* 90 */ "\u00B9,\u00BD,\u2153,\u00BC,\u215B",
// U+00B2: "²" SUPERSCRIPT TWO
// U+2154: "â…”" VULGAR FRACTION TWO THIRDS
- /* 92 */ "\u00B2,\u2154",
+ /* 91 */ "\u00B2,\u2154",
// U+00B3: "³" SUPERSCRIPT THREE
// U+00BE: "¾" VULGAR FRACTION THREE QUARTERS
// U+215C: "⅜" VULGAR FRACTION THREE EIGHTHS
- /* 93 */ "\u00B3,\u00BE,\u215C",
+ /* 92 */ "\u00B3,\u00BE,\u215C",
// U+2074: "â´" SUPERSCRIPT FOUR
- /* 94 */ "\u2074",
+ /* 93 */ "\u2074",
// U+215D: "â…" VULGAR FRACTION FIVE EIGHTHS
- /* 95 */ "\u215D",
- /* 96 */ EMPTY,
+ /* 94 */ "\u215D",
+ /* 95 */ EMPTY,
// U+215E: "â…ž" VULGAR FRACTION SEVEN EIGHTHS
- /* 97 */ "\u215E",
+ /* 96 */ "\u215E",
+ /* 97 */ EMPTY,
/* 98 */ EMPTY,
- /* 99 */ EMPTY,
// U+207F: "â¿" SUPERSCRIPT LATIN SMALL LETTER N
// U+2205: "∅" EMPTY SET
- /* 100 */ "\u207F,\u2205",
- /* 101 */ ",",
- /* 102 */ EMPTY,
- /* 103 */ "?",
- /* 104 */ ";",
- /* 105 */ "%",
+ /* 99 */ "\u207F,\u2205",
+ // Comma key
+ /* 100 */ ",",
+ /* 101 */ EMPTY,
+ /* 102 */ ",",
+ /* 103 */ EMPTY,
+ /* 104 */ EMPTY,
+ // Period key
+ /* 105 */ ".",
+ /* 106 */ EMPTY,
+ /* 107 */ "!text/more_keys_for_punctuation",
+ /* 108 */ ".",
+ /* 109 */ EMPTY,
+ // U+2026: "…" HORIZONTAL ELLIPSIS
+ /* 110 */ "\u2026",
+ /* 111 */ "?",
+ /* 112 */ ";",
+ /* 113 */ "%",
// U+00A1: "¡" INVERTED EXCLAMATION MARK
- /* 106 */ "\u00A1",
+ /* 114 */ "\u00A1",
// U+00BF: "¿" INVERTED QUESTION MARK
- /* 107 */ "\u00BF",
- /* 108 */ EMPTY,
- // U+2030: "‰" PER MILLE SIGN
- /* 109 */ "\u2030",
- /* 110 */ ",",
- /* 111~ */
- EMPTY, EMPTY, EMPTY,
- /* ~113 */
- // U+2026: "…" HORIZONTAL ELLIPSIS
- /* 114 */ "\u2026",
- /* 115 */ EMPTY,
+ /* 115 */ "\u00BF",
/* 116 */ EMPTY,
- /* 117 */ "q",
- /* 118 */ "w",
- /* 119 */ "y",
- /* 120 */ "x",
- /* 121 */ EMPTY,
- /* 122 */ "!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm",
- /* 123 */ "!icon/settings_key|!code/key_settings",
- /* 124 */ "!icon/shortcut_key|!code/key_shortcut",
- /* 125 */ "!hasLabels!,!text/label_next_key|!code/key_action_next",
- /* 126 */ "!hasLabels!,!text/label_previous_key|!code/key_action_previous",
+ // U+2030: "‰" PER MILLE SIGN
+ /* 117 */ "\u2030",
+ /* 118 */ EMPTY,
+ /* 119 */ EMPTY,
+ /* 120 */ "q",
+ /* 121 */ "w",
+ /* 122 */ "y",
+ /* 123 */ "x",
+ /* 124 */ EMPTY,
+ /* 125 */ "!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm",
+ /* 126 */ "!icon/settings_key|!code/key_settings",
+ /* 127 */ "!icon/shortcut_key|!code/key_shortcut",
+ /* 128 */ "!hasLabels!,!text/label_next_key|!code/key_action_next",
+ /* 129 */ "!hasLabels!,!text/label_previous_key|!code/key_action_previous",
// Label for "switch to more symbol" modifier key. Must be short to fit on key!
- /* 127 */ "= \\ <",
+ /* 130 */ "= \\ <",
// Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key!
- /* 128 */ "~ [ <",
+ /* 131 */ "~ [ <",
// Label for "Tab" key. Must be short to fit on key!
- /* 129 */ "Tab",
+ /* 132 */ "Tab",
// Label for "switch to phone numeric" key. Must be short to fit on key!
- /* 130 */ "123",
+ /* 133 */ "123",
// Label for "switch to phone symbols" key. Must be short to fit on key!
// U+FF0A: "＊" FULLWIDTH ASTERISK
// U+FF03: "＃" FULLWIDTH NUMBER SIGN
- /* 131 */ "\uFF0A\uFF03",
+ /* 134 */ "\uFF0A\uFF03",
// Key label for "ante meridiem"
- /* 132 */ "AM",
+ /* 135 */ "AM",
// Key label for "post meridiem"
- /* 133 */ "PM",
- /* 134 */ ".com",
+ /* 136 */ "PM",
+ /* 137 */ ".com",
// popular web domains for the locale - most popular, displayed on the keyboard
- /* 135 */ "!hasLabels!,.net,.org,.gov,.edu",
- /* 136 */ "!fixedColumnOrder!5,!hasLabels!,=-O|=-O ,:-P|:-P ,;-)|;-) ,:-(|:-( ,:-)|:-) ,:-!|:-! ,:-$|:-$ ,B-)|B-) ,:O|:O ,:-*|:-* ,:-D|:-D ,:\'(|:\'( ,:-\\\\|:-\\\\ ,O:-)|O:-) ,:-[|:-[ ",
+ /* 138 */ "!hasLabels!,.net,.org,.gov,.edu",
+ /* 139 */ "!fixedColumnOrder!5,!hasLabels!,=-O|=-O ,:-P|:-P ,;-)|;-) ,:-(|:-( ,:-)|:-) ,:-!|:-! ,:-$|:-$ ,B-)|B-) ,:O|:O ,:-*|:-* ,:-D|:-D ,:\'(|:\'( ,:-\\\\|:-\\\\ ,O:-)|O:-) ,:-[|:-[ ",
// U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
// U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
@@ -422,25 +430,25 @@ public final class KeyboardTextsSet {
// The following each quotation mark pair consist of
// <opening quotation mark>, <closing quotation mark>
// and is named after (single|double)_<opening quotation mark>_<closing quotation mark>.
- /* 137 */ "\u2039,\u203A",
- /* 138 */ "\u2039|\u203A,\u203A|\u2039",
- /* 139 */ "\u203A,\u2039",
- /* 140 */ "\u00AB,\u00BB",
- /* 141 */ "\u00AB|\u00BB,\u00BB|\u00AB",
- /* 142 */ "\u00BB,\u00AB",
+ /* 140 */ "\u2039,\u203A",
+ /* 141 */ "\u2039|\u203A,\u203A|\u2039",
+ /* 142 */ "\u203A,\u2039",
+ /* 143 */ "\u00AB,\u00BB",
+ /* 144 */ "\u00AB|\u00BB,\u00BB|\u00AB",
+ /* 145 */ "\u00BB,\u00AB",
// The following each quotation mark triplet consists of
// <another quotation mark>, <opening quotation mark>, <closing quotation mark>
// and is named after (single|double)_<opening quotation mark>_<closing quotation mark>.
- /* 143 */ "\u201A,\u2018,\u2019",
- /* 144 */ "\u2019,\u201A,\u2018",
- /* 145 */ "\u2018,\u201A,\u2019",
- /* 146 */ "\u201E,\u201C,\u201D",
- /* 147 */ "\u201D,\u201E,\u201C",
- /* 148 */ "\u201C,\u201E,\u201D",
- /* 149 */ "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes",
- /* 150 */ "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes",
- /* 151 */ "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes",
- /* 152 */ "!icon/emoji_key|!code/key_emoji",
+ /* 146 */ "\u201A,\u2018,\u2019",
+ /* 147 */ "\u2019,\u201A,\u2018",
+ /* 148 */ "\u2018,\u201A,\u2019",
+ /* 149 */ "\u201E,\u201C,\u201D",
+ /* 150 */ "\u201D,\u201E,\u201C",
+ /* 151 */ "\u201C,\u201E,\u201D",
+ /* 152 */ "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes",
+ /* 153 */ "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes",
+ /* 154 */ "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes",
+ /* 155 */ "!icon/emoji_key|!code/key_emoji",
};
/* Language af: Afrikaans */
@@ -555,67 +563,73 @@ public final class KeyboardTextsSet {
// In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label.
// Note: The space character is needed as a preceding letter to draw Arabic diacritics characters correctly.
/* 67 */ "!fixedColumnOrder!7, \u0655|\u0655, \u0654|\u0654, \u0652|\u0652, \u064D|\u064D, \u064C|\u064C, \u064B|\u064B, \u0651|\u0651, \u0656|\u0656, \u0670|\u0670, \u0653|\u0653, \u0650|\u0650, \u064F|\u064F, \u064E|\u064E,\u0640\u0640\u0640|\u0640",
- /* 68 */ "\u0651",
// U+0661: "Ù¡" ARABIC-INDIC DIGIT ONE
- /* 69 */ "\u0661",
+ /* 68 */ "\u0661",
// U+0662: "Ù¢" ARABIC-INDIC DIGIT TWO
- /* 70 */ "\u0662",
+ /* 69 */ "\u0662",
// U+0663: "Ù£" ARABIC-INDIC DIGIT THREE
- /* 71 */ "\u0663",
+ /* 70 */ "\u0663",
// U+0664: "Ù¤" ARABIC-INDIC DIGIT FOUR
- /* 72 */ "\u0664",
+ /* 71 */ "\u0664",
// U+0665: "Ù¥" ARABIC-INDIC DIGIT FIVE
- /* 73 */ "\u0665",
+ /* 72 */ "\u0665",
// U+0666: "Ù¦" ARABIC-INDIC DIGIT SIX
- /* 74 */ "\u0666",
+ /* 73 */ "\u0666",
// U+0667: "Ù§" ARABIC-INDIC DIGIT SEVEN
- /* 75 */ "\u0667",
+ /* 74 */ "\u0667",
// U+0668: "Ù¨" ARABIC-INDIC DIGIT EIGHT
- /* 76 */ "\u0668",
+ /* 75 */ "\u0668",
// U+0669: "Ù©" ARABIC-INDIC DIGIT NINE
- /* 77 */ "\u0669",
+ /* 76 */ "\u0669",
// U+0660: "Ù " ARABIC-INDIC DIGIT ZERO
- /* 78 */ "\u0660",
+ /* 77 */ "\u0660",
// Label for "switch to symbols" key.
// U+061F: "ØŸ" ARABIC QUESTION MARK
- /* 79 */ "\u0663\u0662\u0661\u061F",
+ /* 78 */ "\u0663\u0662\u0661\u061F",
// Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
// part because it'll be appended by the code.
- /* 80 */ "\u0663\u0662\u0661",
- /* 81 */ "1",
- /* 82 */ "2",
- /* 83 */ "3",
- /* 84 */ "4",
- /* 85 */ "5",
- /* 86 */ "6",
- /* 87 */ "7",
- /* 88 */ "8",
- /* 89 */ "9",
+ /* 79 */ "\u0663\u0662\u0661",
+ /* 80 */ "1",
+ /* 81 */ "2",
+ /* 82 */ "3",
+ /* 83 */ "4",
+ /* 84 */ "5",
+ /* 85 */ "6",
+ /* 86 */ "7",
+ /* 87 */ "8",
+ /* 88 */ "9",
// U+066B: "Ù«" ARABIC DECIMAL SEPARATOR
// U+066C: "Ù¬" ARABIC THOUSANDS SEPARATOR
- /* 90 */ "0,\u066B,\u066C",
- /* 91~ */
+ /* 89 */ "0,\u066B,\u066C",
+ /* 90~ */
null, null, null, null, null, null, null, null, null, null,
- /* ~100 */
+ /* ~99 */
// U+060C: "،" ARABIC COMMA
- /* 101 */ "\u060C",
- /* 102 */ "\\,",
- /* 103 */ "\u061F",
- /* 104 */ "\u061B",
- // U+066A: "Ùª" ARABIC PERCENT SIGN
- /* 105 */ "\u066A",
- /* 106 */ null,
- // U+00BF: "¿" INVERTED QUESTION MARK
- /* 107 */ "?,\u00BF",
- /* 108 */ ";",
- // U+2030: "‰" PER MILLE SIGN
- /* 109 */ "\\%,\u2030",
+ /* 100 */ "\u060C",
+ /* 101 */ "\\,",
// U+061F: "ØŸ" ARABIC QUESTION MARK
// U+060C: "،" ARABIC COMMA
// U+061B: "Ø›" ARABIC SEMICOLON
- /* 110 */ "\u060C",
+ /* 102 */ "\u060C",
+ /* 103 */ "\u061F",
+ /* 104 */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,/,\",\'",
+ /* 105 */ null,
+ // U+0651: "Ù‘" ARABIC SHADDA
+ /* 106 */ "\u0651",
+ /* 107 */ "!text/more_keys_for_arabic_diacritics",
+ /* 108 */ null,
+ /* 109 */ "\u0651",
+ /* 110 */ "!text/more_keys_for_arabic_diacritics",
/* 111 */ "\u061F",
- /* 112 */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,/,\",\'",
+ /* 112 */ "\u061B",
+ // U+066A: "Ùª" ARABIC PERCENT SIGN
+ /* 113 */ "\u066A",
+ /* 114 */ null,
+ // U+00BF: "¿" INVERTED QUESTION MARK
+ /* 115 */ "?,\u00BF",
+ /* 116 */ ";",
+ // U+2030: "‰" PER MILLE SIGN
+ /* 117 */ "\\%,\u2030",
};
/* Language az: Azerbaijani */
@@ -789,14 +803,15 @@ public final class KeyboardTextsSet {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null, null, null, null,
- /* ~113 */
- /* 114 */ "?,\u00B7",
- /* 115~ */
- null, null, null, null, null, null,
- /* ~120 */
+ null, null,
+ /* ~106 */
+ /* 107 */ "?,\u00B7",
+ /* 108~ */
+ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+ null,
+ /* ~123 */
// U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- /* 121 */ "\u00E7",
+ /* 124 */ "\u00E7",
};
/* Language cs: Czech */
@@ -1195,20 +1210,20 @@ public final class KeyboardTextsSet {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null,
- /* ~114 */
- /* 115 */ "q",
- /* 116 */ "x",
+ null, null, null, null, null, null, null, null,
+ /* ~117 */
+ /* 118 */ "q",
+ /* 119 */ "x",
// U+015D: "Å" LATIN SMALL LETTER S WITH CIRCUMFLEX
- /* 117 */ "\u015D",
+ /* 120 */ "\u015D",
// U+011D: "Ä" LATIN SMALL LETTER G WITH CIRCUMFLEX
- /* 118 */ "\u011D",
+ /* 121 */ "\u011D",
// U+016D: "Å" LATIN SMALL LETTER U WITH BREVE
- /* 119 */ "\u016D",
+ /* 122 */ "\u016D",
// U+0109: "ĉ" LATIN SMALL LETTER C WITH CIRCUMFLEX
- /* 120 */ "\u0109",
+ /* 123 */ "\u0109",
// U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX
- /* 121 */ "\u0135",
+ /* 124 */ "\u0135",
};
/* Language es: Spanish */
@@ -1277,10 +1292,10 @@ public final class KeyboardTextsSet {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null,
- /* ~120 */
+ null, null, null, null,
+ /* ~123 */
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
- /* 121 */ "\u00F1",
+ /* 124 */ "\u00F1",
};
/* Language et: Estonian */
@@ -1452,71 +1467,74 @@ public final class KeyboardTextsSet {
// In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label.
// Note: The space character is needed as a preceding letter to draw Arabic diacritics characters correctly.
/* 67 */ "!fixedColumnOrder!7, \u0655|\u0655, \u0652|\u0652, \u0651|\u0651, \u064C|\u064C, \u064D|\u064D, \u064B|\u064B, \u0654|\u0654, \u0656|\u0656, \u0670|\u0670, \u0653|\u0653, \u064F|\u064F, \u0650|\u0650, \u064E|\u064E,\u0640\u0640\u0640|\u0640",
- /* 68 */ "\u064B",
// U+06F1: "Û±" EXTENDED ARABIC-INDIC DIGIT ONE
- /* 69 */ "\u06F1",
+ /* 68 */ "\u06F1",
// U+06F2: "Û²" EXTENDED ARABIC-INDIC DIGIT TWO
- /* 70 */ "\u06F2",
+ /* 69 */ "\u06F2",
// U+06F3: "Û³" EXTENDED ARABIC-INDIC DIGIT THREE
- /* 71 */ "\u06F3",
+ /* 70 */ "\u06F3",
// U+06F4: "Û´" EXTENDED ARABIC-INDIC DIGIT FOUR
- /* 72 */ "\u06F4",
+ /* 71 */ "\u06F4",
// U+06F5: "Ûµ" EXTENDED ARABIC-INDIC DIGIT FIVE
- /* 73 */ "\u06F5",
+ /* 72 */ "\u06F5",
// U+06F6: "Û¶" EXTENDED ARABIC-INDIC DIGIT SIX
- /* 74 */ "\u06F6",
+ /* 73 */ "\u06F6",
// U+06F7: "Û·" EXTENDED ARABIC-INDIC DIGIT SEVEN
- /* 75 */ "\u06F7",
+ /* 74 */ "\u06F7",
// U+06F8: "Û¸" EXTENDED ARABIC-INDIC DIGIT EIGHT
- /* 76 */ "\u06F8",
+ /* 75 */ "\u06F8",
// U+06F9: "Û¹" EXTENDED ARABIC-INDIC DIGIT NINE
- /* 77 */ "\u06F9",
+ /* 76 */ "\u06F9",
// U+06F0: "Û°" EXTENDED ARABIC-INDIC DIGIT ZERO
- /* 78 */ "\u06F0",
+ /* 77 */ "\u06F0",
// Label for "switch to symbols" key.
// U+061F: "ØŸ" ARABIC QUESTION MARK
- /* 79 */ "\u06F3\u06F2\u06F1\u061F",
+ /* 78 */ "\u06F3\u06F2\u06F1\u061F",
// Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
// part because it'll be appended by the code.
- /* 80 */ "\u06F3\u06F2\u06F1",
- /* 81 */ "1",
- /* 82 */ "2",
- /* 83 */ "3",
- /* 84 */ "4",
- /* 85 */ "5",
- /* 86 */ "6",
- /* 87 */ "7",
- /* 88 */ "8",
- /* 89 */ "9",
+ /* 79 */ "\u06F3\u06F2\u06F1",
+ /* 80 */ "1",
+ /* 81 */ "2",
+ /* 82 */ "3",
+ /* 83 */ "4",
+ /* 84 */ "5",
+ /* 85 */ "6",
+ /* 86 */ "7",
+ /* 87 */ "8",
+ /* 88 */ "9",
// U+066B: "Ù«" ARABIC DECIMAL SEPARATOR
// U+066C: "Ù¬" ARABIC THOUSANDS SEPARATOR
- /* 90 */ "0,\u066B,\u066C",
- /* 91~ */
+ /* 89 */ "0,\u066B,\u066C",
+ /* 90~ */
null, null, null, null, null, null, null, null, null, null,
- /* ~100 */
+ /* ~99 */
// U+060C: "،" ARABIC COMMA
- /* 101 */ "\u060C",
- /* 102 */ "\\,",
- /* 103 */ "\u061F",
- /* 104 */ "\u061B",
- // U+066A: "Ùª" ARABIC PERCENT SIGN
- /* 105 */ "\u066A",
- /* 106 */ null,
- // U+00BF: "¿" INVERTED QUESTION MARK
- /* 107 */ "?,\u00BF",
- /* 108 */ ";",
- // U+2030: "‰" PER MILLE SIGN
- /* 109 */ "\\%,\u2030",
+ /* 100 */ "\u060C",
+ /* 101 */ "\\,",
// U+060C: "،" ARABIC COMMA
// U+061B: "Ø›" ARABIC SEMICOLON
// U+061F: "ØŸ" ARABIC QUESTION MARK
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
- /* 110 */ "\u060C",
+ /* 102 */ "\u060C",
+ /* 103 */ "\u061F",
+ /* 104 */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,/,\u00AB|\u00BB,\u00BB|\u00AB",
+ /* 105 */ null,
+ /* 106 */ "\u061F",
+ /* 107 */ "\u061F,?",
+ /* 108 */ null,
+ /* 109 */ "\u064B",
+ /* 110 */ "!text/more_keys_for_arabic_diacritics",
/* 111 */ "\u061F",
- /* 112 */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,/,\u00AB|\u00BB,\u00BB|\u00AB",
- /* 113 */ "\u061F",
- /* 114 */ "\u061F,?",
+ /* 112 */ "\u061B",
+ // U+066A: "Ùª" ARABIC PERCENT SIGN
+ /* 113 */ "\u066A",
+ /* 114 */ null,
+ // U+00BF: "¿" INVERTED QUESTION MARK
+ /* 115 */ "?,\u00BF",
+ /* 116 */ ";",
+ // U+2030: "‰" PER MILLE SIGN
+ /* 117 */ "\\%,\u2030",
};
/* Language fi: Finnish */
@@ -1655,43 +1673,43 @@ public final class KeyboardTextsSet {
// U+20B9: "₹" INDIAN RUPEE SIGN
/* 57 */ "\u20B9",
/* 58~ */
- null, null, null, null, null, null, null, null, null, null, null,
- /* ~68 */
+ null, null, null, null, null, null, null, null, null, null,
+ /* ~67 */
// U+0967: "१" DEVANAGARI DIGIT ONE
- /* 69 */ "\u0967",
+ /* 68 */ "\u0967",
// U+0968: "२" DEVANAGARI DIGIT TWO
- /* 70 */ "\u0968",
+ /* 69 */ "\u0968",
// U+0969: "३" DEVANAGARI DIGIT THREE
- /* 71 */ "\u0969",
+ /* 70 */ "\u0969",
// U+096A: "४" DEVANAGARI DIGIT FOUR
- /* 72 */ "\u096A",
+ /* 71 */ "\u096A",
// U+096B: "५" DEVANAGARI DIGIT FIVE
- /* 73 */ "\u096B",
+ /* 72 */ "\u096B",
// U+096C: "६" DEVANAGARI DIGIT SIX
- /* 74 */ "\u096C",
+ /* 73 */ "\u096C",
// U+096D: "à¥" DEVANAGARI DIGIT SEVEN
- /* 75 */ "\u096D",
+ /* 74 */ "\u096D",
// U+096E: "८" DEVANAGARI DIGIT EIGHT
- /* 76 */ "\u096E",
+ /* 75 */ "\u096E",
// U+096F: "९" DEVANAGARI DIGIT NINE
- /* 77 */ "\u096F",
+ /* 76 */ "\u096F",
// U+0966: "०" DEVANAGARI DIGIT ZERO
- /* 78 */ "\u0966",
+ /* 77 */ "\u0966",
// Label for "switch to symbols" key.
- /* 79 */ "?\u0967\u0968\u0969",
+ /* 78 */ "?\u0967\u0968\u0969",
// Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
// part because it'll be appended by the code.
- /* 80 */ "\u0967\u0968\u0969",
- /* 81 */ "1",
- /* 82 */ "2",
- /* 83 */ "3",
- /* 84 */ "4",
- /* 85 */ "5",
- /* 86 */ "6",
- /* 87 */ "7",
- /* 88 */ "8",
- /* 89 */ "9",
- /* 90 */ "0",
+ /* 79 */ "\u0967\u0968\u0969",
+ /* 80 */ "1",
+ /* 81 */ "2",
+ /* 82 */ "3",
+ /* 83 */ "4",
+ /* 84 */ "5",
+ /* 85 */ "6",
+ /* 86 */ "7",
+ /* 87 */ "8",
+ /* 88 */ "9",
+ /* 89 */ "0",
};
/* Language hr: Croatian */
@@ -1805,15 +1823,32 @@ public final class KeyboardTextsSet {
/* 60~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
- null,
- /* ~105 */
+ null, null, null, null, null, null, null, null, null, null, null, null,
+ /* ~101 */
+ // U+058F: "Ö" ARMENIAN DRAM SIGN
+ // TODO: Enable this when we have glyph for the following letter
+ // <string name="keylabel_for_currency">֏</string>
+ //
+ // U+055D: "Õ" ARMENIAN COMMA
+ /* 102 */ "\u055D",
+ /* 103 */ null,
+ /* 104 */ null,
+ // U+0589: "Ö‰" ARMENIAN FULL STOP
+ /* 105 */ "\u0589",
+ /* 106 */ null,
+ /* 107 */ null,
+ /* 108 */ "\u0589",
+ /* 109 */ null,
+ /* 110 */ "!text/more_keys_for_punctuation",
+ /* 111~ */
+ null, null, null,
+ /* ~113 */
// U+055C: "՜" ARMENIAN EXCLAMATION MARK
// U+00A1: "¡" INVERTED EXCLAMATION MARK
- /* 106 */ "\u055C,\u00A1",
+ /* 114 */ "\u055C,\u00A1",
// U+055E: "Õž" ARMENIAN QUESTION MARK
// U+00BF: "¿" INVERTED QUESTION MARK
- /* 107 */ "\u055E,\u00BF",
+ /* 115 */ "\u055E,\u00BF",
};
/* Language is: Icelandic */
@@ -2445,43 +2480,43 @@ public final class KeyboardTextsSet {
// U+0930/U+0941/U+002E "रà¥." NEPALESE RUPEE SIGN
/* 57 */ "\u0930\u0941.",
/* 58~ */
- null, null, null, null, null, null, null, null, null, null, null,
- /* ~68 */
+ null, null, null, null, null, null, null, null, null, null,
+ /* ~67 */
// U+0967: "१" DEVANAGARI DIGIT ONE
- /* 69 */ "\u0967",
+ /* 68 */ "\u0967",
// U+0968: "२" DEVANAGARI DIGIT TWO
- /* 70 */ "\u0968",
+ /* 69 */ "\u0968",
// U+0969: "३" DEVANAGARI DIGIT THREE
- /* 71 */ "\u0969",
+ /* 70 */ "\u0969",
// U+096A: "४" DEVANAGARI DIGIT FOUR
- /* 72 */ "\u096A",
+ /* 71 */ "\u096A",
// U+096B: "५" DEVANAGARI DIGIT FIVE
- /* 73 */ "\u096B",
+ /* 72 */ "\u096B",
// U+096C: "६" DEVANAGARI DIGIT SIX
- /* 74 */ "\u096C",
+ /* 73 */ "\u096C",
// U+096D: "à¥" DEVANAGARI DIGIT SEVEN
- /* 75 */ "\u096D",
+ /* 74 */ "\u096D",
// U+096E: "८" DEVANAGARI DIGIT EIGHT
- /* 76 */ "\u096E",
+ /* 75 */ "\u096E",
// U+096F: "९" DEVANAGARI DIGIT NINE
- /* 77 */ "\u096F",
+ /* 76 */ "\u096F",
// U+0966: "०" DEVANAGARI DIGIT ZERO
- /* 78 */ "\u0966",
+ /* 77 */ "\u0966",
// Label for "switch to symbols" key.
- /* 79 */ "?\u0967\u0968\u0969",
+ /* 78 */ "?\u0967\u0968\u0969",
// Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
// part because it'll be appended by the code.
- /* 80 */ "\u0967\u0968\u0969",
- /* 81 */ "1",
- /* 82 */ "2",
- /* 83 */ "3",
- /* 84 */ "4",
- /* 85 */ "5",
- /* 86 */ "6",
- /* 87 */ "7",
- /* 88 */ "8",
- /* 89 */ "9",
- /* 90 */ "0",
+ /* 79 */ "\u0967\u0968\u0969",
+ /* 80 */ "1",
+ /* 81 */ "2",
+ /* 82 */ "3",
+ /* 83 */ "4",
+ /* 84 */ "5",
+ /* 85 */ "6",
+ /* 86 */ "7",
+ /* 87 */ "8",
+ /* 88 */ "9",
+ /* 89 */ "0",
};
/* Language nl: Dutch */
diff --git a/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml
index 010459fd2306a475c709ae6110bcca65b14c2343..f8050a3953b236414458eaee7e6f655756de4efc 100644
--- a/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml
@@ -65,6 +65,11 @@
<!-- U+060C: "،" ARABIC COMMA -->
<string name="keylabel_for_comma">،</string>
<string name="more_keys_for_comma">"\\,"</string>
+ <!-- U+0651: "Ù‘" ARABIC SHADDA -->
+ <string name="keyhintlabel_for_period">ّ</string>
+ <string name="more_keys_for_period">!text/more_keys_for_arabic_diacritics</string>
+ <string name="keyhintlabel_for_tablet_period">ّ</string>
+ <string name="more_keys_for_tablet_period">!text/more_keys_for_arabic_diacritics</string>
<string name="keylabel_for_symbols_question">؟</string>
<string name="keylabel_for_symbols_semicolon">؛</string>
<!-- U+066A: "Ùª" ARABIC PERCENT SIGN -->
@@ -119,5 +124,4 @@
<!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
<!-- Note: The space character is needed as a preceding letter to draw Arabic diacritics characters correctly. -->
<string name="more_keys_for_arabic_diacritics">"!fixedColumnOrder!7, ٕ|ٕ, ٔ|ٔ, ْ|ْ, ٍ|ٍ, ٌ|ٌ, ً|ً, ّ|ّ, ٖ|ٖ, ٰ|ٰ, ٓ|ٓ, ِ|ِ, ُ|ُ, َ|َ,ـــ|ـ"</string>
- <string name="keyhintlabel_for_arabic_diacritics">ّ</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml
index 9a46ae15a843c6cc5ea99019ffbaa53356b26b88..dd833f0ebde6dcb99b7a3a398f9f301e4d55f7ce 100644
--- a/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml
@@ -65,6 +65,11 @@
<!-- U+060C: "،" ARABIC COMMA -->
<string name="keylabel_for_comma">،</string>
<string name="more_keys_for_comma">"\\,"</string>
+ <!-- U+064B: "Ù‹" ARABIC FATHATAN -->
+ <string name="keyhintlabel_for_period">ً</string>
+ <string name="more_keys_for_period">!text/more_keys_for_arabic_diacritics</string>
+ <string name="keyhintlabel_for_tablet_period">ً</string>
+ <string name="more_keys_for_tablet_period">!text/more_keys_for_arabic_diacritics</string>
<string name="keylabel_for_symbols_question">؟</string>
<string name="keylabel_for_symbols_semicolon">؛</string>
<!-- U+066A: "Ùª" ARABIC PERCENT SIGN -->
@@ -128,5 +133,4 @@
<!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
<!-- Note: The space character is needed as a preceding letter to draw Arabic diacritics characters correctly. -->
<string name="more_keys_for_arabic_diacritics">"!fixedColumnOrder!7, ٕ|ٕ, ْ|ْ, ّ|ّ, ٌ|ٌ, ٍ|ٍ, ً|ً, ٔ|ٔ, ٖ|ٖ, ٰ|ٰ, ٓ|ٓ, ُ|ُ, ِ|ِ, َ|َ,ـــ|ـ"</string>
- <string name="keyhintlabel_for_arabic_diacritics">ً</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-hy/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hy/donottranslate-more-keys.xml
index 67072ec78656a3b469f6b54572c04d3bd329258a..a94d50e53d1e42287310479c70c73f430c2fe463 100644
--- a/tools/make-keyboard-text/res/values-hy/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-hy/donottranslate-more-keys.xml
@@ -37,4 +37,10 @@
<!-- TODO: Enable this when we have glyph for the following letter
<string name="keylabel_for_currency">֏</string>
-->
+ <!-- U+055D: "Õ" ARMENIAN COMMA -->
+ <string name="keylabel_for_tablet_comma">՝</string>
+ <!-- U+0589: "Ö‰" ARMENIAN FULL STOP -->
+ <string name="keylabel_for_period">։</string>
+ <string name="keylabel_for_tablet_period">։</string>
+ <string name="more_keys_for_tablet_period">!text/more_keys_for_punctuation</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
index 9b74416cb213b26577dd3a14f724c296fa44e07d..ebe2fdf952d8956608d4d4e064cedd552067701e 100644
--- a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
@@ -109,7 +109,6 @@
<string name="more_keys_for_less_than">!fixedColumnOrder!3,‹,≤,«</string>
<string name="more_keys_for_greater_than">!fixedColumnOrder!3,›,≥,»</string>
<string name="more_keys_for_arabic_diacritics"></string>
- <string name="keyhintlabel_for_arabic_diacritics"></string>
<string name="keylabel_for_symbols_1">1</string>
<string name="keylabel_for_symbols_2">2</string>
<string name="keylabel_for_symbols_3">3</string>
@@ -160,8 +159,20 @@
<!-- U+207F: "â¿" SUPERSCRIPT LATIN SMALL LETTER N
U+2205: "∅" EMPTY SET -->
<string name="more_keys_for_symbols_0">ⁿ,∅</string>
+ <!-- Comma key -->
<string name="keylabel_for_comma">,</string>
<string name="more_keys_for_comma"></string>
+ <string name="keylabel_for_tablet_comma">,</string>
+ <string name="keyhintlabel_for_tablet_comma"></string>
+ <string name="more_keys_for_tablet_comma"></string>
+ <!-- Period key -->
+ <string name="keylabel_for_period">.</string>
+ <string name="keyhintlabel_for_period"></string>
+ <string name="more_keys_for_period">!text/more_keys_for_punctuation</string>
+ <string name="keylabel_for_tablet_period">.</string>
+ <string name="keyhintlabel_for_tablet_period"></string>
+ <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
+ <string name="more_keys_for_tablet_period">…</string>
<string name="keylabel_for_symbols_question">\?</string>
<string name="keylabel_for_symbols_semicolon">;</string>
<string name="keylabel_for_symbols_percent">%</string>
@@ -172,12 +183,6 @@
<string name="more_keys_for_symbols_semicolon"></string>
<!-- U+2030: "‰" PER MILLE SIGN -->
<string name="more_keys_for_symbols_percent">‰</string>
- <string name="keylabel_for_tablet_comma">,</string>
- <string name="keyhintlabel_for_tablet_comma"></string>
- <string name="more_keys_for_tablet_comma"></string>
- <string name="keyhintlabel_for_period"></string>
- <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
- <string name="more_keys_for_period">…</string>
<string name="more_keys_for_q"></string>
<string name="more_keys_for_x"></string>
<string name="keylabel_for_q">q</string>