From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 Sep 2021 17:46:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3318'
X-Git-Tag: live~2508
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3fc0f781575cdea8ae4dec5919fb939ed89218aa?hp=22fbd05f1f982cabc8fab60e63c545112c6e0006

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 030fab696..c01a66b2c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -747,6 +747,7 @@ en:
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"
+        crossing: "Crossing"
         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"
@@ -1002,6 +1003,7 @@ en:
           hill: "Hill"
           hot_spring: "Hot Spring"
           island: "Island"
+          isthmus: "Isthmus"
           land: "Land"
           marsh: "Marsh"
           moor: "Moor"
@@ -1016,10 +1018,13 @@ en:
           sand: "Sand"
           scree: "Scree"
           scrub: "Scrub"
+          shingle: "Shingle"
           spring: "Spring"
           stone: "Stone"
           strait: "Strait"
           tree: "Tree"
+          tree_row: "Tree Row"
+          tundra: "Tundra"
           valley: "Valley"
           volcano: "Volcano"
           water: "Water"