nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Rename string resource to more generic name"

main
Tadashi G. Takaoka 2014-04-03 07:42:57 +00:00 committed by Android (Google) Code Review
parent 4df668d197 b9964b5fe2
commit 0b30953ddc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/res/values/strings.xml
View File

@ -358,9 +358,9 @@
(US) should be an abbreviation of United Statesn to fit in the CHAR LIMIT. (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). --> 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> <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. --> (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. <!-- TODO: Uncomment once we can handle IETF language tag with script name specified.
Description for Serbian Cyrillic keyboard subtype [CHAR LIMIT=25] Description for Serbian Cyrillic keyboard subtype [CHAR LIMIT=25]
(Cyrillic) can be an abbreviation to fit in the CHAR LIMIT. (Cyrillic) can be an abbreviation to fit in the CHAR LIMIT.

2
java/res/xml/method.xml
View File

@ -485,7 +485,7 @@
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_nepali_traditional" android:label="@string/subtype_generic_traditional"
android:subtypeId="0x5fafea88" android:subtypeId="0x5fafea88"
android:imeSubtypeLocale="ne_NP" android:imeSubtypeLocale="ne_NP"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"