Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 673)
+++ trunk/presets/presets.xml	(revision 674)
@@ -13,17 +13,17 @@
 		<label text=" " />
 		<key key="highway" value="motorway" />
-		<text key="ref" text="Reference:" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="lanes" text="Lanes:" values="1,2,3,4,5" default="2" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="on" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
+		<text key="ref" text="Reference" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="on" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
 	</item>
 
@@ -35,12 +35,12 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="lanes" text="Lanes:" values="1,2,3,4,5" default="2" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="on" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="on" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
 	</item>
 
@@ -49,17 +49,17 @@
 		<label text=" " />
 		<key key="highway" value="trunk" />
-		<text key="ref" text="Reference:" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="lanes" text="Lanes:" values="1,2,3,4,5" default="2" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="on" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
+		<text key="ref" text="Reference" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="on" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
 	</item>
 
@@ -68,16 +68,16 @@
 		<label text=" " />
 		<key key="highway" value="trunk_link" />
-		<text key="ref" text="Reference:" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="lanes" text="Lanes:" values="1,2,3,4,5" default="2" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="on" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
+		<text key="ref" text="Reference" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="on" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
 	</item>
 
@@ -87,6 +87,6 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="exit_nr" text="Exit Number:" default="" delete_if_empty="true" />
-		<text key="exit_name" text="Exit Name:" default="" delete_if_empty="true" />
+		<text key="exit_nr" text="Exit Number" default="" delete_if_empty="true" />
+		<text key="exit_name" text="Exit Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -97,17 +97,17 @@
 		<label text=" " />
 		<key key="highway" value="primary" />
-		<text key="ref" text="Reference:" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="lanes" text="Lanes:" values="1,2,3,4,5" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
+		<text key="ref" text="Reference" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
 	</item>
 
@@ -119,12 +119,12 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="lanes" text="Lanes:" values="1,2,3,4,5" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
 	</item>
 
@@ -133,17 +133,17 @@
 		<label text=" " />
 		<key key="highway" value="secondary" />
-		<text key="ref" text="Reference:" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="lanes" text="Lanes:" values="1,2,3,4,5" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
+		<text key="ref" text="Reference" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
 	</item>
 	
@@ -152,16 +152,16 @@
 		<label text=" " />
 		<key key="highway" value="tertiary" />
-		<text key="ref" text="Reference:" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
+		<text key="ref" text="Reference" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
 	</item>
 
@@ -173,13 +173,13 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -192,13 +192,13 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 	
@@ -207,16 +207,16 @@
 		<label text=" " />
 		<key key="highway" value="residential" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -225,16 +225,16 @@
 		<label text=" " />
 		<key key="highway" value="living_street" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -243,16 +243,16 @@
 		<label text=" " />
 		<key key="highway" value="pedestrian" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -264,21 +264,21 @@
 		<check key="toll" text="Toll" default="off" delete_if_empty="true"  />
 		<check key="noexit" text="No exit (cul-de-sac)" default="off" delete_if_empty="true"  />
-		<combo key="access" text="Access:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="bicycle" text="Bicycle:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true"  />
-		<combo key="foot" text="Foot:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="goods" text="Goods:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="hgv" text="Heavy Goods Vehicles (hgv):" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="horse" text="Horse:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="motorcycle" text="Motorcycle:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="motorcar" text="Motorcar:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="psv" text="Public Service Vehicles (psv):" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="motorboat" text="Motorboat:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="boat" text="Boat:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="minspeed" text="Min. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="maxweight" text="Max. weight (tonnes):" default="" delete_if_empty="true" />
-		<text key="maxheight" text="Max. Height (metres):" default="" delete_if_empty="true" />
-		<text key="maxwidth" text="Max. Width (metres):" default="" delete_if_empty="true" />
-		<text key="maxlength" text="Max. Length (metres):" default="" delete_if_empty="true" />
+		<combo key="access" text="Access" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="bicycle" text="Bicycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true"  />
+		<combo key="foot" text="Foot" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="goods" text="Goods" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="horse" text="Horse" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="psv" text="Public Service Vehicles (psv)" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorboat" text="Motorboat" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="boat" text="Boat" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="minspeed" text="Min. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" />
+		<text key="maxheight" text="Max. Height (metres)" default="" delete_if_empty="true" />
+		<text key="maxwidth" text="Max. Width (metres)" default="" delete_if_empty="true" />
+		<text key="maxlength" text="Max. Length (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -287,17 +287,17 @@
 		<label text=" " />
 		<key key="junction" value="roundabout" />
-		<combo key="highway" text="Type:" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="on" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="lanes" text="Lanes:" values="1,2,3,4,5" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="on" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -310,14 +310,14 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -329,5 +329,5 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -339,14 +339,14 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="oneway" text="Oneway:" default="off" delete_if_empty="true" />
-		<check key="bridge" text="Bridge:" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel:" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting:" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment:" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -358,5 +358,5 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
 		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
@@ -364,9 +364,9 @@
 		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
 		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<combo key="junction" text="Junction:" values="roundabout" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<combo key="junction" text="Junction" values="roundabout" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -380,5 +380,5 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
 		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
@@ -386,8 +386,8 @@
 		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
 		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -399,5 +399,5 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
 		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
@@ -405,8 +405,8 @@
 		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
 		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 	
@@ -418,5 +418,5 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
 		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
@@ -424,8 +424,8 @@
 		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
 		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 	
@@ -437,5 +437,5 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
 		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
@@ -443,8 +443,8 @@
 		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
 		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -454,15 +454,15 @@
 		<key key="highway" value="path" />
 		<label text=" " />
-		<label text="Type:" />
-		<combo key="motorcar" text="Motorcar:" values="yes,designated,no" default="" delete_if_empty="true" />
-		<combo key="snowmobile" text="Snowmobile:" values="yes,designated,no" default="" delete_if_empty="true" />
-		<combo key="horse" text="Horse:" values="yes,designated,no" default="" delete_if_empty="true" />
-		<combo key="bicycle" text="Bicycle:" values="yes,designated,no" default="" delete_if_empty="true" />
-		<combo key="ski" text="Ski:" values="yes,designated,no" default="" delete_if_empty="true" />
-		<combo key="foot" text="Foot:" values="yes,designated,no" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<label text="Type" />
+		<combo key="motorcar" text="Motorcar" values="yes,designated,no" default="" delete_if_empty="true" />
+		<combo key="snowmobile" text="Snowmobile" values="yes,designated,no" default="" delete_if_empty="true" />
+		<combo key="horse" text="Horse" values="yes,designated,no" default="" delete_if_empty="true" />
+		<combo key="bicycle" text="Bicycle" values="yes,designated,no" default="" delete_if_empty="true" />
+		<combo key="ski" text="Ski" values="yes,designated,no" default="" delete_if_empty="true" />
+		<combo key="foot" text="Foot" values="yes,designated,no" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 		<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
 		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
@@ -470,8 +470,8 @@
 		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
 		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		<text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+		<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -481,6 +481,6 @@
 	<item name="Ways/Points" icon="presets/waypoints.png">
 		<label text="Road Points" />
-		<combo key="highway" text="Type:" values="motorway_junction,services,toll_booth,traffic_signals,crossing,mini_roundabout,incline,incline_steep,viaduct,stop,gate,bus_stop,stile,cattle_grid,ford,turning_circle" default="" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<combo key="highway" text="Type" values="motorway_junction,services,toll_booth,traffic_signals,crossing,mini_roundabout,incline,incline_steep,viaduct,stop,gate,bus_stop,stile,cattle_grid,ford,turning_circle" default="" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 		<check key="mountain_pass" text="Mountain Pass" default="off" delete_if_empty="true" />
 	</item>
@@ -495,12 +495,12 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 	
@@ -513,12 +513,12 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 	
@@ -531,12 +531,12 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 	
@@ -549,12 +549,12 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 	
@@ -567,12 +567,12 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 	
@@ -585,12 +585,12 @@
 		<label text="Optional Attributes:" />
 		<label text=" " />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		<combo key="surface" text="Surface:" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-		<combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		<text key="width" text="Width (metres):" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+		<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+		<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+		<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+		<combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+		<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
 
@@ -600,5 +600,5 @@
 		<label text=" " />
 		<key key="railway" value="rail"/>
-		<combo key="service" text="Optional Types:" values="yard,siding,spur" default="" delete_if_empty="true" />
+		<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 	</item>
 	
@@ -607,5 +607,5 @@
 		<label text=" " />
 		<key key="railway" value="narrow_gauge"/>
-		<combo key="service" text="Optional Types:" values="yard,siding,spur" default="" delete_if_empty="true" />
+		<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 	</item>
 
@@ -614,5 +614,5 @@
 		<label text=" " />
 		<key key="railway" value="monorail"/>
-		<combo key="service" text="Optional Types:" values="yard,siding,spur" default="" delete_if_empty="true" />
+		<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 	</item>
 
@@ -621,5 +621,5 @@
 		<label text=" " />
 		<key key="railway" value="light_rail"/>
-		<combo key="service" text="Optional Types:" values="yard,siding,spur" default="" delete_if_empty="true" />
+		<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 	</item>
 
@@ -628,5 +628,5 @@
 		<label text=" " />
 		<key key="railway" value="subway"/>
-		<combo key="service" text="Optional Types:" values="yard,siding,spur" default="" delete_if_empty="true" />
+		<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 	</item>
 
@@ -635,5 +635,5 @@
 		<label text=" " />
 		<key key="railway" value="tram"/>
-		<combo key="service" text="Optional Types:" values="yard,siding,spur" default="" delete_if_empty="true" />
+		<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 	</item>
 
@@ -642,5 +642,5 @@
 		<label text=" " />
 		<key key="railway" value="preserved"/>
-		<combo key="service" text="Optional Types:" values="yard,siding,spur" default="" delete_if_empty="true" />
+		<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 	</item>
 	
@@ -649,5 +649,5 @@
 		<label text=" " />
 		<key key="railway" value="disused"/>
-		<combo key="service" text="Optional Types:" values="yard,siding,spur" default="" delete_if_empty="true" />
+		<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 	</item>
 	
@@ -659,7 +659,7 @@
 	
 	<item name="Railway/Railway Point" icon="presets/railwaypoint.png">
-		<label text="Railway Points" />
-		<combo key="railway" text="Type:" values="station,halt,tram_stop,subway_entrance,crossing,level_crossing,turntable,viaduct" default="" delete_if_empty="true" />
-		<text key="name" text="Name:" default="" delete_if_empty="true"  />
+		<label text="Edit a Railway Point" />
+		<combo key="railway" text="Type" values="station,halt,tram_stop,subway_entrance,crossing,level_crossing,turntable,viaduct" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true"  />
 	</item>
 	
@@ -669,5 +669,5 @@
 		<label text=" " />
 		<key key="waterway" value="river" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -676,5 +676,5 @@
 		<label text=" " />
 		<key key="waterway" value="dock" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -683,5 +683,5 @@
 		<label text=" " />
 		<key key="waterway" value="canal" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -690,5 +690,5 @@
 		<label text=" " />
 		<key key="waterway" value="drain" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -697,5 +697,5 @@
 		<label text=" " />
 		<key key="waterway" value="stream" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -706,5 +706,5 @@
 		<label text=" " />
 		<key key="waterway" value="weir" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -713,5 +713,5 @@
 		<label text=" " />
 		<key key="waterway" value="dam" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -719,6 +719,6 @@
 		<label text="Edit Waterway Points" />
 		<label text=" " />
