From d72a0a04035e9f069bb03e6a0d0d7876c1455957 Mon Sep 17 00:00:00 2001
From: Clarisse Abalos <samantha.abalos@digitalglobe.com>
Date: Fri, 22 Feb 2019 12:11:01 -0500
Subject: [PATCH 1/2] add osmose deprecated tags

---
 data/validator/deprecated.mapcss | 403 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 403 insertions(+)

diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index d292db0..15f35c2 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -1299,6 +1299,7 @@ way[power=busbar] {
 
 /* #16924 */
 *[man_made=MDF],
+*[man_made=mdf],
 *[man_made=telephone_exchange] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "telecom=exchange";
@@ -1370,4 +1371,406 @@ node[fire_hydrant:water_source] {
   suggestAlternative: "water_source";
   fixChangeKey: "fire_hydrant:water_source => water_source";
   group: tr("deprecated tagging");
+}
+
+/* OSMOSE tagwatch cleaner 3030 deprecated Tags --- partially complete*/
+
+*[amenity=chapel]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "amenity=place_of_worship, religion=christian";
+    fixAdd: "amenity=place_of_worship";
+    fixAdd: "religion=christian";
+}
+
+*[amenity = bakery]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=bakery";
+    fixAdd: "shop=bakery";
+    fixRemove: "amenity"
+}
+
+*[amenity = chocolatier]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=chocolatier";
+    fixAdd: "shop=chocolatier";
+    fixRemove: "amenity"
+}
+
+*[amenity = dry_cleaning]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=dry_cleaning";
+    fixAdd: "shop=dry_cleaning";
+    fixRemove: "amenity"
+}
+
+*[amenity = emergency_phone]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "emergency=phone";
+    fixAdd: "emergency=phone";
+    fixRemove: "amenity"
+}
+
+*[amenity = florist],
+*[shop = floristry],
+*[shop = flower],
+*[shop = flowers] {
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=florist";
+    fixAdd: "shop=florist";
+    fixRemove: "amenity"
+}
+
+
+*[amenity = butcher],
+*[shop = butchers] {
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=butcher";
+    fixAdd: "shop=butcher";
+    fixRemove: "amenity"
+}
+
+*[shop *= "car school"],
+*[shop = car_school],
+*[shop *= "driver's education"],
+*[shop *= "driving school"],
+*[shop *= "driver education"] {
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=driving_school";
+    fixAdd: "shop=driving_school";
+}
+
+*[shop=bakers]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=bakery";
+    fixAdd: "shop=bakery";
+}
+
+*[shop = garden],
+*[shop *= "garden shop"],
+*[shop = garden_center],
+*[shop = gardening]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=garden_centre";
+    fixAdd: "shop=garden_centre"
+}
+
+/* Deprecated Tags-- OSMOSE disused Item 4010*/
+
+*[aerialway=canopy]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "aerialway=zip_line";
+    fixAdd: "aerialway=zipline";
+}
+
+*[amenity=abandoned]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "abandoned:amenity=*"
+}
+
+*[amenity=citymap_post]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "tourism=information";
+    fixRemove: "amenity";
+    fixAdd: "tourism=information";
+}
+
+*[amenity=creche]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "amenity=childcare or amenity=kindergarten"
+}
+
+*[amenity=ev_charging],
+*[amenity=charging]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "amenity=charging_station";
+    fixRemove: "amenity";
+    fixAdd: "amenity=charging_station";
+}
+
+*[amenity=garages],
+*[amenity=garage]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "amenity=parking + parking=* or landuse=garages";
+}
+
+*[amenity=nursery]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "amenity=childcare or amenity=kindergarten";
+}
+
+*[amenity=preschool]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "amenity=kindergarten";
+    fixAdd: "amenity=kindergarten";
+}
+
+*[amenity=real_estate]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "office=estate_agent";
+    fixRemove: "amenity";
+    fixAdd: "office=estate_agent";
+}
+
+*[office=real_estate]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "office=estate_agent";
+    fixAdd: "office=estate_agent";
+}
+
+*[shop=real_estate]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "office=estate_agent";
+    fixRemove: "shop";
+    fixAdd: "office=estate_agent";
+}
+
+*[amenity=sauna]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "leisure=sauna";
+    fixRemove: "amenity";
+    fixAdd: "leisure=sauna";
+}
+
+*[amenity=winery]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=winery or craft=winery";
+}
+
+*[amenity=youth_centre],
+*[amenity=youth_center]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "amenity=community_centre + community_centre:for=juvenile or community_centre:for=child;juvenile";
+}
+
+*[bridge=arch],
+*[bridge=beam],
+*[bridge=humpback],
+*[bridge=suspension]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "bridge=yes + bridge:structure={0.value}";
+    fixAdd: "bridge=yes";
+    fixAdd: "bridge:structure={0.value}";
+}
+
+*[bridge=lift],
+*[bridge=swing]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "bridge=movable + bridge:structure={0.value}";
+    fixAdd: "bridge=movable";
+    fixAdd: "bridge:structure={0.value}";
+}
+
+*[bridge=pontoon]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "bridge=yes + bridge:structure=floating";
+    fixAdd: "bridge=yes";
+    fixAdd: "bridge:structure=floating";
+}
+
+*[building:type]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "building=*";
+}
+
+*[escalator]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "highway=steps + conveying=*";
+}
+
+*[fenced]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "barrier=fence";
+    fixRemove: "fenced";
+    fixAdd: "barrier=fence";
+}
+
+*[highway=abandoned]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "abandoned:highway=*";
+}
+
+*[highway=minor]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "highway=tertiary or highway=unclassified or highway=service";
+}
+
+*[historic_name]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "old_name=* or name=*";
+}
+
+*[historic=museum]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "tourism=museum";
+    fixRemove: "historic";
+    fixAdd: "tourism=museum";
+}
+
+*[landuse=field]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "landuse=farmland";
+    fixAdd: "landuse=farmland";
+}
+
+*[leisure=beach]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "natural=beach";
+    fixRemove: "leisure";
+    fixAdd: "natural=beach";
+}
+
+*[leisure=club]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "club=*";
+}
+
+*[leisure=video_arcade]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "leisure=adult_gaming_centre or leisure=amusement_arcade";
+}
+
+*[man_made=cooling_tower]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "man_made=tower + tower:type=cooling";
+    fixAdd: "man_made=tower";
+    fixAdd: "tower:type=cooling";
+}
+*[man_made=hot_water_tank]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "man_made=storage_tank + content=hot_water";
+    fixAdd: "man_made=storage_tank";
+    fixAdd: "content=hot_water";
+}
+*[man_made=jetty]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "man_made=pier";
+    fixAdd: "man_made=pier";
+}
+
+*[man_made=village_pump]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "man_made=water_well";
+    fixAdd: "man_made=water_well";
+}
+
+*[man_made=water_tank]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "man_made=storage_tank + content=water";
+    fixAdd: "man_made=storage_tank";
+    fixAdd: "content=water";
+}
+
+*[natural=moor]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+}
+
+*[noexit=no]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "fixme=continue";
+}
+
+*[office=administrative]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "office=government";
+    fixAdd: "office=government";
+}
+*[power=underground_cable]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "power=cable + location=underground";
+    fixAdd: "power=cable";
+    fixAdd: "location=underground";
+}
+
+*[railway=preserved]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "historic=railway + railway= + railway:preserved=yes";
+}
+
+*[shop=dive]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=scuba_diving";
+    fixAdd: "shop=scuba_diving";
+}
+
+*[shop=furnace]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=fireplace or shop=houseware";
+}
+
+*[shop=moneylender]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "shop=money_lender";
+    fixAdd: "shop=money_lender";
+}
+
+*[sport=paragliding]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "sport=free_flying";
+    fixAdd: "sport=free_flying";
+}
+
+*[tourism=bed_and_breakfast]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "tourism=guest_house + guest_house=bed_and_breakfast";
+    fixAdd: "tourism=guest_house";
+    fixAdd: "guest_house=bed_and_breakfast";
+}
+
+*[wood]{
+    throwWarning: "{0.tag} is deprecated";
+    group: tr("deprecated tagging");
+    suggestAlternative: "leaf_type=*";
 }
