summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2011-07-12 11:13:32 +0200
committerArne Coucheron <arco68@gmail.com>2012-07-17 05:30:51 +0200
commitad7ee05848bdcb72f501ee10fa53b1fc8f1592c3 (patch)
tree939aa7f8a170f160571348d1ba8dbd438eb89718
parent12cedbff84aa339effbfa613ca9e213f0725b905 (diff)
downloadframeworks_base-ad7ee05848bdcb72f501ee10fa53b1fc8f1592c3.zip
frameworks_base-ad7ee05848bdcb72f501ee10fa53b1fc8f1592c3.tar.gz
frameworks_base-ad7ee05848bdcb72f501ee10fa53b1fc8f1592c3.tar.bz2
Make Norwegian use HH:MM time format instead of HH.MM.
Fixes bug #3798.
-rw-r--r--core/res/res/values-nb/donottranslate-cldr.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/core/res/res/values-nb/donottranslate-cldr.xml b/core/res/res/values-nb/donottranslate-cldr.xml
index 637dd5e..688915b 100644
--- a/core/res/res/values-nb/donottranslate-cldr.xml
+++ b/core/res/res/values-nb/donottranslate-cldr.xml
@@ -91,17 +91,17 @@
<string name="today">i dag</string>
<string name="tomorrow">i morgen</string>
- <string name="hour_minute_24">%H.%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">HH.mm</string>
+ <string name="hour_minute_24">%H:%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">HH:mm</string>
<string name="numeric_date">%d.%m.%Y</string>
<string name="numeric_date_format">dd.MM.yyyy</string>
<string name="numeric_date_template">"%s.%s.%s"</string>
<string name="month_day_year">%-e. %B %Y</string>
- <string name="time_of_day">%H.%M.%S</string>
- <string name="date_and_time">%H.%M.%S %-e. %b %Y</string>
+ <string name="time_of_day">%H:%M:%S</string>
+ <string name="date_and_time">%H:%M:%S %-e. %b %Y</string>
<string name="date_time">%2$s %1$s</string>
<string name="time_date">%1$s %3$s</string>
<string name="abbrev_month_day_year">%-e. %b %Y</string>