summaryrefslogtreecommitdiffstats
path: root/core/res/res/values-sl-rSI
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2009-06-11 13:37:04 -0700
committerEric Fischer <enf@google.com>2009-06-11 13:37:04 -0700
commitaf0e7a7394bf1e2596c46f81c3b0302a56daab96 (patch)
treec9fd4667fbdbdbd5ec9b100c379f7fe6c5efec9f /core/res/res/values-sl-rSI
parentfa699ea22a13a92694de75ef948a81da23e71642 (diff)
downloadframeworks_base-af0e7a7394bf1e2596c46f81c3b0302a56daab96.zip
frameworks_base-af0e7a7394bf1e2596c46f81c3b0302a56daab96.tar.gz
frameworks_base-af0e7a7394bf1e2596c46f81c3b0302a56daab96.tar.bz2
Hook the 12- or 24-hour time format checkbox back up.
The format strings are newly generated from CLDR. The code is once again the same as in cupcake: do the natural thing for the locale if the user has never specified, but follow the checkbox if the user has ever set it.
Diffstat (limited to 'core/res/res/values-sl-rSI')
-rw-r--r--core/res/res/values-sl-rSI/donottranslate-cldr.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/res/res/values-sl-rSI/donottranslate-cldr.xml b/core/res/res/values-sl-rSI/donottranslate-cldr.xml
index dc01c8c..f16b9ea 100644
--- a/core/res/res/values-sl-rSI/donottranslate-cldr.xml
+++ b/core/res/res/values-sl-rSI/donottranslate-cldr.xml
@@ -94,6 +94,8 @@
<string name="hour_minute_24">%-k:%M</string>
<string name="hour_minute_ampm">%-l:%M %p</string>
<string name="hour_minute_cap_ampm">%-l:%M %^p</string>
+ <string name="twelve_hour_time_format">h:mm a</string>
+ <string name="twenty_four_hour_time_format">H:mm</string>
<string name="numeric_date">%-e. %m. %Y</string>
<string name="numeric_date_format">d. MM. yyyy</string>
<string name="month_day_year">%d. %B %Y</string>