Merge branch 'master' into openid

[rails.git] / vendor / plugins / rails-i18n / locale / nn.yml

diff --git a/vendor/plugins/rails-i18n/locale/nn.yml b/vendor/plugins/rails-i18n/locale/nn.yml
index ba1d2d0434aaf1ce094f4e66ea1efc369d90005e..960237517f4dcbb3baa6e5dceb15d0829543a211 100644 (file)
--- a/vendor/plugins/rails-i18n/locale/nn.yml
+++ b/vendor/plugins/rails-i18n/locale/nn.yml
@@ -12,7 +12,10 @@ nn:
     abbr_day_names: [sun, mån, tys, ons, tor, fre, lau]
     month_names: [~, januar, februar, mars, april, mai, juni, juli, august, september, oktober, november, desember]
     abbr_month_names: [~, jan, feb, mar, apr, mai, jun, jul, aug, sep, okt, nov, des]
     abbr_day_names: [sun, mån, tys, ons, tor, fre, lau]
     month_names: [~, januar, februar, mars, april, mai, juni, juli, august, september, oktober, november, desember]
     abbr_month_names: [~, jan, feb, mar, apr, mai, jun, jul, aug, sep, okt, nov, des]

-    order: [:day, :month, :year]
+    order:
+      - :day
+      - :month
+      - :year

   time:
     formats:
       default: "%A, %e. %B %Y, %H:%M"
   time:
     formats:
       default: "%A, %e. %B %Y, %H:%M"