Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6677)
+++ /trunk/data/defaultpresets.xml	(revision 6678)
@@ -6153,4 +6153,10 @@
         </item>
         <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=administrative"
+                  hu.href="http://wiki.openstreetmap.org/wiki/Hu:Tag:boundary=administrative"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:boundary=administrative"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:boundary=administrative"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=administrative" />
             <label text="Edit Administrative Boundary" />
             <space />
@@ -6158,17 +6164,25 @@
             <text key="name" text="Name" />
         </item>
-        <item name="Civil" icon="presets/boundaries.png" type="closedway,relation">
-            <label text="Edit Civil Boundary" />
-            <space />
-            <key key="boundary" value="civil" />
-            <text key="name" text="Name" />
-        </item>
         <item name="Political" icon="presets/boundaries.png" type="closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=political"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=political" />
             <label text="Edit Political Boundary" />
             <space />
             <key key="boundary" value="political" />
-            <text key="name" text="Name" />
+            <combo key="political_division" text="Division" values="canton, linguistic_community, ward" />
+            <text key="name" text="Name" />
+        </item>
+        <item name="Postal Code" icon="presets/boundaries.png" type="closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code" />
+            <label text="Edit Postal Code Boundary" />
+            <space />
+            <key key="boundary" value="postal_code" />
+            <text key="postal_code" text="Postal Code" />
         </item>
         <item name="National park" icon="presets/boundaries.png" type="closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=national_park"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:boundary=national_park"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=national_park" />
             <label text="Edit National Park Boundary" />
             <space />
Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 6677)
+++ /trunk/styles/standard/elemstyles.xml	(revision 6678)
@@ -3239,5 +3239,5 @@
 
 	<rule>
-		<condition k="boundary" v="civil"/>
+		<condition k="boundary" v="postal_code"/>
 		<line width="1" colour="boundary#FF6600" dashed="true" priority="-10"/>
 		<icon annotate="true" src="misc/deprecated.png"/>