aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-07-19 21:28:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-19 21:28:34 -0700
commit597b1157970462dcd429be608cac21e33011e9df (patch)
tree98deb693031bd3a4f23830bd1b2709ecc7b7efd5 /java
parentd856b94a7b050294bb081f9639932faf35ace607 (diff)
parent7c2b3a474fd574ce61bdecf86ac4c79ca5656f2e (diff)
downloadlatinime-597b1157970462dcd429be608cac21e33011e9df.tar.gz
latinime-597b1157970462dcd429be608cac21e33011e9df.tar.xz
latinime-597b1157970462dcd429be608cac21e33011e9df.zip
Merge "Add Arabic percent sign"
Diffstat (limited to 'java')
-rw-r--r--java/res/values-ar/donottranslate-altchars.xml3
-rw-r--r--java/res/values/donottranslate-altchars.xml2
-rw-r--r--java/res/xml-sw600dp/kbd_symbols.xml4
-rw-r--r--java/res/xml-sw768dp/kbd_symbols.xml4
-rw-r--r--java/res/xml/kbd_symbols.xml4
5 files changed, 11 insertions, 6 deletions
diff --git a/java/res/values-ar/donottranslate-altchars.xml b/java/res/values-ar/donottranslate-altchars.xml
index b4c103dcf..e49a840d6 100644
--- a/java/res/values-ar/donottranslate-altchars.xml
+++ b/java/res/values-ar/donottranslate-altchars.xml
@@ -58,9 +58,12 @@
<string name="keylabel_for_symbols_comma">\u060c</string>
<string name="keylabel_for_symbols_question">\u061f</string>
<string name="keylabel_for_symbols_semicolon">\u061b</string>
+ <!-- \u066a: ARABIC PERCENT SIGN -->
+ <string name="keylabel_for_symbols_percent">\u066a</string>
<string name="alternates_for_symbols_comma">,</string>
<string name="alternates_for_symbols_question">\?,¿</string>
<string name="alternates_for_symbols_semicolon">;</string>
+ <string name="alternates_for_symbols_percent">%,‰</string>
<string name="keylabel_for_apostrophe">"،"</string>
<string name="keylabel_for_dash">"."</string>
<string name="keyhintlabel_for_apostrophe">"؟"</string>
diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml
index 9d06d06f7..f3084d499 100644
--- a/java/res/values/donottranslate-altchars.xml
+++ b/java/res/values/donottranslate-altchars.xml
@@ -80,9 +80,11 @@
<string name="keylabel_for_symbols_comma">,</string>
<string name="keylabel_for_symbols_question">\?</string>
<string name="keylabel_for_symbols_semicolon">;</string>
+ <string name="keylabel_for_symbols_percent">%</string>
<string name="alternates_for_symbols_comma"></string>
<string name="alternates_for_symbols_question">¿</string>
<string name="alternates_for_symbols_semicolon"></string>
+ <string name="alternates_for_symbols_percent">‰</string>
<string name="keylabel_for_apostrophe">\'</string>
<string name="keylabel_for_dash">-</string>
<string name="keyhintlabel_for_apostrophe">\"</string>
diff --git a/java/res/xml-sw600dp/kbd_symbols.xml b/java/res/xml-sw600dp/kbd_symbols.xml
index dea08ddff..03d37b007 100644
--- a/java/res/xml-sw600dp/kbd_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_symbols.xml
@@ -75,8 +75,8 @@
<Key
latin:keyStyle="currencyKeyStyle" />
<Key
- latin:keyLabel="%"
- latin:popupCharacters="‰" />
+ latin:keyLabel="@string/keylabel_for_symbols_percent"
+ latin:popupCharacters="@string/alternates_for_symbols_percent" />
<Key
latin:keyLabel="&amp;" />
<Key
diff --git a/java/res/xml-sw768dp/kbd_symbols.xml b/java/res/xml-sw768dp/kbd_symbols.xml
index eb77d4d5b..44ee2fd0d 100644
--- a/java/res/xml-sw768dp/kbd_symbols.xml
+++ b/java/res/xml-sw768dp/kbd_symbols.xml
@@ -83,8 +83,8 @@
<Key
latin:keyStyle="currencyKeyStyle" />
<Key
- latin:keyLabel="%"
- latin:popupCharacters="‰" />
+ latin:keyLabel="@string/keylabel_for_symbols_percent"
+ latin:popupCharacters="@string/alternates_for_symbols_percent" />
<Key
latin:keyLabel="&amp;" />
<Key
diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index 8f682d932..7c0cee60b 100644
--- a/java/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
@@ -72,8 +72,8 @@
<Key
latin:keyStyle="currencyKeyStyle" />
<Key
- latin:keyLabel="%"
- latin:popupCharacters="‰" />
+ latin:keyLabel="@string/keylabel_for_symbols_percent"
+ latin:popupCharacters="@string/alternates_for_symbols_percent" />
<Key
latin:keyLabel="&amp;" />
<Key