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

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

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 98ad15aeb5f8948eeb66e806d38a33d596f70821..cb4623f6891bc11aa7a03b28db52f3f533e0633b 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -175,28 +175,22 @@ fy:
           crematorium: Krematoariurn
           dentist: Toskedokter
           doctors: Dokter
-          dormitory: Studintehûs
           drinking_water: Drinkwetter
           driving_school: Rydskoalle
           embassy: Ambassade
           fast_food: Fast food
-          fire_hydrant: Brânkraan
           fire_station: Brânwar
           food_court: Foodcourt
           fountain: Fontein
           fuel: Brânstof
           grave_yard: Begraafplak
-          gym: Fitnesssintrum
-          health_centre: Sûnenssintrum
           hospital: Sikehûs
           hunting_stand: Jachttoer
           ice_cream: Iis
           kindergarten: Beukerskoalle
           library: Bibleteek
-          market: Merk
           marketplace: Merkplein
           nightclub: Nachtklub
-          nursery: Pjutteboartersplak
           nursing_home: Ferpleechhûs
           office: Kantoar
           parking: Parkeare
@@ -207,7 +201,6 @@ fy:
           preschool: Pjutteboartersplak of beukerskoalle
           prison: Finzenis
           pub: Kafee
-          reception_area: Resepsje
           restaurant: Restaurant
           retirement_home: Bejaardetehûs
           sauna: Sauna
@@ -334,7 +327,6 @@ fy:
           travel_agent: Reisburo
           "yes": Kantoar
         place:
-          airport: Lofthaven
           city: Stêd
           country: Lân
           county: Distrikt
@@ -344,7 +336,6 @@ fy:
           houses: Huzen
           island: Eilân
           locality: Plak
-          moor: Fean
           municipality: Gemeente
           neighbourhood: Wyk
           postcode: Postkoade
@@ -367,7 +358,6 @@ fy:
           greengrocer: Grienteboer
           hairdresser: Kapper
           hifi: Hi-fi
-          insurance: Fersekering
           jewelry: Juwelier
           laundry: Waskerij
           market: Merk
@@ -375,9 +365,7 @@ fy:
           pet: Bistewinkel
           pharmacy: Apoteek
           photo: Fotowinkel
-          salon: Skientmesalon
           second_hand: Kringloopwinkel
-          shopping_centre: Winkelsintrum
           supermarket: Supermerk
           tailor: Kleanmakker
           travel_agency: Reisburo
@@ -612,15 +600,17 @@ fy:
       title: Meidoggers
       heading: Meidoggers
   user_block:
-    partial:
+    show:
+      status: Status
       edit: Bewurkje
+  user_blocks:
+    block:
+      edit: Bewurkje
+    blocks:
       status: Status
       showing_page: Side %{page}
       next: Folgjende »
       previous: « Foarige
-    show:
-      status: Status
-      edit: Bewurkje
   note:
     mine:
       id: Id