\ No newline at end of file
-- 
2.7.4


From 0f2e8c1c884e5ca81bb566608995750ad9056339 Mon Sep 17 00:00:00 2001
From: Clarisse Abalos <samantha.abalos@digitalglobe.com>
Date: Fri, 22 Feb 2019 17:26:25 -0500
Subject: [PATCH 2/2] translate deprecated warnings

---
 data/validator/deprecated.mapcss | 108 +++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index 15f35c2..6b0ff4e 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -1376,7 +1376,7 @@ node[fire_hydrant:water_source] {
 /* OSMOSE tagwatch cleaner 3030 deprecated Tags --- partially complete*/
 
 *[amenity=chapel]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "amenity=place_of_worship, religion=christian";
     fixAdd: "amenity=place_of_worship";
@@ -1384,7 +1384,7 @@ node[fire_hydrant:water_source] {
 }
 
 *[amenity = bakery]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=bakery";
     fixAdd: "shop=bakery";
@@ -1392,7 +1392,7 @@ node[fire_hydrant:water_source] {
 }
 
 *[amenity = chocolatier]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=chocolatier";
     fixAdd: "shop=chocolatier";
@@ -1400,7 +1400,7 @@ node[fire_hydrant:water_source] {
 }
 
 *[amenity = dry_cleaning]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=dry_cleaning";
     fixAdd: "shop=dry_cleaning";
@@ -1408,7 +1408,7 @@ node[fire_hydrant:water_source] {
 }
 
 *[amenity = emergency_phone]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "emergency=phone";
     fixAdd: "emergency=phone";
@@ -1419,7 +1419,7 @@ node[fire_hydrant:water_source] {
 *[shop = floristry],
 *[shop = flower],
 *[shop = flowers] {
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=florist";
     fixAdd: "shop=florist";
@@ -1429,7 +1429,7 @@ node[fire_hydrant:water_source] {
 
 *[amenity = butcher],
 *[shop = butchers] {
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=butcher";
     fixAdd: "shop=butcher";
@@ -1441,14 +1441,14 @@ node[fire_hydrant:water_source] {
 *[shop *= "driver's education"],
 *[shop *= "driving school"],
 *[shop *= "driver education"] {
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=driving_school";
     fixAdd: "shop=driving_school";
 }
 
 *[shop=bakers]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=bakery";
     fixAdd: "shop=bakery";
@@ -1458,7 +1458,7 @@ node[fire_hydrant:water_source] {
 *[shop *= "garden shop"],
 *[shop = garden_center],
 *[shop = gardening]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=garden_centre";
     fixAdd: "shop=garden_centre"
@@ -1467,20 +1467,20 @@ node[fire_hydrant:water_source] {
 /* Deprecated Tags-- OSMOSE disused Item 4010*/
 
 *[aerialway=canopy]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "aerialway=zip_line";
     fixAdd: "aerialway=zipline";
 }
 
 *[amenity=abandoned]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "abandoned:amenity=*"
 }
 
 *[amenity=citymap_post]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "tourism=information";
     fixRemove: "amenity";
@@ -1488,14 +1488,14 @@ node[fire_hydrant:water_source] {
 }
 
 *[amenity=creche]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "amenity=childcare or amenity=kindergarten"
 }
 
 *[amenity=ev_charging],
 *[amenity=charging]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "amenity=charging_station";
     fixRemove: "amenity";
@@ -1504,26 +1504,26 @@ node[fire_hydrant:water_source] {
 
 *[amenity=garages],
 *[amenity=garage]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "amenity=parking + parking=* or landuse=garages";
 }
 
 *[amenity=nursery]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "amenity=childcare or amenity=kindergarten";
 }
 
 *[amenity=preschool]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "amenity=kindergarten";
     fixAdd: "amenity=kindergarten";
 }
 
 *[amenity=real_estate]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "office=estate_agent";
     fixRemove: "amenity";
@@ -1531,14 +1531,14 @@ node[fire_hydrant:water_source] {
 }
 
 *[office=real_estate]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "office=estate_agent";
     fixAdd: "office=estate_agent";
 }
 
 *[shop=real_estate]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "office=estate_agent";
     fixRemove: "shop";
@@ -1546,7 +1546,7 @@ node[fire_hydrant:water_source] {
 }
 
 *[amenity=sauna]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "leisure=sauna";
     fixRemove: "amenity";
@@ -1554,14 +1554,14 @@ node[fire_hydrant:water_source] {
 }
 
 *[amenity=winery]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=winery or craft=winery";
 }
 
 *[amenity=youth_centre],
 *[amenity=youth_center]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "amenity=community_centre + community_centre:for=juvenile or community_centre:for=child;juvenile";
 }
