Merge branch 'master' into notes-search

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

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index feb0bc0e4a63f126c05adc795bfa1454e94796cc..1e465bb834a07347f64dd7444f53c6750232425d 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -76,7 +76,7 @@ nds:
   diary_entry:
     new:
       title: Ne’en Dagbook-Indrag
-    list:
+    index:
       title: Bruker-Dagböker
       user_title: '%{user} sien Dagbook'
       in_language_title: Dagbook-Indrääg op %{language}
@@ -95,7 +95,7 @@ nds:
       use_map_link: Koort bruken
       save_button: Spiekern
       marker_text: Oort von’n Indrag
-    view:
+    show:
       title: Bruker-Dagbook | %{user}
       user_title: '%{user} sien Dagbook'
       leave_a_comment: Kommentar schrieven
@@ -112,19 +112,6 @@ nds:
     location:
       view: Ankieken
       edit: Ännern
-  export:
-    start:
-      licence: Lizenz
-      format: 'Format:'
-      scale: Skaal
-      max: max.
-      image_size: 'Bildgrött:'
-      zoom: Zoom
-      add_marker: Sett en Markteken op de Koort
-      latitude: 'Breed:'
-      longitude: 'Läng:'
-      output: Utgaav
-      export_button: Export
   geocoder:
     search_osm_nominatim:
       prefix:
@@ -380,9 +367,6 @@ nds:
     help: Hülp
     make_a_donation:
       text: Spenn wat
-  license_page:
-    native:
-      title: Över disse Sied
   notifier:
     diary_comment_notification:
       hi: Moin %{to_user},
@@ -398,7 +382,7 @@ nds:
       greeting: Moin,
     lost_password_html:
       greeting: Moin,
-  message:
+  messages:
     inbox:
       title: Postfack Ingang
       my_inbox: Mien Postfack Ingang
@@ -410,11 +394,12 @@ nds:
       unread_button: as ‚noch nich leest‘ kennteken
       read_button: as ‚leest‘ kennteken
       reply_button: Antern
-      delete_button: Wegdoon
+      destroy_button: Wegdoon
     new:
       title: Naricht sennen
       send_button: Versennen
       back_to_inbox: Trüch na’t Postfack Ingang
+    create:
       message_sent: Naricht afsennt
     outbox:
       title: Postfack Utgang
@@ -424,22 +409,37 @@ nds:
       to: An
       subject: Thema
       date: Datum
-    read:
+    show:
       from: Von
       subject: Thema
       date: Datum
       reply_button: Antern
       to: An
     sent_message_summary:
-      delete_button: Wegdoon
-    delete:
-      deleted: Naricht wegdaan
+      destroy_button: Wegdoon
+    destroy:
+      destroyed: Naricht wegdaan
   site:
+    copyright:
+      native:
+        title: Över disse Sied
     index:
       permalink: Permalink
       shortlink: Kortlink
     edit:
       user_page_link: Brukersied
+    export:
+      licence: Lizenz
+      format: 'Format:'
+      scale: Skaal
+      max: max.
+      image_size: 'Bildgrött:'
+      zoom: Zoom
+      add_marker: Sett en Markteken op de Koort
+      latitude: 'Breed:'
+      longitude: 'Läng:'
+      output: Utgaav
+      export_button: Export
     sidebar:
       close: Sluten
     search:
@@ -508,7 +508,13 @@ nds:
           bridge: Fett Rand = Brügg
           private: Privat Togang
           construction: Straat, an de noch boot warrt
-  trace:
+  traces:
+    new:
+      upload_gpx: GPX-Datei hoochladen
+      description: Beschrieven
+      visibility: Sichtborkeit
+      upload_button: Hoochladen
+      help: Hülp
     edit:
       filename: 'Dateinaam:'
       download: dalladen
@@ -522,13 +528,7 @@ nds:
       save_button: Ännern spiekern
       visibility: 'Sichtborkeit:'
       visibility_help: wat bedüüdt dat?
-    trace_form:
-      upload_gpx: GPX-Datei hoochladen
-      description: Beschrieven
-      visibility: Sichtborkeit
-      upload_button: Hoochladen
-      help: Hülp
-    view:
+    show:
       filename: 'Dateinaam:'
       download: dalladen
       map: Koort
@@ -556,7 +556,7 @@ nds:
       name: Naam
       required: Nödig
       allow_write_api: Koort ännern.
-  user:
+  users:
     login:
       title: Anmellen
       heading: Anmellen
@@ -584,7 +584,7 @@ nds:
     no_such_user:
       title: Bruker nich funnen
       heading: Den Bruker %{user} gifft dat nich
-    view:
+    show:
       my diary: mien Dagbook
       new diary entry: Nee Dagbook-Indrag
       my edits: mien Ännern
@@ -597,7 +597,6 @@ nds:
       ago: (vör %{time_in_words_ago})
       email address: 'E-Mail-Adress:'
       description: Beschrieven
-      your friends: Dien Frünn
       km away: '%{count} km weg'
       m away: '%{count} m weg'
       nearby users: Annere Brukers in de Neegd
@@ -628,14 +627,14 @@ nds:
     remove_friend:
       success: '%{name} is rutnahmen bi de Frünn.'
       not_a_friend: '%{name} is keen von dien Frünn.'
-  user_block:
-    partial:
-      show: Wiesen
-      edit: Ännern
+  user_blocks:
     show:
       status: Status
       show: Wiesen
       edit: Ännern
+    block:
+      show: Wiesen
+      edit: Ännern
   javascripts:
     map:
       base: