nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix Catalan keyboard layout"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2013-07-31 08:01:50 +00:00 committed by Android (Google) Code Review
commit 3b5c05f18c
6 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
java/res/xml-sw600dp/rowkeys_symbols2.xml
View file

@ -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="_,&#x2013;,&#x2014;" />
latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />
<Key
latin:keyLabel="+"
latin:moreKeys="!text/more_keys_for_plus" />

5
java/res/xml/rowkeys_symbols2.xml
View file

@ -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="_,&#x2013;,&#x2014;" />
latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />
<Key
latin:keyLabel="+"
latin:moreKeys="!text/more_keys_for_plus" />

31
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
View file

@ -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 */

9
tools/maketext/res/values-ca/donottranslate-more-keys.xml
View file

@ -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">&#x00E7;,&#x0107;,&#x010D;</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">&#x0140;,&#x0142;</string>
<string name="more_keys_for_l">l&#x00B7;l,&#x0142;</string>
<!-- U+00B7: "·" MIDDLE DOT -->
<string name="more_keys_for_punctuation">"!fixedColumnOrder!9,&#x00B7;,\",\',#,-,:,!,\\,,\?,\@,&amp;,\\%,+,;,/,(,)"</string>
<string name="more_keys_for_tablet_period">\?,&#x00B7;</string>
<!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
<string name="keylabel_for_spanish_row2_10">&#x00E7;</string>
</resources>

2
tools/maketext/res/values-es/donottranslate-more-keys.xml
View file

@ -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">&#x00E7;,&#x0107;,&#x010D;</string>
<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
<string name="keylabel_for_spanish_row2_10">&#x00F1;</string>
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK
U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_punctuation">"!fixedColumnOrder!9,&#x00A1;,\",\',#,-,:,!,\\,,\?,&#x00BF;,\@,&amp;,\\%,+,;,/,(,)"</string>

3
tools/maketext/res/values/donottranslate-more-keys.xml
View file

@ -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">&#x00F1;</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>