-		<combo key="waterway" text="Type:" values="lock_gate,turning_point,aqueduct,boatyard,water_point,waste_disposal,mooring,weir" default="" delete_if_empty="true" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<combo key="waterway" text="Type" values="lock_gate,turning_point,aqueduct,boatyard,water_point,waste_disposal,mooring,weir" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -730,6 +730,6 @@
 		<label text="Edit Fuel" />
 		<key key="amenity" value="fuel" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<text key="operator" text="Operator:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<text key="operator" text="Operator" default="" delete_if_empty="true" />
 	</item>
 
@@ -737,5 +737,5 @@
 		<label text="Edit Parking" />
 		<key key="amenity" value="parking" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -743,6 +743,6 @@
 		<label text="Edit Car Rental" />
 		<key key="amenity" value="car_rental" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<text key="operator" text="Operator:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<text key="operator" text="Operator" default="" delete_if_empty="true" />
 	</item>
 	
@@ -750,6 +750,6 @@
 		<label text="Edit Car Sharing" />
 		<key key="amenity" value="car_sharing" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<text key="operator" text="Operator:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<text key="operator" text="Operator" default="" delete_if_empty="true" />
 	</item>
 	
@@ -760,5 +760,5 @@
 		<label text="Edit Bicycle Parking" />
 		<key key="amenity" value="bicycle_parking" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -766,5 +766,5 @@
 		<label text="Edit Bicycle Rental" />
 		<key key="amenity" value="bicycle_rental" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -772,5 +772,5 @@
 		<label text="Bicycle Shop" />
 		<key key="shop" value="bicycle" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -780,5 +780,5 @@
 		<label text="Edit Hotel" />
 		<key key="tourism" value="hotel" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -786,5 +786,5 @@
 		<label text="Edit Motel" />
 		<key key="tourism" value="motel" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -792,5 +792,5 @@
 		<label text="Edit Guest House" />
 		<key key="tourism" value="guest_house" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -798,5 +798,5 @@
 		<label text="Edit Hostel" />
 		<key key="tourism" value="hostel" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -804,5 +804,5 @@
 		<label text="Edit Caravan Site" />
 		<key key="tourism" value="caravan_site" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -810,5 +810,5 @@
 		<label text="Edit Camping Site" />
 		<key key="tourism" value="camp_site" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -816,5 +816,5 @@
 		<label text="Edit Restaurant" />
 		<key key="amenity" value="restaurant" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -822,5 +822,5 @@
 		<label text="Edit Biergarten" />
 		<key key="amenity" value="biergarten" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -828,5 +828,5 @@
 		<label text="Edit Fast Food Restaurant" />
 		<key key="amenity" value="fast_food" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -834,5 +834,5 @@
 		<label text="Edit Cafe" />
 		<key key="amenity" value="cafe" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -840,5 +840,5 @@
 		<label text="Edit Pub" />
 		<key key="amenity" value="pub" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -846,5 +846,5 @@
 		<label text="Edit Nightclub" />
 		<key key="amenity" value="nightclub" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -855,5 +855,5 @@
 		<label text="Edit Tourist Information" />
 		<key key="tourism" value="information" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -861,5 +861,5 @@
 		<label text="Edit Museum" />
 		<key key="tourism" value="museum" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -867,5 +867,5 @@
 		<label text="Edit Zoo" />
 		<key key="tourism" value="zoo" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -873,5 +873,5 @@
 		<label text="Edit Viewpoint" />
 		<key key="tourism" value="viewpoint" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -879,5 +879,5 @@
 		<label text="Edit Attraction" />
 		<key key="tourism" value="attraction" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -885,5 +885,5 @@
 		<label text="Edit Picnic Site" />
 		<key key="tourism" value="picnic_site" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -891,5 +891,5 @@
 		<label text="Edit Theme Park" />
 		<key key="tourism" value="theme_park" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -897,5 +897,5 @@
 		<label text="Edit Artwork" />
 		<key key="tourism" value="artwork" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -906,5 +906,5 @@
 		<label text="Edit Castle" />
 		<key key="historic" value="castle" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -912,5 +912,5 @@
 		<label text="Edit Ruins" />
 		<key key="historic" value="ruins" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -918,5 +918,5 @@
 		<label text="Edit Archaeological Site" />
 		<key key="historic" value="archaeological_site" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -924,5 +924,5 @@
 		<label text="Edit Monument" />
 		<key key="historic" value="monument" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -930,5 +930,5 @@
 		<label text="Edit Memorial" />
 		<key key="historic" value="memorial" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -936,5 +936,5 @@
 		<label text="Edit Battlefield" />
 		<key key="historic" value="battlefield" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -945,5 +945,5 @@
 		<label text="Edit Water Park" />
 		<key key="leisure" value="water_park" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -951,5 +951,5 @@
 		<label text="Edit Marina" />
 		<key key="leisure" value="marina" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -957,5 +957,5 @@
 		<label text="Edit Slipway" />
 		<key key="leisure" value="slipway" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -963,5 +963,5 @@
 		<label text="Edit Fishing" />
 		<key key="leisure" value="fishing" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -969,5 +969,5 @@
 		<label text="Edit Nature Reserve" />
 		<key key="leisure" value="nature_reserve" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -975,5 +975,5 @@
 		<label text="Edit Park" />
 		<key key="leisure" value="park" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -981,5 +981,5 @@
 		<label text="Edit Playground" />
 		<key key="leisure" value="playground" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -987,5 +987,5 @@
 		<label text="Edit Garden" />
 		<key key="leisure" value="garden" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -993,5 +993,5 @@
 		<label text="Edit Common" />
 		<key key="leisure" value="common" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1001,5 +1001,5 @@
 		<label text="Edit Stadium" />
 		<key key="leisure" value="stadium" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1007,5 +1007,5 @@
 		<label text="Edit Sports Centre" />
 		<key key="leisure" value="sports_centre" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1013,5 +1013,5 @@
 		<label text="Edit Pitch" />
 		<key key="leisure" value="pitch" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1019,5 +1019,5 @@
 		<label text="Edit Soccer" />
 		<key key="sport" value="soccer" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1025,5 +1025,5 @@
 		<label text="Edit Football" />
 		<key key="sport" value="football" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1031,5 +1031,5 @@
 		<label text="Edit Australian Football" />
 		<key key="sport" value="australian_football" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1037,5 +1037,5 @@
 		<label text="Edit Baseball" />
 		<key key="sport" value="baseball" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1043,5 +1043,5 @@
 		<label text="Edit Basketball" />
 		<key key="sport" value="basketball" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1049,5 +1049,5 @@
 		<label text="Edit Golf Course" />
 		<key key="leisure" value="golf_course" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1055,5 +1055,5 @@
 		<label text="Edit Track" />
 		<key key="leisure" value="track" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1061,5 +1061,5 @@
 		<label text="Edit Multi" />
 		<key key="sport" value="multi" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1067,5 +1067,5 @@
 		<label text="Edit 10pin" />
 		<key key="sport" value="10pin" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1073,5 +1073,5 @@
 		<label text="Edit Athletics" />
 		<key key="sport" value="athletics" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1079,5 +1079,5 @@
 		<label text="Edit Boules" />
 		<key key="sport" value="boules" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1085,5 +1085,5 @@
 		<label text="Edit Bowls" />
 		<key key="sport" value="bowls" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1091,5 +1091,5 @@
 		<label text="Edit Climbing" />
 		<key key="sport" value="climbing" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1097,5 +1097,5 @@
 		<label text="Edit Cricket" />
 		<key key="sport" value="cricket" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1103,5 +1103,5 @@
 		<label text="Edit Cricket Nets" />
 		<key key="sport" value="cricket_nets" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1109,5 +1109,5 @@
 		<label text="Edit Croquet" />
 		<key key="sport" value="croquet" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1115,5 +1115,5 @@
 		<label text="Edit Cycling" />
 		<key key="sport" value="cycling" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1121,5 +1121,5 @@
 		<label text="Edit Dog Racing" />
 		<key key="sport" value="dog_racing" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1127,5 +1127,5 @@
 		<label text="Edit Equestrian" />
 		<key key="sport" value="equestrian" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1133,5 +1133,5 @@
 		<label text="Edit Horse Racing" />
 		<key key="sport" value="horse_racing" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1139,5 +1139,5 @@
 		<label text="Edit Golf" />
 		<key key="sport" value="golf" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1145,5 +1145,5 @@
 		<label text="Edit Gymnastics" />
 		<key key="sport" value="gymnastics" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1151,5 +1151,5 @@
 		<label text="Edit Hockey" />
 		<key key="sport" value="hockey" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1157,5 +1157,5 @@
 		<label text="Edit Motor Sports" />
 		<key key="sport" value="motor" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1163,5 +1163,5 @@
 		<label text="Edit Pelota" />
 		<key key="sport" value="pelota" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1169,5 +1169,5 @@
 		<label text="Edit Racquet" />
 		<key key="sport" value="racquet" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1175,5 +1175,5 @@
 		<label text="Edit Rugby" />
 		<key key="sport" value="rugby" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1181,5 +1181,5 @@
 		<label text="Edit Skating" />
 		<key key="sport" value="skating" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1187,5 +1187,5 @@
 		<label text="Edit Skateboard" />
 		<key key="sport" value="skateboard" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1193,5 +1193,5 @@
 		<label text="Edit Swimming" />
 		<key key="sport" value="swimming" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1199,5 +1199,5 @@
 		<label text="Edit Skiing" />
 		<key key="sport" value="skiing" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1205,5 +1205,5 @@
 		<label text="Edit Table Tennis" />
 		<key key="sport" value="table_tennis" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1211,5 +1211,5 @@
 		<label text="Edit Tennis" />
 		<key key="sport" value="tennis" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1219,5 +1219,5 @@
 		<label text="Edit Public Building" />
 		<key key="amenity" value="public_building" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1225,5 +1225,5 @@
 		<label text="Edit Townhall" />
 		<key key="amenity" value="townhall" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1231,5 +1231,5 @@
 		<label text="Edit Fire Station" />
 		<key key="amenity" value="fire_station" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1237,5 +1237,5 @@
 		<label text="Edit Courthouse" />
 		<key key="amenity" value="courthouse" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1243,5 +1243,5 @@
 		<label text="Edit Prison" />
 		<key key="amenity" value="prison" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1249,5 +1249,5 @@
 		<label text="Edit Police" />
 		<key key="amenity" value="police" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1255,5 +1255,5 @@
 		<label text="Edit Post Office" />
 		<key key="amenity" value="post_office" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1263,6 +1263,6 @@
 		<label text="Edit Pharmacy" />
 		<key key="amenity" value="pharmacy" />
-		<combo key="dispensing" text="Dispensing:" values="yes,no" default="no" delete_if_empty="true" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<combo key="dispensing" text="Dispensing" values="yes,no" default="no" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1270,5 +1270,5 @@
 		<label text="Edit Hospital" />
 		<key key="amenity" value="hospital" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1278,5 +1278,5 @@
 		<label text="Edit Kindergarten" />
 		<key key="amenity" value="kindergarten" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1284,5 +1284,5 @@
 		<label text="Edit School" />
 		<key key="amenity" value="school" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1290,5 +1290,5 @@
 		<label text="Edit University" />
 		<key key="amenity" value="university" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1296,5 +1296,5 @@
 		<label text="Edit College" />
 		<key key="amenity" value="college" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1304,5 +1304,5 @@
 		<label text="Edit Cinema" />
 		<key key="amenity" value="cinema" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1310,5 +1310,5 @@
 		<label text="Edit Library" />
 		<key key="amenity" value="library" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1316,5 +1316,5 @@
 		<label text="Edit Arts Centre" />
 		<key key="amenity" value="arts_centre" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1322,5 +1322,5 @@
 		<label text="Edit Theatre" />
 		<key key="amenity" value="theatre" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1328,7 +1328,7 @@
 		<label text="Edit Place of Worship" />
 		<key key="amenity" value="place_of_worship" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<combo key="religion" text="Religion:" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarianist,zoroastrian" default="" delete_if_empty="true" />
-		<combo key="denomination" text="Denomination:" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarianist,zoroastrian" default="" delete_if_empty="true" />
+		<combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
 	</item>
 
@@ -1345,5 +1345,5 @@
 		<label text="Edit a Bus Station" />
 		<key key="amenity" value="bus_station" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1359,7 +1359,7 @@
 		<label text="Edit a Recycling station" />
 		<key key="amenity" value="recycling" />
-		<check key="recycling:glass" text="Glass:" default="off" delete_if_empty="true" />
-		<check key="recycling:clothes" text="Clothes:" default="off" delete_if_empty="true" />
-		<check key="recycling:batteries" text="Batteries:" default="off" delete_if_empty="true" />
+		<check key="recycling:glass" text="Glass" default="off" delete_if_empty="true" />
+		<check key="recycling:clothes" text="Clothes" default="off" delete_if_empty="true" />
+		<check key="recycling:batteries" text="Batteries" default="off" delete_if_empty="true" />
 	</item>
 
@@ -1367,5 +1367,5 @@
 		<label text="Edit a Taxi station" />
 		<key key="amenity" value="taxi" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1373,5 +1373,5 @@
 		<label text="Edit a Fountain" />
 		<key key="amenity" value="fountain" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1379,5 +1379,5 @@
 		<label text="Edit Drinking Water" />
 		<key key="amenity" value="drinking_water" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1385,6 +1385,6 @@
 		<label text="Edit Bank" />
 		<key key="amenity" value="bank" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<check key="atm" text="Automated Teller Machine:" default="on" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
 	</item>
 	
@@ -1392,5 +1392,5 @@
 		<label text="Edit Money Exchange" />
 		<key key="amenity" value="bureau_de_change" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1398,5 +1398,5 @@
 		<label text="Edit Automated Teller Machine" />
 		<key key="amenity" value="atm" />
-		<text key="name" text="Provider:" default="" delete_if_empty="true" />
+		<text key="name" text="Provider" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1405,5 +1405,5 @@
 		<label text="Edit Supermarket" />
 		<key key="shop" value="supermarket" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1411,5 +1411,5 @@
 		<label text="Edit Convenience Store" />
 		<key key="shop" value="convenience" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1417,5 +1417,5 @@
 		<label text="Edit Kiosk" />
 		<key key="shop" value="kiosk" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1423,11 +1423,11 @@
 		<label text="Edit Butcher" />
 		<key key="shop" value="butcher" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
 	<item name="Shops/Baker" icon="presets/empty.png">
 		<label text="Edit Baker" />
-		<key key="shop" value="baker" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<key key="shop" value="bakery" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1435,5 +1435,5 @@
 		<label text="Edit Do-it-yourself-store" />
 		<key key="shop" value="doityourself" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1441,5 +1441,5 @@
 		<label text="Edit Dry Cleaning" />
 		<key key="shop" value="dry_cleaning" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1447,5 +1447,5 @@
 		<label text="Edit Laundry" />
 		<key key="shop" value="laundry" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1453,5 +1453,5 @@
 		<label text="Edit Outdoor Shop" />
 		<key key="shop" value="outdoor" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1463,5 +1463,5 @@
 		<label text=" " />
 		<key key="place" value="continent" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1470,5 +1470,5 @@
 		<label text=" " />
 		<key key="place" value="country" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1477,5 +1477,5 @@
 		<label text=" " />
 		<key key="place" value="state" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1484,5 +1484,5 @@
 		<label text=" " />
 		<key key="place" value="region" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1491,5 +1491,5 @@
 		<label text=" " />
 		<key key="place" value="county" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1498,5 +1498,5 @@
 		<label text=" " />
 		<key key="place" value="island" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1505,5 +1505,5 @@
 		<label text=" " />
 		<key key="place" value="city" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1512,5 +1512,5 @@
 		<label text=" " />
 		<key key="place" value="town" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1519,5 +1519,5 @@
 		<label text=" " />
 		<key key="place" value="suburb" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1526,5 +1526,5 @@
 		<label text=" " />
 		<key key="place" value="village" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1533,5 +1533,5 @@
 		<label text=" " />
 		<key key="place" value="hamlet" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1540,5 +1540,5 @@
 		<label text=" " />
 		<key key="place" value="locality" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1548,12 +1548,12 @@
 		<label text="Edit address information" />
 		<label text=" " />
