Merge remote-tracking branch 'upstream/pull/2989' into master

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

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 21a5a5fc2be973e55f5650b6e63ba61f61c87a67..8cde271f04d54820efe94c80fa2fb8a2094b4e82 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -126,16 +126,6 @@ fy:
       edit: Bewurkje
     comments:
       ago: '%{ago} lyn'
-  export:
-    start:
-      licence: Lisinsje
-      options: Opsjes
-      format: 'Formaat:'
-      scale: Skaal
-      max: maks
-      latitude: 'Breedte:'
-      longitude: 'Lingte:'
-      output: Útfier
   geocoder:
     search_osm_nominatim:
       prefix:
@@ -432,26 +422,6 @@ fy:
     foundation: Stifting
     foundation_title: De OpenStreetMap Foundation
     more: Mear
-  license_page:
-    native:
-      native_link: Frysktalige ferzje
-  welcome_page:
-    title: Wolkom!
-  help_page:
-    welcome:
-      url: /welcome
-      title: Wolkom by OSM
-    help:
-      url: https://help.openstreetmap.org/
-      title: help.openstreetmap.org
-    irc:
-      title: IRC
-    wiki:
-      url: http://wiki.openstreetmap.org/
-      title: wiki.openstreetmap.org
-  about_page:
-    next: Folgjende
-    partners_title: Partners
   notifier:
     diary_comment_notification:
       hi: Hallo %{to_user},
@@ -469,13 +439,13 @@ fy:
       greeting: Hallo,
     note_comment_notification:
       greeting: Hallo,
-  message:
+  messages:
     inbox:
       from: Fan
       subject: Ûnderwerp
       date: Datum
     message_summary:
-      delete_button: Fuortsmite
+      destroy_button: Fuortsmite
     new:
       subject: Ûnderwerp
       body: Tekst
@@ -483,15 +453,42 @@ fy:
       to: Oan
       subject: Ûnderwerp
       date: Datum
-    read:
+    show:
       from: Fan
       subject: Ûnderwerp
       date: Datum
       back: Foarige
       to: Oan
     sent_message_summary:
-      delete_button: Fuortsmite
+      destroy_button: Fuortsmite
   site:
+    about:
+      next: Folgjende
+      partners_title: Partners
+    copyright:
+      native:
+        native_link: Frysktalige ferzje
+    export:
+      licence: Lisinsje
+      options: Opsjes
+      format: 'Formaat:'
+      scale: Skaal
+      max: maks
+      latitude: 'Breedte:'
+      longitude: 'Lingte:'
+      output: Útfier
+    help:
+      welcome:
+        url: /welcome
+        title: Wolkom by OSM
+      help:
+        url: https://help.openstreetmap.org/
+        title: help.openstreetmap.org
+      irc:
+        title: IRC
+      wiki:
+        url: http://wiki.openstreetmap.org/
+        title: wiki.openstreetmap.org
     sidebar:
       close: Slute
     search:
@@ -523,7 +520,13 @@ fy:
       text: Tekst
       image: Ôfbylding
       url: URL
-  trace:
+    welcome:
+      title: Wolkom!
+  traces:
+    new:
+      description: 'Beskriuwing:'
+      visibility: 'Sichtberheid:'
+      help: Help
     edit:
       filename: 'Triemnamme:'
       map: kaart
@@ -531,10 +534,6 @@ fy:
       owner: 'Eigner:'
       description: 'Beskriuwing:'
       visibility: 'Sichtberheid:'
-    trace_form:
-      description: 'Beskriuwing:'
-      visibility: 'Sichtberheid:'
-      help: Help
     view:
       filename: 'Triemnamme:'
       map: kaart
@@ -599,17 +598,18 @@ fy:
     list:
       title: Meidoggers
       heading: Meidoggers
-  user_block:
-    partial:
+  user_blocks:
+    show:
+      status: Status
       edit: Bewurkje
+    block:
+      edit: Bewurkje
+    blocks:
       status: Status
       showing_page: Side %{page}
       next: Folgjende »
       previous: « Foarige
-    show:
-      status: Status
-      edit: Bewurkje
-  note:
+  notes:
     mine:
       id: Id
       creator: Auteur
@@ -630,7 +630,7 @@ fy:
       time: Tiid
     query:
       relation: Relaasje
-  redaction:
+  redactions:
     edit:
       description: Beskriuwing
     new: