Index: presets/presets.xml
===================================================================
--- presets/presets.xml	(revision 2427)
+++ presets/presets.xml	(working copy)
@@ -485,6 +485,33 @@
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
+        <item name="Path" icon="presets/path.png" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
+            <label text="Edit Path" />
+            <space />
+            <key key="highway" value="path" />
+            <space />
+            <label text="Type" />
+            <combo key="foot" text="Foot" 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="horse" text="Horse" 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="snowmobile" text="Snowmobile" values="yes,designated,no" default="" delete_if_empty="true" />
+            <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" delete_if_empty="true" /> -->
+            <optional>
+                <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,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
+                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+            </optional>
+        </item>
         <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
@@ -524,6 +551,31 @@
             </optional>
         </item>
         <separator/>
+        <item name="Mtb Trails" icon="presets/mtb.png" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Mountainbike"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Mountainbike"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Mountainbike" />
+            <label text="Edit mtb" />
+            <space />
+            <combo key="highway" text="track or path" values="path,track" default="" delete_if_empty="false"/>
+            <combo key="mtb:scale" text="mtb:scale (STS)" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
+            <combo key="mtb:scale:uphill" text="mtb:scale:uphill" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
+            <text key="mtb:description" text="additional info for mtbikers" values="" default="" delete_if_empty="true" />
+            <text key="incline" text="incline (up/down or value in +- %)" values="" default="" delete_if_empty="true" />
+            <space />
+            <combo key="foot" text="Foot" values="yes,designated,official,unknown,no" default="yes" delete_if_empty="true" />
+            <combo key="bicycle" text="Bicycle" values="yes,designated,official,unknown,no" default="yes" delete_if_empty="true" />
+            <optional>
+                <text key="name" text="Name" default="" delete_if_empty="true" />
+                <combo key="surface" text="Surface" values="pebblestone,cobblestone,paving_stones,metal,grass_paver,paved,wood,northshore,sand,grass,unpaved,compacted,gravel,ground" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="sac_scale" text="Sac_scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" default="" delete_if_empty="true" />
+                <combo key="tracktype" text="Tracktype" values="grade2,grade3,grade4,grade5" default="" delete_if_empty="true" />
+            </optional>
+            <space />
+            <label text="Don't forget to add the way to a relation if part of a mtb route" />
+            </item>
+        <separator/>
         <item name="Track" icon="presets/track1.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
@@ -650,36 +702,7 @@
             </optional>
         </item>
         <separator/>
-        <item name="Path" icon="presets/path.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-            <label text="Edit Path" />
-            <space />
-            <key key="highway" value="path" />
-            <space />
-            <label text="Type" />
-            <combo key="foot" text="Foot" 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="horse" text="Horse" 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="snowmobile" text="Snowmobile" values="yes,designated,no" default="" delete_if_empty="true" />
-            <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" delete_if_empty="true" /> -->
-
-
-            <optional>
-                <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,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Hiking" icon="presets/hiking_grade1.png" type="way">
+        <item name="T1-Hiking" icon="presets/hiking_grade1.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
@@ -692,7 +715,7 @@
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
-        <item name="Mountain Hiking" icon="presets/hiking_grade2.png" type="way">
+        <item name="T2-Mountain Hiking" icon="presets/hiking_grade2.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
@@ -705,7 +728,7 @@
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
-        <item name="Demanding Mountain Hiking" icon="presets/hiking_grade3.png" type="way">
+        <item name="T3-Demanding Mountain Hiking" icon="presets/hiking_grade3.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
@@ -718,7 +741,7 @@
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
-        <item name="Alpine Hiking" icon="presets/hiking_grade4.png" type="way">
+        <item name="T4-Alpine Hiking" icon="presets/hiking_grade4.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
@@ -731,7 +754,7 @@
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
-        <item name="Demanding Alpine Hiking" icon="presets/hiking_grade5.png" type="way">
+        <item name="T5-Demanding Alpine Hiking" icon="presets/hiking_grade5.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
@@ -744,7 +767,7 @@
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
-        <item name="Difficult Alpine Hiking" icon="presets/hiking_grade6.png" type="way">
+        <item name="T6-Difficult Alpine Hiking" icon="presets/hiking_grade6.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />