summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-08-03 15:19:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-08-03 15:19:10 -0700
commit3c5ad8abae700b03511fc10d217adb9025dc0789 (patch)
tree69cb52b280d912ff9b54c66d289995a4be2a4623 /core
parentd186ef12b352c0e62fccd3243ed59a430b07837a (diff)
parent88c692ca2ce4f0680340cb66f5fe82bfdd532581 (diff)
downloadframeworks_base-3c5ad8abae700b03511fc10d217adb9025dc0789.zip
frameworks_base-3c5ad8abae700b03511fc10d217adb9025dc0789.tar.gz
frameworks_base-3c5ad8abae700b03511fc10d217adb9025dc0789.tar.bz2
am 88c692ca: Merge change 9522 into donut
Merge commit '88c692ca2ce4f0680340cb66f5fe82bfdd532581' * commit '88c692ca2ce4f0680340cb66f5fe82bfdd532581': Merge Korean abbreviated date format fix from cupcake.
Diffstat (limited to 'core')
-rw-r--r--core/res/res/values-ko/donottranslate-cldr.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/res/res/values-ko/donottranslate-cldr.xml b/core/res/res/values-ko/donottranslate-cldr.xml
index 47f8c03..6b792c6 100644
--- a/core/res/res/values-ko/donottranslate-cldr.xml
+++ b/core/res/res/values-ko/donottranslate-cldr.xml
@@ -101,16 +101,16 @@
<string name="numeric_date_template">"%s. %s. %s."</string>
<string name="month_day_year">%Y년 %-m월 %-e일</string>
<string name="time_of_day">%p %-l:%M:%S</string>
- <string name="date_and_time">%Y. %-m. %-e. %p %-l:%M:%S</string>
+ <string name="date_and_time">%Y년 %-m월 %-e일 %p %-l:%M:%S</string>
<string name="date_time">%1$s %2$s</string>
<string name="time_date">%3$s %1$s</string>
- <string name="abbrev_month_day_year">%Y. %-m. %-e.</string>
+ <string name="abbrev_month_day_year">%Y년 %-m월 %-e일</string>
<string name="month_day">%B %-e일</string>
<string name="month">%-B</string>
<string name="month_year">%Y년 %B</string>
- <string name="abbrev_month_day">%-m. %-e.</string>
+ <string name="abbrev_month_day">%-m월 %-e일</string>
<string name="abbrev_month">%-m월</string>
- <string name="abbrev_month_year">%Y. %-m.</string>
+ <string name="abbrev_month_year">%Y년 %-m월</string>
<string name="time1_time2">%1$s ~ %2$s</string>
<string name="date1_date2">%2$s ~ %5$s</string>
<string name="numeric_md1_md2">%2$s. %3$s ~ %7$s. %8$s</string>