@@ -1570,7 +1570,7 @@ node[fire_hydrant:water_source] {
 *[bridge=beam],
 *[bridge=humpback],
 *[bridge=suspension]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "bridge=yes + bridge:structure={0.value}";
     fixAdd: "bridge=yes";
@@ -1579,7 +1579,7 @@ node[fire_hydrant:water_source] {
 
 *[bridge=lift],
 *[bridge=swing]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "bridge=movable + bridge:structure={0.value}";
     fixAdd: "bridge=movable";
@@ -1587,7 +1587,7 @@ node[fire_hydrant:water_source] {
 }
 
 *[bridge=pontoon]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "bridge=yes + bridge:structure=floating";
     fixAdd: "bridge=yes";
@@ -1595,19 +1595,19 @@ node[fire_hydrant:water_source] {
 }
 
 *[building:type]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "building=*";
 }
 
 *[escalator]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "highway=steps + conveying=*";
 }
 
 *[fenced]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "barrier=fence";
     fixRemove: "fenced";
@@ -1615,25 +1615,25 @@ node[fire_hydrant:water_source] {
 }
 
 *[highway=abandoned]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "abandoned:highway=*";
 }
 
 *[highway=minor]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "highway=tertiary or highway=unclassified or highway=service";
 }
 
 *[historic_name]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "old_name=* or name=*";
 }
 
 *[historic=museum]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "tourism=museum";
     fixRemove: "historic";
@@ -1641,14 +1641,14 @@ node[fire_hydrant:water_source] {
 }
 
 *[landuse=field]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "landuse=farmland";
     fixAdd: "landuse=farmland";
 }
 
 *[leisure=beach]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "natural=beach";
     fixRemove: "leisure";
@@ -1656,47 +1656,47 @@ node[fire_hydrant:water_source] {
 }
 
 *[leisure=club]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "club=*";
 }
 
 *[leisure=video_arcade]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "leisure=adult_gaming_centre or leisure=amusement_arcade";
 }
 
 *[man_made=cooling_tower]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "man_made=tower + tower:type=cooling";
     fixAdd: "man_made=tower";
     fixAdd: "tower:type=cooling";
 }
 *[man_made=hot_water_tank]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "man_made=storage_tank + content=hot_water";
     fixAdd: "man_made=storage_tank";
     fixAdd: "content=hot_water";
 }
 *[man_made=jetty]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "man_made=pier";
     fixAdd: "man_made=pier";
 }
 
 *[man_made=village_pump]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "man_made=water_well";
     fixAdd: "man_made=water_well";
 }
 
 *[man_made=water_tank]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "man_made=storage_tank + content=water";
     fixAdd: "man_made=storage_tank";
@@ -1704,24 +1704,24 @@ node[fire_hydrant:water_source] {
 }
 
 *[natural=moor]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
 }
 
 *[noexit=no]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "fixme=continue";
 }
 
 *[office=administrative]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "office=government";
     fixAdd: "office=government";
 }
 *[power=underground_cable]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "power=cable + location=underground";
     fixAdd: "power=cable";
@@ -1729,40 +1729,40 @@ node[fire_hydrant:water_source] {
 }
 
 *[railway=preserved]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "historic=railway + railway= + railway:preserved=yes";
 }
 
 *[shop=dive]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=scuba_diving";
     fixAdd: "shop=scuba_diving";
 }
 
 *[shop=furnace]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=fireplace or shop=houseware";
 }
 
 *[shop=moneylender]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "shop=money_lender";
     fixAdd: "shop=money_lender";
 }
 
 *[sport=paragliding]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "sport=free_flying";
     fixAdd: "sport=free_flying";
 }
 
 *[tourism=bed_and_breakfast]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "tourism=guest_house + guest_house=bed_and_breakfast";
     fixAdd: "tourism=guest_house";
@@ -1770,7 +1770,7 @@ node[fire_hydrant:water_source] {
 }
 
 *[wood]{
-    throwWarning: "{0.tag} is deprecated";
+    throwWarning: tr("{0} is deprecated", "{0.tag}");
     group: tr("deprecated tagging");
     suggestAlternative: "leaf_type=*";
 }
\ No newline at end of file
-- 
2.7.4