diff options
| author | Elliott Hughes <enh@google.com> | 2013-01-14 19:28:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-14 19:28:24 -0800 |
| commit | 0152360d8b419ddd0fd5b1d701932f96d5839276 (patch) | |
| tree | e31dfd9eefb2942932cda98e09df32d1a305cca0 /core | |
| parent | 5bd48b528e6477c2c3d318cb71cef861392b1b8a (diff) | |
| parent | a99a9f4f80ceb47db0c7b3e9e32547cef4e3ee03 (diff) | |
| download | frameworks_base-0152360d8b419ddd0fd5b1d701932f96d5839276.zip frameworks_base-0152360d8b419ddd0fd5b1d701932f96d5839276.tar.gz frameworks_base-0152360d8b419ddd0fd5b1d701932f96d5839276.tar.bz2 | |
am a99a9f4f: am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings."
* commit 'a99a9f4f80ceb47db0c7b3e9e32547cef4e3ee03':
Manual fix for some Norwegian format strings.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values-nb/donottranslate-cldr.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/res/res/values-nb/donottranslate-cldr.xml b/core/res/res/values-nb/donottranslate-cldr.xml index d53d4ea..6d343ca 100644 --- a/core/res/res/values-nb/donottranslate-cldr.xml +++ b/core/res/res/values-nb/donottranslate-cldr.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <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="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="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> |