summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLance Jin-woong Chang <jinwoong@google.com>2013-12-05 01:27:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-12-05 01:27:46 +0000
commit5d65a47c395918d3f777d99747eb4f2e901566ee (patch)
tree11d0b0232b83c907f92ef0ff9e79495235b24af2
parent071fbfd3f35c01fb1c4052614902dabe16af691f (diff)
parent0637c1f909e55b1a0351387a82fe5fadd2cb9808 (diff)
downloadpackages_apps_Settings-5d65a47c395918d3f777d99747eb4f2e901566ee.zip
packages_apps_Settings-5d65a47c395918d3f777d99747eb4f2e901566ee.tar.gz
packages_apps_Settings-5d65a47c395918d3f777d99747eb4f2e901566ee.tar.bz2
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
-rw-r--r--res/values-ja/strings.xml2
-rw-r--r--res/values-ko/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ed993a6..2e65d60 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -991,7 +991,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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e8d8c9c..04ca503 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -989,7 +989,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>