Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings."

Browse Source 
* commit '9fa542a5032d8adc3f502cef0c5c98d8f10abbc2':
  Manual fix for some Norwegian format strings.
This commit is contained in:
Elliott Hughes
2013-01-14 19:25:56 -08:00
committed by Android Git Automerger
parent 67ae48f325 9fa542a503
commit a99a9f4f80
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/res/res/values-nb/donottranslate-cldr.xml
View File

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android" <resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hour_minute_24">%H.%M</string> <string name="hour_minute_24">%H:%M</string>
<string name="hour_minute_ampm">%-l.%M %p</string> <string name="hour_minute_ampm">%-l:%M %p</string>
<string name="hour_minute_cap_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">%d.%m.%Y</string>
<string name="numeric_date_format">dd.MM.yyyy</string> <string name="numeric_date_format">dd.MM.yyyy</string>
<string name="numeric_date_template">"%s.%s.%s"</string> <string name="numeric_date_template">"%s.%s.%s"</string>
<string name="month_day_year">%-e. %B %Y</string> <string name="month_day_year">%-e. %B %Y</string>
<string name="time_of_day">%H.%M.%S</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_and_time">%H:%M:%S %-e. %b %Y</string>
<string name="date_time">%2$s %1$s</string> <string name="date_time">%2$s %1$s</string>
<string name="time_date">%1$s %3$s</string> <string name="time_date">%1$s %3$s</string>
<string name="abbrev_month_day_year">%-e. %b %Y</string> <string name="abbrev_month_day_year">%-e. %b %Y</string>