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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 94fc77247b8cadc74f8f433dbbc18a05ddedf1a2..112b540440303c6cbf3e3cedcc153b6eef1fa1b3 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1001,6 +1001,14 @@ en:
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
           "yes": "Historic Site"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
           "yes": "Historic Site"

+        information:
+          guidepost: "Guidepost"
+          board: "Information Board"
+          map: "Map"
+          office: "Tourist Office"
+          terminal: "Information Terminal"
+          sign: "Information Sign"
+          stele: "Information Stele"

         junction:
           "yes": "Junction"
         landuse:
         junction:
           "yes": "Junction"
         landuse:


@@ -1073,6 +1081,8 @@ en:
           track: "Running Track"
           water_park: "Water Park"
           "yes": "Leisure"
           track: "Running Track"
           water_park: "Water Park"
           "yes": "Leisure"

+        lock:
+          "yes": "Lock"

         man_made:
           adit: "Adit"
           advertising: "Advertising"
         man_made:
           adit: "Adit"
           advertising: "Advertising"


@@ -1413,6 +1423,17 @@ en:
           building_passage: "Building Passage"
           culvert: "Culvert"
           "yes": "Tunnel"
           building_passage: "Building Passage"
           culvert: "Culvert"
           "yes": "Tunnel"

+        water:
+          lake: "Lake"
+          pond: "Pond"
+          reservoir: "Reservoir"
+          basin: "Water basin"
+          fishpond: "Fish Pond"
+          lagoon: "Lagoon"
+          wastewater: "Waste Water"
+          oxbow: "Oxbow"
+          stream_pool: "Stream Pool"
+          lock: "Lock"

         waterway:
           artificial: "Artificial Waterway"
           boatyard: "Boatyard"
         waterway:
           artificial: "Artificial Waterway"
           boatyard: "Boatyard"