aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2012-07-18 23:14:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-18 23:14:37 -0700
commitb58ae231de089b29d009cfae92056e95fb81e2c4 (patch)
tree094a8ac9153395b2325eded51f2ce8e82b332d02 /tools
parent147ca1300c4bceaaa57f92385a78ac129dfaef52 (diff)
parentd6a9416d7e7fda52453affdf1459f15cf15eab99 (diff)
downloadlatinime-b58ae231de089b29d009cfae92056e95fb81e2c4.tar.gz
latinime-b58ae231de089b29d009cfae92056e95fb81e2c4.tar.xz
latinime-b58ae231de089b29d009cfae92056e95fb81e2c4.zip
Merge "Merge remote-tracking branch 'goog/master' into mergescriptpackage" into jb-ub-latinimegoogle
Diffstat (limited to 'tools')
-rw-r--r--tools/maketext/res/values-es/donottranslate-more-keys.xml12
-rw-r--r--tools/maketext/res/values/donottranslate-more-keys.xml1
2 files changed, 3 insertions, 10 deletions
diff --git a/tools/maketext/res/values-es/donottranslate-more-keys.xml b/tools/maketext/res/values-es/donottranslate-more-keys.xml
index 2077af464..586dbade8 100644
--- a/tools/maketext/res/values-es/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-es/donottranslate-more-keys.xml
@@ -69,15 +69,9 @@
<string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK
U+00BF: "¿" INVERTED QUESTION MARK -->
- <string name="more_keys_for_punctuation">"!fixedColumnOrder!9,\",\',#,-,&#x00A1;,!,&#x00BF;,\\,,\?,\@,&amp;,\\%,+,;,:,/,(,)"</string>
- <string name="keyhintlabel_for_tablet_comma">&#x00A1;</string>
- <string name="more_keys_for_tablet_comma">"&#x00A1;,!"</string>
- <string name="keyhintlabel_for_tablet_period">&#x00BF;</string>
- <string name="more_keys_for_tablet_period">"&#x00BF;,\?"</string>
+ <string name="more_keys_for_punctuation">"!fixedColumnOrder!9,&#x00A1;,\",\',#,-,:,!,\\,,\?,&#x00BF;,\@,&amp;,\\%,+,;,/,(,)"</string>
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
- <string name="keylabel_for_symbols_exclamation">"&#x00A1;"</string>
+ <string name="more_keys_for_tablet_comma">"!,&#x00A1;"</string>
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
- <string name="keylabel_for_symbols_question">"&#x00BF;"</string>
- <string name="more_keys_for_symbols_exclamation">"!"</string>
- <string name="more_keys_for_symbols_question">"\?"</string>
+ <string name="more_keys_for_tablet_period">"\?,&#x00BF;"</string>
</resources>
diff --git a/tools/maketext/res/values/donottranslate-more-keys.xml b/tools/maketext/res/values/donottranslate-more-keys.xml
index 922b42d1b..7f1940a57 100644
--- a/tools/maketext/res/values/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values/donottranslate-more-keys.xml
@@ -158,7 +158,6 @@
<string name="more_keys_for_symbols_0">&#x207F;,&#x2205;</string>
<string name="keylabel_for_comma">,</string>
<string name="more_keys_for_comma"></string>
- <string name="keylabel_for_symbols_exclamation">!</string>
<string name="keylabel_for_symbols_question">\?</string>
<string name="keylabel_for_symbols_semicolon">;</string>
<string name="keylabel_for_symbols_percent">%</string>