-		<text key="addr:housenumber" text="House number:" default="" delete_if_empty="true" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="addr:housename" text="House name:" default="" delete_if_empty="true" />
-		<text key="addr:street" text="Street name:" use_last_as_default="true" delete_if_empty="true" />
-		<text key="addr:city" text="City:" use_last_as_default="true" delete_if_empty="true" />
-		<text key="addr:postcode" text="Post code:" use_last_as_default="true" delete_if_empty="true" />
+		<text key="addr:housenumber" text="House number" default="" delete_if_empty="true" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="addr:housename" text="House name" default="" delete_if_empty="true" />
+		<text key="addr:street" text="Street name" use_last_as_default="true" delete_if_empty="true" />
+		<text key="addr:city" text="City" use_last_as_default="true" delete_if_empty="true" />
+		<text key="addr:postcode" text="Post code" use_last_as_default="true" delete_if_empty="true" />
 	</item>
 	
@@ -1561,5 +1561,5 @@
 		<label text="Edit address interpolation" />
 		<label text=" " />
-		<combo key="addr:interpolation" text="Numbering scheme:" values="odd,even,all" default="odd" />
+		<combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all" default="odd" />
 	</item>
 	
@@ -1568,5 +1568,5 @@
 		<label text=" " />
 		<key key="boundary" value="national" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1575,5 +1575,5 @@
 		<label text=" " />
 		<key key="boundary" value="administrative" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1582,5 +1582,5 @@
 		<label text=" " />
 		<key key="boundary" value="civil" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1589,5 +1589,5 @@
 		<label text=" " />
 		<key key="boundary" value="political" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1596,5 +1596,5 @@
 		<label text=" " />
 		<key key="boundary" value="national_park" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1605,5 +1605,5 @@
 		<label text="Edit Grave Yard" />
 		<key key="amenity" value="grave_yard" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1612,5 +1612,5 @@
 		<label text=" " />
 		<key key="landuse" value="farmyard" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1619,5 +1619,5 @@
 		<label text=" " />
 		<key key="landuse" value="farmland" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1626,5 +1626,5 @@
 		<label text=" " />
 		<key key="landuse" value="vineyard" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1633,5 +1633,5 @@
 		<label text=" " />
 		<key key="landuse" value="quarry" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1640,5 +1640,5 @@
 		<label text=" " />
 		<key key="landuse" value="landfill" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1647,5 +1647,5 @@
 		<label text=" " />
 		<key key="landuse" value="basin" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1654,5 +1654,5 @@
 		<label text=" " />
 		<key key="landuse" value="reservoir" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1661,6 +1661,6 @@
 		<label text=" " />
 		<key key="landuse" value="forest" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<combo key="wood" text="Type:" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1669,5 +1669,5 @@
 		<label text=" " />
 		<key key="landuse" value="allotments" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1676,5 +1676,5 @@
 		<label text=" " />
 		<key key="landuse" value="residential" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1683,5 +1683,5 @@
 		<label text=" " />
 		<key key="landuse" value="retail" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1690,5 +1690,5 @@
 		<label text=" " />
 		<key key="landuse" value="commercial" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1697,5 +1697,5 @@
 		<label text=" " />
 		<key key="landuse" value="industrial" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1704,5 +1704,5 @@
 		<label text=" " />
 		<key key="landuse" value="brownfield" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1711,5 +1711,5 @@
 		<label text=" " />
 		<key key="landuse" value="greenfield" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1718,5 +1718,5 @@
 		<label text=" " />
 		<key key="landuse" value="railway" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1725,5 +1725,5 @@
 		<label text=" " />
 		<key key="landuse" value="construction" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1732,5 +1732,5 @@
 		<label text=" " />
 		<key key="landuse" value="military" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1739,5 +1739,5 @@
 		<label text=" " />
 		<key key="landuse" value="cemetery" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1746,5 +1746,5 @@
 		<label text=" " />
 		<key key="landuse" value="village_green" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1753,5 +1753,5 @@
 		<label text=" " />
 		<key key="landuse" value="grass" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1760,5 +1760,5 @@
 		<label text=" " />
 		<key key="landuse" value="recreation_ground" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1768,5 +1768,5 @@
 		<label text="Edit Water" />
 		<key key="natural" value="water" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1774,5 +1774,5 @@
 		<label text="Edit Land" />
 		<key key="natural" value="land" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1780,5 +1780,5 @@
 		<label text="Edit Spring" />
 		<key key="natural" value="spring" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1786,5 +1786,5 @@
 		<label text="Edit Peak" />
 		<key key="natural" value="peak" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1792,5 +1792,5 @@
 		<label text="Edit Glacier" />
 		<key key="natural" value="glacier" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1798,5 +1798,5 @@
 		<label text="Edit Volcano" />
 		<key key="natural" value="volcano" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1804,5 +1804,5 @@
 		<label text="Edit Cliff" />
 		<key key="natural" value="cliff" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1810,5 +1810,5 @@
 		<label text="Edit Scree" />
 		<key key="natural" value="scree" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1816,5 +1816,5 @@
 		<label text="Edit Scrub" />
 		<key key="natural" value="scrub" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1822,5 +1822,5 @@
 		<label text="Edit Fell" />
 		<key key="natural" value="fell" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1828,5 +1828,5 @@
 		<label text="Edit Heath" />
 		<key key="natural" value="heath" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1834,6 +1834,6 @@
 		<label text="Edit Wood" />
 		<key key="natural" value="wood" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
