PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '47ad0cf3' into manualmerge

Browse Source 
Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
This commit is contained in:
Ken Wakasa
2010-09-30 11:39:09 +09:00
parent 3b6aa41cce 47ad0cf3bc
commit 6d5b8951b1
23 changed files with 23 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values-ja/strings.xml
View File

@@ -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>