Rename barrier=ditch preset name to "Trench"

We have `waterway=ditch` already and don't want two things labelled "Ditch" to appear in search.
Ditches are more for carrying water, Trenches are more for preventing movement

data/presets.yaml

@@ -1619,8 +1619,8 @@ en:
         terms: "<translate with synonyms or related terms for 'Cycle Barrier', separated by commas>"
       barrier/ditch:
         # barrier=ditch
-        name: Ditch
-        terms: "<translate with synonyms or related terms for 'Ditch', separated by commas>"
+        name: Trench
+        terms: "<translate with synonyms or related terms for 'Trench', separated by commas>"
       barrier/entrance:
         # barrier=entrance
         name: Entrance

data/presets/presets.json

@@ -2367,6 +2367,7 @@
         "name": "Cycle Barrier"
     },
     "barrier/ditch": {
+        "icon": "roadblock",
         "geometry": [
             "line",
             "area"
@@ -2374,7 +2375,7 @@
         "tags": {
             "barrier": "ditch"
         },
-        "name": "Ditch"
+        "name": "Trench"
     },
     "barrier/entrance": {
         "icon": "entrance",

data/presets/presets/barrier/ditch.json

@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "geometry": [
         "line",
         "area"
@@ -6,5 +7,5 @@
     "tags": {
         "barrier": "ditch"
     },
-    "name": "Ditch"
+    "name": "Trench"
 }

dist/locales/en.json

@@ -2002,7 +2002,7 @@
                 "terms": ""
             },
             "barrier/ditch": {
-                "name": "Ditch",
+                "name": "Trench",
                 "terms": ""
             },
             "barrier/entrance": {