diff options
| author | Ken Wakasa <kwakasa@google.com> | 2010-09-30 11:39:09 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2010-09-30 11:54:31 +0900 |
| commit | 6d5b8951b13ac49a4ee395cfee75b26bc53f602a (patch) | |
| tree | f874a2c5998fff17fe648d729d15a646cc710b01 /res/values-ja | |
| parent | 3b6aa41cce9dafa48dfbb3e93ea856610de1f1e7 (diff) | |
| parent | 47ad0cf3bc288cef23877c45b67bf7f02147d1bc (diff) | |
| download | packages_apps_settings-6d5b8951b13ac49a4ee395cfee75b26bc53f602a.zip packages_apps_settings-6d5b8951b13ac49a4ee395cfee75b26bc53f602a.tar.gz packages_apps_settings-6d5b8951b13ac49a4ee395cfee75b26bc53f602a.tar.bz2 | |
Merge commit '47ad0cf3' into manualmerge
Conflicts:
res/xml/language_settings.xml
src/com/android/settings/LanguageSettings.java
Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
Diffstat (limited to 'res/values-ja')
| -rw-r--r-- | res/values-ja/strings.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 220efee..f077b64 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -858,9 +858,6 @@ <string name="process_provider_in_use_description" msgid="5586603325677678940">"プロバイダ<xliff:g id="COMP_NAME">%1$s</xliff:g>は使用中です。"</string> <string name="language_settings" msgid="502219872342167227">"言語とキーボード"</string> <string name="language_keyboard_settings_title" msgid="3455826933385341107">"言語とキーボードの設定"</string> - <string name="language_settings_summary" msgid="595647729475399987">"言語と地域、文字入力の設定"</string> - <string name="language_category" msgid="3391756582724541530">"地域/言語設定"</string> - <string name="text_category" msgid="6342540511465136739">"文字入力設定"</string> <string name="phone_language" msgid="1165758957501090679">"言語を選択"</string> <string name="phone_language_summary" msgid="3871309445655554211"></string> <string name="auto_replace" msgid="6199184757891937822">"自動修正"</string> |