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

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

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 5cf4239c9f706a3cc681252e3241f5b1dffa1c47..cb1eceeae7bab85c0d3536442fdf24d3a14df52f 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -520,30 +520,24 @@ nds:
           footway: Footpadd
           rail: Iesenbahn
           subway: U-Bahn
           footway: Footpadd
           rail: Iesenbahn
           subway: U-Bahn

-          cable:
-          - Kavelbahn
-          - Skilift
-          runway:
-          - Fleger-Lannbahn
-          - Fleger-Rullweg
-          apron_only: Terminal
+          cable_car: Kavelbahn
+          chair_lift: Skilift
+          runway: Fleger-Lannbahn
+          taxiway: Fleger-Rullweg
+          apron: Terminal

           admin: Grenz
           admin: Grenz

-          forest:
-          - Forst
-          - Woold
+          forest: Forst
+          wood: Woold

           golf: Golfplatz
           park: Park
           golf: Golfplatz
           park: Park

-          common:
-          - Wisch
-          - Wisch
+          common: Wisch

           resident: Wahnrebeed
           retail: Ladenrebeed
           industrial: Industrierebeed
           commercial: Hannelsrebeed
           heathland: Heid
           resident: Wahnrebeed
           retail: Ladenrebeed
           industrial: Industrierebeed
           commercial: Hannelsrebeed
           heathland: Heid

-          lake:
-          - See
-          - Stausee
+          lake: See
+          reservoir: Stausee

           farm: Buurnhoff
           brownfield: Industrie-Braakland
           cemetery: Karkhoff
           farm: Buurnhoff
           brownfield: Industrie-Braakland
           cemetery: Karkhoff


@@ -552,14 +546,12 @@ nds:
           centre: Sportzentrum
           reserve: Naturpark
           military: Militärrebeed
           centre: Sportzentrum
           reserve: Naturpark
           military: Militärrebeed

-          school:
-          - School
-          - Universität
+          school: School
+          university: Universität

           building: Wichtig Bowark
           station: Bahnhoff
           building: Wichtig Bowark
           station: Bahnhoff

-          summit:
-          - Bargtopp
-          - Bargtopp
+          summit: Bargtopp
+          peak: Bargtopp

           tunnel: Strekel-Rand = Tunnel
           bridge: Fett Rand = Brügg
           private: Privat Togang
           tunnel: Strekel-Rand = Tunnel
           bridge: Fett Rand = Brügg
           private: Privat Togang