Merging 17905:17944 from trunk.

[rails.git] / config / locales / no.yml

diff --git a/config/locales/no.yml b/config/locales/no.yml
index 4922301fd5edffe03e2fe471e962df709681f041..e1096917642b0c7998106c0531cf5ba83bfe6880 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -348,7 +348,8 @@
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} av {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} av {{placename}}"
   layouts: 
-    alt_donation: Doner
+    make_a_donation:
+      text: Doner
     donate_link_text: donering
     edit: Rediger
     edit_tooltip: Rediger kart
@@ -433,7 +434,7 @@
       subject: Emne
       title: Utboks
       to: Til
-      you_have_sent_messages: Du har sendt {{sent_count}} meldinger
+      you_have_sent_messages: Du har sendt {{count}} meldinger
     read: 
       back_to_inbox: Tilbake til innboks
       back_to_outbox: Tilbake til utboks