Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6696)
+++ /trunk/data/defaultpresets.xml	(revision 6697)
@@ -288,4 +288,15 @@
         <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     </chunk>
+    <chunk id="payment_base">
+        <check key="payment:coins" text="Coins" />
+        <check key="payment:notes" text="Notes" />
+        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
+        <check key="payment:debit_cards" text="Debit cards" />
+        <check key="payment:credit_cards" text="Credit cards" />
+    </chunk>
+    <chunk id="payment_account">
+        <reference ref="payment_base" />
+        <check key="payment:account_cards" text="Account or loyalty cards" />
+    </chunk>
   <!-- Link chunks -->
   <chunk id="link_contact">
@@ -2385,9 +2396,10 @@
         </item>
         <item name="Charging Station" icon="styles/standard/accommodation/camping/hookup.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=charging_station"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=charging_station" />
             <label text="Edit Charging Station (for electric cars)" />
             <space />
             <key key="amenity" value="charging_station" />
-            <text key="operator" text="Operator" />
+            <reference ref="name_operator" />
             <text key="voltage" text="Voltage" />
             <text key="amperage" text="Amperage" />
@@ -2731,10 +2743,5 @@
             <reference ref="name_operator" />
             <text key="ref" text="Reference Number" />
-            <check key="payment:coins" text="Coins" />
-            <check key="payment:notes" text="Notes" />
-            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
-            <check key="payment:debit_cards" text="Debit cards" />
-            <check key="payment:credit_cards" text="Credit cards" />
-            <check key="payment:account_cards" text="Account or loyalty cards" />
+            <reference ref="payment_account" />
         </item>
     </group>
@@ -4188,9 +4195,5 @@
             <key key="amenity" value="telephone" />
             <text key="operator" text="Operator" />
-            <check key="payment:coins" text="Coins" />
-            <check key="payment:notes" text="Notes" />
-            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
-            <check key="payment:debit_cards" text="Debit cards" />
-            <check key="payment:credit_cards" text="Credit cards" />
+            <reference ref="payment_base" />
             <check key="payment:telephone_cards" text="Telephone cards" />
         </item>
@@ -6197,10 +6200,5 @@
         <text key="ref" text="Reference number" />
         <text key="note" text="Note" />
-        <check key="payment:coins" text="Coins" />
-        <check key="payment:notes" text="Notes" />
-        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
-        <check key="payment:debit_cards" text="Debit cards" />
-        <check key="payment:credit_cards" text="Credit cards" />
-        <check key="payment:account_cards" text="Account or loyalty cards" />
+        <reference ref="payment_account" />
     </item>
   </group> <!-- Shops -->