-		<combo key="wood" text="Type:" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+		<combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1841,5 +1841,5 @@
 		<label text="Edit Marsh" />
 		<key key="natural" value="marsh" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1847,5 +1847,5 @@
 		<label text="Edit Coastline" />
 		<key key="natural" value="coastline" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1853,5 +1853,5 @@
 		<label text="Edit Mud" />
 		<key key="natural" value="mud" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1859,5 +1859,5 @@
 		<label text="Edit Beach" />
 		<key key="natural" value="beach" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1865,5 +1865,5 @@
 		<label text="Edit Bay" />
 		<key key="natural" value="bay" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1871,5 +1871,5 @@
 		<label text="Edit Cave Entrance" />
 		<key key="natural" value="cave_entrance" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1880,5 +1880,5 @@
 		<label text="Edit Works" />
 		<key key="man_made" value="works" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1886,5 +1886,5 @@
 		<label text="Edit Power Wind" />
 		<key key="man_made" value="power_wind" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1892,5 +1892,5 @@
 		<label text="Edit Power Hydro" />
 		<key key="man_made" value="power_hydro" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1898,5 +1898,5 @@
 		<label text="Edit Power Fossil" />
 		<key key="man_made" value="power_fossil" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1904,5 +1904,5 @@
 		<label text="Edit Power Nuclear" />
 		<key key="man_made" value="power_nuclear" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1910,5 +1910,5 @@
 		<label text="Edit Tower" />
 		<key key="man_made" value="tower" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1916,5 +1916,5 @@
 		<label text="Edit Water Tower" />
 		<key key="man_made" value="water_tower" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1922,5 +1922,5 @@
 		<label text="Edit Gasometer" />
 		<key key="man_made" value="gasometer" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1928,5 +1928,5 @@
 		<label text="Edit Covered Reservoir" />
 		<key key="man_made" value="reservoir_covered" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1934,5 +1934,5 @@
 		<label text="Edit Lighthouse" />
 		<key key="man_made" value="lighthouse" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1940,5 +1940,5 @@
 		<label text="Edit Windmill" />
 		<key key="man_made" value="windmill" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1946,5 +1946,5 @@
 		<label text="Edit Pier" />
 		<key key="man_made" value="pier" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1952,5 +1952,5 @@
 		<label text="Edit Pipeline" />
 		<key key="man_made" value="pipeline" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1958,5 +1958,5 @@
 		<label text="Edit Wastewater Plant" />
 		<key key="man_made" value="wastewater_plant" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1964,5 +1964,5 @@
 		<label text="Edit Crane" />
 		<key key="man_made" value="crane" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
@@ -1970,5 +1970,5 @@
 		<label text="Edit Beacon" />
 		<key key="man_made" value="beacon" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 	
@@ -1976,5 +1976,5 @@
 		<label text="Edit Survey Point" />
 		<key key="man_made" value="survey_point" />
-		<text key="name" text="Name:" default="" delete_if_empty="true" />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
 
Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 673)
+++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 674)
@@ -245,4 +245,5 @@
 			newSelection.add(wayToAdd);
 
+			Boolean warnme=false;
 			// now copy all relations to new way also
 			for (Relation r : Main.ds.relations) {
@@ -256,10 +257,15 @@
 							em.member = wayToAdd;
 							em.role = rm.role;
+							if(em.role.length() > 0)
+								warnme = true;
 							c.members.add(em);
 							commandList.add(new ChangeCommand(r, c));
+							break;
 						}
 					}
 				}
 			}
+			if(warnme)
+				JOptionPane.showMessageDialog(Main.parent, tr("A role based relation membership was copied to both new ways.\nYou should verify this and correct it when necessary."));
 		}
 
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 673)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 674)
@@ -12,4 +12,5 @@
 import java.util.HashSet;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -24,5 +25,7 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
+import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.*;
@@ -163,4 +166,33 @@
 	 * nothing to delete.
 	 */
+	private int testRelation(Relation ref, OsmPrimitive osm)
+	{
+		NameVisitor n = new NameVisitor();
+		ref.visit(n);
+		NameVisitor s = new NameVisitor();
+		osm.visit(s);
+		String role = new String();
+		for (RelationMember m : ref.members)
+		{
+			if (m.member == osm)
+			{
+				role = m.role;
+				break;
+			}
+		}
+		if (role.length() > 0)
+		{
+			return JOptionPane.showConfirmDialog(Main.parent,
+			tr("Selection \"{0}\" is used by relation \"{1}\" with role {2}.\nDelete from relation?", s.name, n.name, role),
+			tr("Conflicting relation"), JOptionPane.YES_NO_OPTION);
+		}
+		else
+		{
+			return JOptionPane.showConfirmDialog(Main.parent,
+			tr("Selection \"{0}\" is used by relation \"{1}\".\nDelete from relation?", s.name, n.name),
+			tr("Conflicting relation"), JOptionPane.YES_NO_OPTION);
+		}
+	}
+
 	private Command delete(Collection<OsmPrimitive> selection, boolean alsoDeleteNodesInWay) {
 		if (selection.isEmpty()) return null;
@@ -168,4 +200,5 @@
 		Collection<OsmPrimitive> del = new HashSet<OsmPrimitive>(selection);
 		Collection<Way> waysToBeChanged = new HashSet<Way>();
+		HashMap<OsmPrimitive, Collection<OsmPrimitive>> relationsToBeChanged = new HashMap<OsmPrimitive, Collection<OsmPrimitive>>();
 
 		if (alsoDeleteNodesInWay) {
@@ -197,7 +230,13 @@
 					waysToBeChanged.add((Way) ref);
 				} else if (ref instanceof Relation) {
-					JOptionPane.showMessageDialog(Main.parent,
-						tr("Cannot delete: Selection is used by relation"));
-					return null;
+					if (testRelation((Relation)ref, osm) == JOptionPane.YES_OPTION)
+					{
+						Collection<OsmPrimitive> relset = relationsToBeChanged.get(ref);
+						if(relset == null) relset = new HashSet<OsmPrimitive>();
+						relset.add(osm);
+						relationsToBeChanged.put(ref, relset);
+					}
+					else
+						return null;
 				} else {
 					return null;
@@ -218,6 +257,28 @@
 					if (del.contains(ref)) continue;
 					if (ref instanceof Relation) {
-						JOptionPane.showMessageDialog(Main.parent,
-							tr("Cannot delete: Selection is used by relation"));
+						Boolean found = false;
+						Collection<OsmPrimitive> relset = relationsToBeChanged.get(ref);
+						if (relset == null)
+							relset = new HashSet<OsmPrimitive>();
+						else
+						{
+							for (OsmPrimitive m : relset) {
+								if(m == w)
+								{
+									found = true;
+									break;
+								}
+							}
+						}
+						if (!found)
+						{
+							if (testRelation((Relation)ref, w) == JOptionPane.YES_OPTION)
+							{
+								relset.add(w);
+								relationsToBeChanged.put(ref, relset);
+							}
+							else
+								return null;
+						}
 					} else {
 						return null;
@@ -227,4 +288,25 @@
 				cmds.add(new ChangeCommand(w, wnew));
 			}
+		}
+
+		Iterator<OsmPrimitive> iterator = relationsToBeChanged.keySet().iterator();
+		while(iterator.hasNext())
+		{
+			Relation cur = (Relation)iterator.next();
+			Relation rel = new Relation(cur);
+			for(OsmPrimitive osm : relationsToBeChanged.get(cur))
+			{
+				for (RelationMember rm : rel.members) {
+					if (rm.member == osm)
+					{
+						RelationMember mem = new RelationMember();
+						mem.role = rm.role;
+						mem.member = rm.member;
+						rel.members.remove(mem);
+						break;
+					}
+				}
+			}
+			cmds.add(new ChangeCommand(cur, rel));
 		}
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java	(revision 673)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java	(revision 674)
@@ -147,7 +147,7 @@
 
 		JLabel help = new JLabel("<html><em>"+
-			"This is the basic relation editor which allows you to change the relation's tags " +
+			tr("This is the basic relation editor which allows you to change the relation's tags " +
 			"as well as the members. In addition to this we should have a smart editor that " +
-			"detects the type of relationship and limits your choices in a sensible way.</em></html>");
+			"detects the type of relationship and limits your choices in a sensible way.")+"</em></html>");
 		
 		getContentPane().add(help, BorderLayout.NORTH);		
