am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev

* commit '5d65a47c395918d3f777d99747eb4f2e901566ee':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
This commit is contained in:
Lance Jin-woong Chang
2013-12-04 17:29:27 -08:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@@ -994,7 +994,7 @@
<string name="manage_mobile_plan_title" msgid="7630170375010107744">"モバイルプラン"</string>
<string name="sms_application_title" msgid="6134351177937015839">"デフォルトのSMSアプリ"</string>
<string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMSアプリを変更しますか"</string>
<string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMSアプリとして<xliff:g id="CURRENT_APP">%2$s</xliff:g>の代わりに<xliff:g id="NEW_APP">%1$s</xliff:g>を使用しますか?"</string>
<string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMSアプリとして<xliff:g id="CURRENT_APP">%s</xliff:g>の代わりに<xliff:g id="NEW_APP">%s</xliff:g>を使用しますか?"</string>
<string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"SMSアプリとして<xliff:g id="NEW_APP">%s</xliff:g>を使用しますか?"</string>
<string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"不明なSIM事業者"</string>
<string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$sには既知のプロビジョニングウェブサイトがありません"</string>