From fa15acc4bb16ad2a9cd9fadb035ecdf379dc2590 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 7 Oct 2018 14:15:40 -0400
Subject: [PATCH] Use 'en-us' "Color"

---
 data/presets.yaml               | 2 +-
 data/presets/fields.json        | 2 +-
 data/presets/fields/colour.json | 2 +-
 data/taginfo.json               | 2 +-
 dist/locales/en.json            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index b292d1c24..f81d2a5cf 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -323,7 +323,7 @@ en:
         label: Collection Times
       colour:
         # colour=*
-        label: Colour
+        label: Color
       comment:
         # comment=*
         label: Changeset Comment
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 1d8fc8bf7..4212d95e1 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -53,7 +53,7 @@
     "clothes": {"key": "clothes", "type": "semiCombo", "label": "Clothes"},
     "club": {"key": "club", "type": "typeCombo", "label": "Type"},
     "collection_times": {"key": "collection_times", "type": "text", "label": "Collection Times"},
-    "colour": {"key": "colour", "type": "text", "label": "Colour"},
+    "colour": {"key": "colour", "type": "text", "label": "Color"},
     "comment": {"key": "comment", "type": "textarea", "label": "Changeset Comment", "placeholder": "Brief description of your contributions (required)"},
     "communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"},
     "construction": {"key": "construction", "type": "combo", "label": "Type"},
diff --git a/data/presets/fields/colour.json b/data/presets/fields/colour.json
index 6ab9de9af..d53e2a950 100644
--- a/data/presets/fields/colour.json
+++ b/data/presets/fields/colour.json
@@ -1,5 +1,5 @@
 {
     "key": "colour",
     "type": "text",
-    "label": "Colour"
+    "label": "Color"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 299bcf6ee..4af7e5ca2 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -6689,7 +6689,7 @@
     {"key": "castle_type", "description": "Type"},
     {"key": "clothes", "description": "Clothes"},
     {"key": "collection_times", "description": "Collection Times"},
-    {"key": "colour", "description": "Colour"},
+    {"key": "colour", "description": "Color"},
     {"key": "comment", "description": "Changeset Comment"},
     {"key": "communication:", "description": "Communication Types"},
     {"key": "construction", "description": "Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 0d4eb105b..19ffe1642 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1731,7 +1731,7 @@
                     "label": "Collection Times"
                 },
                 "colour": {
-                    "label": "Colour"
+                    "label": "Color"
                 },
                 "comment": {
                     "label": "Changeset Comment",