Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6279)
+++ trunk/data/defaultpresets.xml	(revision 6293)
@@ -565,5 +565,5 @@
             <space />
             <key key="highway" value="service" />
-            <combo key="service" text="Service way type" values="alley,driveway,parking_aisle" />
+            <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through" />
             <optional>
                 <text key="name" text="Name" />
@@ -4197,4 +4197,5 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=post_box"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=post_box"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=post_box"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_box" />
             <label text="Edit Postbox" />
@@ -4202,4 +4203,7 @@
             <key key="amenity" value="post_box" />
             <text key="operator" text="Operator" />
+            <text key="ref" text="Reference number" />
+            <text key="collection_times" text="Collection times" />
+            <check key="drive_through" text="Drive through" />
         </item>
         <item name="Telephone" icon="presets/telephone.png" type="node">
@@ -4835,5 +4839,5 @@
             <label text="Edit Building" />
             <space />
-            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail" values_context="building" default="yes" match="keyvalue" />
+            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail,shed" values_context="building" default="yes" match="keyvalue" />
             <text key="name" text="Name" />
         </item>
@@ -5918,4 +5922,8 @@
         <separator/>
         <item name="Stationery" icon="presets/stationery.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=stationery"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=stationery"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=stationery"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=stationery" />
             <label text="Edit Stationery Shop" />
             <space />