Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15367)
+++ trunk/data/defaultpresets.xml	(revision 15372)
@@ -337,5 +337,5 @@
     </chunk>
     <chunk id="power_loc">
-        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop" values_context="power" />
+        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" />
     </chunk>
     <chunk id="power_extra">
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 15367)
+++ trunk/data/validator/deprecated.mapcss	(revision 15372)
@@ -189,5 +189,19 @@
   fixAdd: "power=substation";
 }
-  
+
+*[location=rooftop] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "location=roof";
+  group: tr("deprecated tagging");
+  fixAdd: "location=roof";
+}
+
+*[generator:location=*] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "location";
+  group: tr("deprecated tagging");
+  fixChangeKey: "generator:location => location";
+}
+
 *[generator:method=dam] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
Index: trunk/data/validator/ignoretags.cfg
===================================================================
--- trunk/data/validator/ignoretags.cfg	(revision 15367)
+++ trunk/data/validator/ignoretags.cfg	(revision 15372)
@@ -64,5 +64,12 @@
 E:hour_off
 E:tower:type
+E:icn
+E:ncn
+E:rcn
+E:lcn
+E:icn_ref
+E:ncn_ref
 E:rcn_ref
+E:lcn_ref
 E:place_name
 E:cycleway