diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-07-17 10:21:53 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-07-17 10:21:53 +0400 |
| commit | ff0840d90453295ebf3c08d32b01f9bec37ec239 (patch) | |
| tree | 2ff2c275b3ad8eec1c7390057d76d1814c7e80a2 | |
| parent | 4db3a7dcb69a9d6d897a31d8f4ec281daa7960f8 (diff) | |
| parent | ad7ee05848bdcb72f501ee10fa53b1fc8f1592c3 (diff) | |
| download | frameworks_base-ff0840d90453295ebf3c08d32b01f9bec37ec239.zip frameworks_base-ff0840d90453295ebf3c08d32b01f9bec37ec239.tar.gz frameworks_base-ff0840d90453295ebf3c08d32b01f9bec37ec239.tar.bz2 | |
Merge "Make Norwegian use HH:MM time format instead of HH.MM." into ics
| -rw-r--r-- | core/res/res/values-nb/donottranslate-cldr.xml | 14 |
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> |