Merge remote-tracking branch 'upstream/pull/4490'

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

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 77e9c1f79a2fe2c84e8d440cd9618ecf50dbd371..e0339c5caa27420c26ec914d651b04b8352e7093 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1378,9 +1378,9 @@ fy:
       reports:
         one: 1 melding
         other: '%{count} meldings'
       reports:
         one: 1 melding
         other: '%{count} meldings'

-      report_created_at: Earst meld op %{datetime}
-      last_resolved_at: Lêst oplost op %{datetime}
-      last_updated_at: Lêst bywurke op %{datetime} troch %{displayname}
+      report_created_at_html: Earst meld op %{datetime}
+      last_resolved_at_html: Lêst oplost op %{datetime}
+      last_updated_at_html: Lêst bywurke op %{datetime} troch %{displayname}

       resolve: Oplosse
       ignore: Negearje
       reopen: Weriepenje
       resolve: Oplosse
       ignore: Negearje
       reopen: Weriepenje


@@ -2036,21 +2036,21 @@ fy:
           subway: Metrospoar
           cable_car: Kabelbaan
           chair_lift: stuoltsjelift
           subway: Metrospoar
           cable_car: Kabelbaan
           chair_lift: stuoltsjelift

-          runway_only: Start-/lânings-
+          runway: Start-/lânings-

           taxiway: taksybaan lofthaven
           taxiway: taksybaan lofthaven

-          apron_only: Platfoarm
+          apron: Platfoarm

           admin: Bestjoerlike grins
           admin: Bestjoerlike grins

-          forest_only: Bosk
+          forest: Bosk

           wood: Wâld
           golf: Golfbaan
           park: Park
           wood: Wâld
           golf: Golfbaan
           park: Park

-          common_only: Miente
+          common: Miente

           resident: Wengebiet
           retail: Winkelgebiet
           industrial: Yndustrygebiet
           commercial: Kommersjeel gebiet
           heathland: Heidelân
           resident: Wengebiet
           retail: Winkelgebiet
           industrial: Yndustrygebiet
           commercial: Kommersjeel gebiet
           heathland: Heidelân

-          lake_only: Mar
+          lake: Mar

           reservoir: opslachmar
           farm: Boerepleats
           brownfield: Braaklân
           reservoir: opslachmar
           farm: Boerepleats
           brownfield: Braaklân


@@ -2060,11 +2060,11 @@ fy:
           centre: Sportsintrum
           reserve: Natuerreservaat
           military: Militêr terrein
           centre: Sportsintrum
           reserve: Natuerreservaat
           military: Militêr terrein

-          school_only: Skoalle
+          school: Skoalle

           university: universiteit
           building: Wichtich gebou
           station: Spoarweistasjon
           university: universiteit
           building: Wichtich gebou
           station: Spoarweistasjon

-          summit_only: Top
+          summit: Top

           peak: pyk
           tunnel: Streekte râne = tunnel
           bridge: Swarte râne = brêge
           peak: pyk
           tunnel: Streekte râne = tunnel
           bridge: Swarte râne = brêge