Merge branch 'master' into trace-description-maxlength

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

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index f848e3bf24d55b0b7cda430fd41a632b576a0187..7bc393f0283a2b675d4d1d7ef472b6f2c9289a0b 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -885,7 +885,6 @@ nb:
           commercial: Kommersielt område
           conservation: Fredet
           construction: Kontruksjon
-          farm: Gård
           farmland: Jorde
           farmyard: Gårdstun
           forest: Skog
@@ -2180,13 +2179,13 @@ nb:
       in: i
     index:
       public_traces: Offentlig GPS-spor
-      my_traces: Mine spor
       public_traces_from: Offentlige GPS-spor fra %{user}
       description: Bla gjennom nylig opplastede GPS-spor
       tagged_with: merket med %{tags}
       empty_html: Ingenting her ennå. <a href='%{upload_link}'>Last opp et nytt spor</a>
         eller lær å lage GPS-spor på <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki-siden</a>.
       upload_trace: Last opp et GPS-spor
+      my_traces: Mine spor
     destroy:
       scheduled_for_deletion: Spor planlagt slettet
     make_public: