aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-07-31 08:01:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-31 08:01:51 +0000
commit3b5c05f18c3628a99b5e676af636b6f64e58f1c5 (patch)
tree59e41c3226c70da4d1d0895d518497349d3b33fc /tools
parentfea0862cf6eafb676238ea95a80a8ce47db12ce0 (diff)
parent087c8a84a57eea1801a98b38857566874080eeca (diff)
downloadlatinime-3b5c05f18c3628a99b5e676af636b6f64e58f1c5.tar.gz
latinime-3b5c05f18c3628a99b5e676af636b6f64e58f1c5.tar.xz
latinime-3b5c05f18c3628a99b5e676af636b6f64e58f1c5.zip
Merge "Fix Catalan keyboard layout"
Diffstat (limited to 'tools')
-rw-r--r--tools/maketext/res/values-ca/donottranslate-more-keys.xml9
-rw-r--r--tools/maketext/res/values-es/donottranslate-more-keys.xml2
-rw-r--r--tools/maketext/res/values/donottranslate-more-keys.xml3
3 files changed, 10 insertions, 4 deletions
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">&#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>
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">&#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>
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">&#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>