diff options
| author | Kyrylo Mikos <kiril.mik.os@gmail.com> | 2013-08-03 13:57:29 +0300 |
|---|---|---|
| committer | Kyrylo Mikos <kiril.mik.os@gmail.com> | 2013-08-03 14:00:33 +0300 |
| commit | d71c86ae2d4f27392f4dbfd75593a5b267328774 (patch) | |
| tree | 665b34a8f21b08b8c2fa62f6832286cd64d94d03 | |
| parent | 13743d3a2c88a68f8ec43ce12dbc97f0bb1af260 (diff) | |
| download | android_packages_inputmethods_LatinIME-d71c86ae2d4f27392f4dbfd75593a5b267328774.tar.gz android_packages_inputmethods_LatinIME-d71c86ae2d4f27392f4dbfd75593a5b267328774.tar.bz2 android_packages_inputmethods_LatinIME-d71c86ae2d4f27392f4dbfd75593a5b267328774.zip | |
LatinIME: Fix one more merge conflict.
Symblol more_keys_for_currency_general shoud be renamed to
more_keys_for_currency_generic.
Change-Id: I943e4022c9b338fa4f2377386582dc3c86bd42d1
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java | 2 | ||||
| -rw-r--r-- | tools/maketext/res/values/donottranslate-more-keys.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java index d71f45ffc..535362e6b 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java @@ -151,7 +151,7 @@ public final class KeyboardTextsSet { /* 46 */ "double_angle_quotes", /* 47 */ "more_keys_for_currency_dollar", /* 48 */ "keylabel_for_currency_generic", - /* 49 */ "more_keys_for_currency_general", + /* 49 */ "more_keys_for_currency_generic", /* 50 */ "more_keys_for_punctuation", /* 51 */ "more_keys_for_star", /* 52 */ "more_keys_for_bullet", diff --git a/tools/maketext/res/values/donottranslate-more-keys.xml b/tools/maketext/res/values/donottranslate-more-keys.xml index 2a1bce0a0..44757305c 100644 --- a/tools/maketext/res/values/donottranslate-more-keys.xml +++ b/tools/maketext/res/values/donottranslate-more-keys.xml @@ -74,7 +74,7 @@ U+20B9: "₹" RUPEE SIGN --> <string name="more_keys_for_currency_dollar">¢,£,€,¥,₱,₹</string> <string name="keylabel_for_currency_generic">$</string> - <string name="more_keys_for_currency_general">¢,$,€,£,¥,₱,₹</string> + <string name="more_keys_for_currency_generic">¢,$,€,£,¥,₱,₹</string> <string name="more_keys_for_punctuation">"!fixedColumnOrder!8,\",\',#,-,:,!,\\,,\?,\@,&,\\%,+,;,/,(,)"</string> <!-- U+2020: "†" DAGGER U+2021: "‡" DOUBLE DAGGER |