diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-04-03 07:46:49 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-04-03 07:46:49 +0000 |
| commit | 514496f6f48ddf7a71ad80021bee0675c26f3e05 (patch) | |
| tree | f49ba380d989c8be57caacf23bef876f38aa4e9e /java | |
| parent | f5357583cad2025355b9909fe9fdc61d63732ea1 (diff) | |
| parent | 0b30953ddca9c6ccf8b29315db714e5e464114f7 (diff) | |
| download | latinime-514496f6f48ddf7a71ad80021bee0675c26f3e05.tar.gz latinime-514496f6f48ddf7a71ad80021bee0675c26f3e05.tar.xz latinime-514496f6f48ddf7a71ad80021bee0675c26f3e05.zip | |
am 0b30953d: Merge "Rename string resource to more generic name"
* commit '0b30953ddca9c6ccf8b29315db714e5e464114f7':
Rename string resource to more generic name
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index e38bdd64e..494bfbd2b 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -358,9 +358,9 @@ (US) should be an abbreviation of United Statesn to fit in the CHAR LIMIT. This should be identical to subtype_es_US aside from the trailing (%s). --> <string name="subtype_with_layout_es_US">Spanish (US) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> - <!-- Description for Nepali (Traditional) keyboard subtype [CHAR LIMIT=25] + <!-- Description for "LANGUAGE_NAME" (Traditional) keyboard subtype [CHAR LIMIT=25] (Traditional) can be an abbreviation to fit in the CHAR LIMIT. --> - <string name="subtype_nepali_traditional"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (Traditional)</string> + <string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (Traditional)</string> <!-- TODO: Uncomment once we can handle IETF language tag with script name specified. Description for Serbian Cyrillic keyboard subtype [CHAR LIMIT=25] (Cyrillic) can be an abbreviation to fit in the CHAR LIMIT. diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index c64b3a4e0..cc824562a 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -485,7 +485,7 @@ android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" - android:label="@string/subtype_nepali_traditional" + android:label="@string/subtype_generic_traditional" android:subtypeId="0x5fafea88" android:imeSubtypeLocale="ne_NP" android:imeSubtypeMode="keyboard" |