From b07f205db9ad4a8994f511f504c6fdae2c47a4c1 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Tue, 3 Feb 2015 10:48:40 -0500
Subject: [PATCH] should be shop=houseware, not shop=household (closes #2509)

---
 data/presets.yaml                                        | 6 +++---
 data/presets/presets.json                                | 9 +++++----
 .../presets/shop/{household.json => houseware.json}      | 7 ++++---
 data/taginfo.json                                        | 2 +-
 dist/locales/en.json                                     | 6 +++---
 5 files changed, 16 insertions(+), 14 deletions(-)
 rename data/presets/presets/shop/{household.json => houseware.json} (71%)

diff --git a/data/presets.yaml b/data/presets.yaml
index 5d5c7b38c..dbed94716 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1996,9 +1996,9 @@ en:
       shop/hifi:
         name: Hifi Store
         terms: "<translate with synonyms or related terms for 'Hifi Store', separated by commas>"
-      shop/household:
-        name: Household Store
-        terms: "<translate with synonyms or related terms for 'Household Store', separated by commas>"
+      shop/houseware:
+        name: Houseware Store
+        terms: "<translate with synonyms or related terms for 'Houseware Store', separated by commas>"
       shop/interior_decoration:
         name: Interior Decoration Store
         terms: "<translate with synonyms or related terms for 'Interior Decoration Store', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e4e354830..f25cd56fd 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7899,7 +7899,7 @@
         },
         "name": "Hifi Store"
     },
-    "shop/household": {
+    "shop/houseware": {
         "icon": "shop",
         "fields": [
             "operator",
@@ -7912,12 +7912,13 @@
             "area"
         ],
         "terms": [
-            "home"
+            "home",
+            "household"
         ],
         "tags": {
-            "shop": "household"
+            "shop": "houseware"
         },
-        "name": "Household Store"
+        "name": "Houseware Store"
     },
     "shop/interior_decoration": {
         "icon": "shop",
diff --git a/data/presets/presets/shop/household.json b/data/presets/presets/shop/houseware.json
similarity index 71%
rename from data/presets/presets/shop/household.json
rename to data/presets/presets/shop/houseware.json
index 6831dba6c..8bbb42d27 100644
--- a/data/presets/presets/shop/household.json
+++ b/data/presets/presets/shop/houseware.json
@@ -11,10 +11,11 @@
         "area"
     ],
     "terms": [
-        "home"
+        "home",
+        "household"
     ],
     "tags": {
-        "shop": "household"
+        "shop": "houseware"
     },
-    "name": "Household Store"
+    "name": "Houseware Store"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 4fad9742c..d9dc3b7b4 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1862,7 +1862,7 @@
         },
         {
             "key": "shop",
-            "value": "household"
+            "value": "houseware"
         },
         {
             "key": "shop",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index bb2a06e3d..abc0bfc7f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3182,9 +3182,9 @@
                 "name": "Hifi Store",
                 "terms": "stereo,video"
             },
-            "shop/household": {
-                "name": "Household Store",
-                "terms": "home"
+            "shop/houseware": {
+                "name": "Houseware Store",
+                "terms": "home,household"
             },
             "shop/interior_decoration": {
                 "name": "Interior Decoration Store",