From 3b88fe999b954e0b8c8e6001b7884bd3de0be986 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Tue, 3 Feb 2015 12:42:36 -0500
Subject: [PATCH] Change description for `amenity=farm` to "Farmland"

---
 data/presets.yaml                          | 4 ++--
 data/presets/presets.json                  | 6 ++----
 data/presets/presets/landuse/farm.json     | 2 +-
 data/presets/presets/landuse/farmland.json | 4 +---
 dist/locales/en.json                       | 4 ++--
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 53605b332..74d3abeff 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1407,8 +1407,8 @@ en:
         name: Construction
         terms: "<translate with synonyms or related terms for 'Construction', separated by commas>"
       landuse/farm:
-        name: Farm
-        terms: "<translate with synonyms or related terms for 'Farm', separated by commas>"
+        name: Farmland
+        terms: "<translate with synonyms or related terms for 'Farmland', separated by commas>"
       landuse/farmland:
         name: Farmland
         terms: "<translate with synonyms or related terms for 'Farmland', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6c6c755fe..232143ef0 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4707,7 +4707,7 @@
             "landuse": "farm"
         },
         "terms": [],
-        "name": "Farm",
+        "name": "Farmland",
         "searchable": false
     },
     "landuse/farmland": {
@@ -4721,9 +4721,7 @@
         "tags": {
             "landuse": "farmland"
         },
-        "terms": [
-            "farmland"
-        ],
+        "terms": [],
         "name": "Farmland"
     },
     "landuse/farmyard": {
diff --git a/data/presets/presets/landuse/farm.json b/data/presets/presets/landuse/farm.json
index 59c9362c8..96e63edfc 100644
--- a/data/presets/presets/landuse/farm.json
+++ b/data/presets/presets/landuse/farm.json
@@ -11,6 +11,6 @@
         "landuse": "farm"
     },
     "terms": [],
-    "name": "Farm",
+    "name": "Farmland",
     "searchable": false
 }
diff --git a/data/presets/presets/landuse/farmland.json b/data/presets/presets/landuse/farmland.json
index 0189da4d0..6c13c415f 100644
--- a/data/presets/presets/landuse/farmland.json
+++ b/data/presets/presets/landuse/farmland.json
@@ -9,8 +9,6 @@
     "tags": {
         "landuse": "farmland"
     },
-    "terms": [
-        "farmland"
-    ],
+    "terms": [],
     "name": "Farmland"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 43ab7259e..f403db26d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2396,12 +2396,12 @@
                 "terms": ""
             },
             "landuse/farm": {
-                "name": "Farm",
+                "name": "Farmland",
                 "terms": ""
             },
             "landuse/farmland": {
                 "name": "Farmland",
-                "terms": "farmland"
+                "terms": ""
             },
             "landuse/farmyard": {
                 "name": "Farmyard",