diff options
6 files changed, 43 insertions, 12 deletions
diff --git a/java/res/xml-sw600dp/rowkeys_symbols2.xml b/java/res/xml-sw600dp/rowkeys_symbols2.xml index 7d7dcfe31..14abb42f9 100644 --- a/java/res/xml-sw600dp/rowkeys_symbols2.xml +++ b/java/res/xml-sw600dp/rowkeys_symbols2.xml @@ -62,10 +62,11 @@ latin:keyLabel="*" latin:moreKeys="!text/more_keys_for_star" /> <!-- U+2013: "–" EN DASH - U+2014: "—" EM DASH --> + U+2014: "—" EM DASH + U+00B7: "·" MIDDLE DOT --> <Key latin:keyLabel="-" - latin:moreKeys="_,–,—" /> + latin:moreKeys="_,–,—,·" /> <Key latin:keyLabel="+" latin:moreKeys="!text/more_keys_for_plus" /> diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml index d3c1278da..3e27f1579 100644 --- a/java/res/xml/rowkeys_symbols2.xml +++ b/java/res/xml/rowkeys_symbols2.xml @@ -54,10 +54,11 @@ latin:keyLabel="*" latin:moreKeys="!text/more_keys_for_star" /> <!-- U+2013: "–" EN DASH - U+2014: "—" EM DASH --> + U+2014: "—" EM DASH + U+00B7: "·" MIDDLE DOT --> <Key latin:keyLabel="-" - latin:moreKeys="_,–,—" /> + latin:moreKeys="_,–,—,·" /> <Key latin:keyLabel="+" latin:moreKeys="!text/more_keys_for_plus" /> diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java index 00cb8355d..7bb7442f3 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java @@ -374,8 +374,7 @@ public final class KeyboardTextsSet { /* 115 */ "w", /* 116 */ "y", /* 117 */ "x", - // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE - /* 118 */ "\u00F1", + /* 118 */ EMPTY, /* 119 */ "!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm", /* 120 */ "!icon/settings_key|!code/key_settings", /* 121 */ "!icon/shortcut_key|!code/key_shortcut", @@ -777,9 +776,28 @@ public final class KeyboardTextsSet { /* 8~ */ null, null, null, null, null, null, /* ~13 */ - // U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT + // U+00B7: "·" MIDDLE DOT // U+0142: "ł" LATIN SMALL LETTER L WITH STROKE - /* 14 */ "\u0140,\u0142", + /* 14 */ "l\u00B7l,\u0142", + /* 15~ */ + null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null, + /* ~52 */ + // U+00B7: "·" MIDDLE DOT + /* 53 */ "!fixedColumnOrder!9,\u00B7,\",\',#,-,:,!,\\,,?,@,&,\\%,+,;,/,(,)", + /* 54~ */ + null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null, null, + /* ~107 */ + /* 108 */ "?,\u00B7", + /* 109~ */ + null, null, null, null, null, null, null, null, null, + /* ~117 */ + // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA + /* 118 */ "\u00E7", }; /* Language cs: Czech */ @@ -1254,6 +1272,11 @@ public final class KeyboardTextsSet { /* 109 */ "\"", /* 110 */ "\'", /* 111 */ "\'", + /* 112~ */ + null, null, null, null, null, null, + /* ~117 */ + // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE + /* 118 */ "\u00F1", }; /* Language et: Estonian */ diff --git a/tools/maketext/res/values-ca/donottranslate-more-keys.xml b/tools/maketext/res/values-ca/donottranslate-more-keys.xml index baa23bf9c..8624dfb65 100644 --- a/tools/maketext/res/values-ca/donottranslate-more-keys.xml +++ b/tools/maketext/res/values-ca/donottranslate-more-keys.xml @@ -67,7 +67,12 @@ U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE U+010D: "č" LATIN SMALL LETTER C WITH CARON --> <string name="more_keys_for_c">ç,ć,č</string> - <!-- U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT + <!-- U+00B7: "·" MIDDLE DOT U+0142: "ł" LATIN SMALL LETTER L WITH STROKE --> - <string name="more_keys_for_l">ŀ,ł</string> + <string name="more_keys_for_l">l·l,ł</string> + <!-- U+00B7: "·" MIDDLE DOT --> + <string name="more_keys_for_punctuation">"!fixedColumnOrder!9,·,\",\',#,-,:,!,\\,,\?,\@,&,\\%,+,;,/,(,)"</string> + <string name="more_keys_for_tablet_period">\?,·</string> + <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA --> + <string name="keylabel_for_spanish_row2_10">ç</string> </resources> diff --git a/tools/maketext/res/values-es/donottranslate-more-keys.xml b/tools/maketext/res/values-es/donottranslate-more-keys.xml index 961193bfa..0e58c1440 100644 --- a/tools/maketext/res/values-es/donottranslate-more-keys.xml +++ b/tools/maketext/res/values-es/donottranslate-more-keys.xml @@ -67,6 +67,8 @@ U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE U+010D: "č" LATIN SMALL LETTER C WITH CARON --> <string name="more_keys_for_c">ç,ć,č</string> + <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE --> + <string name="keylabel_for_spanish_row2_10">ñ</string> <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK U+00BF: "¿" INVERTED QUESTION MARK --> <string name="more_keys_for_punctuation">"!fixedColumnOrder!9,¡,\",\',#,-,:,!,\\,,\?,¿,\@,&,\\%,+,;,/,(,)"</string> diff --git a/tools/maketext/res/values/donottranslate-more-keys.xml b/tools/maketext/res/values/donottranslate-more-keys.xml index b53a36917..4cf26505f 100644 --- a/tools/maketext/res/values/donottranslate-more-keys.xml +++ b/tools/maketext/res/values/donottranslate-more-keys.xml @@ -180,8 +180,7 @@ <string name="keylabel_for_w">w</string> <string name="keylabel_for_y">y</string> <string name="keylabel_for_x">x</string> - <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE --> - <string name="keylabel_for_spanish_row2_10">ñ</string> + <string name="keylabel_for_spanish_row2_10"></string> <string name="more_keys_for_am_pm">!fixedColumnOrder!2,!hasLabels!,\@string/label_time_am,\@string/label_time_pm</string> <string name="settings_as_more_key">!icon/settings_key|!code/key_settings</string> <string name="shortcut_as_more_key">!icon/shortcut_key|!code/key_shortcut</string> |