@@ -224,4 +224,10 @@
 		}));
 
+		buttonPanel.add(createButton(marktr("Delete Selected"),"deleteselected", tr("Delete all currently selected objects from releation"), KeyEvent.VK_R, new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				deleteSelected();
+			}
+		}));
+
 		buttonPanel.add(createButton(marktr("Delete"),"delete", tr("Remove the member in the current table row from this relation"), KeyEvent.VK_D, new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
@@ -259,5 +265,5 @@
 		refreshTables();
 		
-		setSize(new Dimension(400, 500));
+		setSize(new Dimension(600, 500));
 		setLocationRelativeTo(Main.parent);
 	}
@@ -311,4 +317,21 @@
 		refreshTables();
 	}
+
+	private void deleteSelected() {
+		for (OsmPrimitive p : Main.ds.getSelected()) {
+			Relation c = new Relation(clone);
+			for (RelationMember rm : c.members) {
+				if (rm.member == p)
+				{
+					RelationMember mem = new RelationMember();
+					mem.role = rm.role;
+					mem.member = rm.member;
+					clone.members.remove(mem);
+				}
+			}
+		}
+		refreshTables();
+	}
+
     private void downloadRelationMembers()  {
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 673)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 674)
@@ -128,5 +128,5 @@
 	            originalValue = DIFFERENT;
 			}
-			p.add(new JLabel(text), GBC.std().insets(0,0,10,0));
+			p.add(new JLabel(tr(text)+":"), GBC.std().insets(0,0,10,0));
 			p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
 		}
@@ -174,5 +174,5 @@
 							QuadStateCheckBox.State.NOT_SELECTED :
 							QuadStateCheckBox.State.UNSET;
-				check = new QuadStateCheckBox(text, initialState, 
+				check = new QuadStateCheckBox(tr(text), initialState, 
 						new QuadStateCheckBox.State[] { 
 						QuadStateCheckBox.State.SELECTED,
@@ -184,5 +184,5 @@
 				// in "partial" state.
 				initialState = QuadStateCheckBox.State.PARTIAL;
-				check = new QuadStateCheckBox(text, QuadStateCheckBox.State.PARTIAL, 
+				check = new QuadStateCheckBox(tr(text), QuadStateCheckBox.State.PARTIAL, 
 						new QuadStateCheckBox.State[] { 
 						QuadStateCheckBox.State.PARTIAL,
@@ -236,5 +236,5 @@
 			}
 			for (int i=0; i<value_array.length; i++) {
-				lhm.put(value_array[i], display_array[i]);
+				lhm.put(value_array[i], tr(display_array[i]));
 			}
 			for (String s : usage.values) {
@@ -250,5 +250,5 @@
 				combo.setSelectedItem(DIFFERENT); originalValue=DIFFERENT;
 			}
-			p.add(new JLabel(text), GBC.std().insets(0,0,10,0));
+			p.add(new JLabel(tr(text)+":"), GBC.std().insets(0,0,10,0));
 			p.add(combo, GBC.eol().fill(GBC.HORIZONTAL));
 		}
@@ -277,5 +277,5 @@
 
 		@Override public void addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
-			p.add(new JLabel(text), GBC.eol());
+			p.add(new JLabel(tr(text)), GBC.eol());
 		}
 		@Override public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {}
@@ -310,5 +310,5 @@
 	 */
 	public void setName(String name) {
-		putValue(Action.NAME, name);
+		putValue(Action.NAME, tr(name));
 		putValue("toolbar", "tagging_"+name);
 	}