am 53f56dde: Merge "Change the application name of aosp latin ime"

* commit '53f56ddef9f5e9e5eee86b95a9d8e1f2878d5e24':
  Change the application name of aosp latin ime
This commit is contained in:
satok 2012-01-11 21:32:57 -08:00 committed by Android Git Automerger
commit 79cf99ccfc
2 changed files with 4 additions and 2 deletions

View file

@ -7,13 +7,13 @@
<uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<application android:label="@string/english_ime_name"
<application android:label="@string/aosp_android_keyboard_ime_name"
android:icon="@drawable/ic_ime_settings"
android:backupAgent="BackupAgent"
android:killAfterRestore="false">
<service android:name="LatinIME"
android:label="@string/english_ime_name"
android:label="@string/aosp_android_keyboard_ime_name"
android:permission="android.permission.BIND_INPUT_METHOD">
<intent-filter>
<action android:name="android.view.InputMethod" />

View file

@ -20,6 +20,8 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Title for Latin keyboard -->
<string name="english_ime_name">Android keyboard</string>
<!-- Application name for opensource Android keyboard. AOSP(Android Open Source Project) should not be translated. -->
<string name="aosp_android_keyboard_ime_name">Android keyboard (AOSP)</string>
<!-- Title for Latin keyboard settings activity / dialog -->
<string name="english_ime_settings">Android keyboard settings</string>
<!-- Title for Latin keyboard input options dialog [CHAR LIMIT=25] -->