Merge "Manual fix for some Norwegian format strings."

<?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>