From 3651c0f3718262fa43b0b6b346cf0fe8946b3c56 Mon Sep 17 00:00:00 2001
From: konrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Date: Sat, 29 Nov 2008 11:26:11 +0000
Subject: [PATCH] updated translations

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@200 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
---
 src/smoke_de.ts     | 1543 +++++++++++++++++++++++++++++++++++++------------
 src/smoke_de_SAX.ts | 1544 ++++++++++++++++++++++++++++++++++++++------------
 src/smoke_en.ts     | 1578 ++++++++++++++++++++++++++++++++++++---------------
 3 files changed, 3468 insertions(+), 1197 deletions(-)

diff --git a/src/smoke_de.ts b/src/smoke_de.ts
index b2802a9..77f5e4c 100644
--- a/src/smoke_de.ts
+++ b/src/smoke_de.ts
@@ -296,132 +296,142 @@
 <context>
     <name>MEventSummary</name>
     <message>
-        <location filename="eventsummary.cpp" line="56"/>
+        <location filename="eventsummary.cpp" line="40"/>
         <source>Summary for Event %1</source>
         <translation>Übersicht zu Veranstaltung %1</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="66"/>
+        <location filename="eventsummary.cpp" line="50"/>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="68"/>
+        <location filename="eventsummary.cpp" line="52"/>
         <source>Artist:</source>
         <translation>Künstler:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="54"/>
         <source>Start:</source>
         <translation>Beginn:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="237"/>
+        <location filename="eventsummary.cpp" line="221"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>Date+Time format for displaying event start time</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="eventsummary.cpp" line="57"/>
         <source>Capacity:</source>
         <translation>Sitzplätze:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="75"/>
+        <location filename="eventsummary.cpp" line="59"/>
         <source>Tickets currently reserved:</source>
         <translation>Momentan reservierte Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="77"/>
+        <location filename="eventsummary.cpp" line="61"/>
         <source>Tickets currently cancelled:</source>
         <translation>Momentan abgesagte Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="79"/>
+        <location filename="eventsummary.cpp" line="63"/>
         <source>Tickets currently usable:</source>
         <translation>Momentan nutzbare Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="81"/>
+        <location filename="eventsummary.cpp" line="65"/>
         <source>Total Income:</source>
         <translation>Umsatz:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="285"/>
+        <location filename="eventsummary.cpp" line="269"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Price</source>
         <translation>Preis</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Bought</source>
         <translation>Gekauft</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Used</source>
         <translation>Benutzt</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Unused</source>
         <translation>Unbenutzt</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="122"/>
+        <location filename="eventsummary.cpp" line="106"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="124"/>
+        <location filename="eventsummary.cpp" line="108"/>
         <source>Save as...</source>
         <translation>Speichern unter...</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="127"/>
+        <location filename="eventsummary.cpp" line="111"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="206"/>
+        <location filename="eventsummary.cpp" line="190"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
         <location filename="eventsummary.cpp" line="206"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
-        <translation>Kann Vorlage (eventsummary.odtt) nicht finden. Gebe auf.</translation>
+        <translation type="obsolete">Kann Vorlage (eventsummary.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="62"/>
+        <location filename="eventsummary.cpp" line="46"/>
         <source>Summary</source>
         <translation>Zusammenfassung</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="87"/>
+        <location filename="eventsummary.cpp" line="71"/>
         <source>Tickets</source>
         <translation>Karten</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="104"/>
+        <location filename="eventsummary.cpp" line="88"/>
         <source>Comments</source>
         <translation>Kommentare</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="110"/>
+        <location filename="eventsummary.cpp" line="94"/>
         <source>Order: </source>
         <translation>Bestellung:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="112"/>
+        <location filename="eventsummary.cpp" line="96"/>
         <source>Customer: </source>
         <translation>Kunde:</translation>
     </message>
+    <message>
+        <location filename="eventsummary.cpp" line="190"/>
+        <source>Unable to get template file (eventsummary). Giving up.</source>
+        <translation>Kann Vorlage (eventsummary) nicht finden. Gebe auf.</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="197"/>
+        <source>Open Document File (*.%1)</source>
+        <translation>ODF Datei (*.%1)</translation>
+    </message>
 </context>
 <context>
     <name>MKeyGen</name>
@@ -711,55 +721,55 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrder</name>
     <message>
-        <location filename="order.cpp" line="112"/>
+        <location filename="order.cpp" line="122"/>
         <source>placed</source>
         <comment>state</comment>
         <translation>bestellt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="113"/>
+        <location filename="order.cpp" line="123"/>
         <source>sent</source>
         <comment>state</comment>
         <translation>versandt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="114"/>
+        <location filename="order.cpp" line="124"/>
         <source>cancelled</source>
         <comment>state</comment>
         <translation>storniert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="115"/>
+        <location filename="order.cpp" line="125"/>
         <source>closed</source>
         <comment>state</comment>
         <translation>geschlossen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="116"/>
+        <location filename="order.cpp" line="127"/>
         <source>check: ok</source>
         <comment>state</comment>
         <translation>Prüfung: ok</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="117"/>
+        <location filename="order.cpp" line="128"/>
         <source>check: sale only</source>
         <comment>state</comment>
         <translation>Prüfung: nur verkaufen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="118"/>
+        <location filename="order.cpp" line="129"/>
         <source>check: order only</source>
         <comment>state</comment>
         <translation>Prüfung: nur bestellen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="119"/>
+        <location filename="order.cpp" line="130"/>
         <source>check: failed</source>
         <comment>state</comment>
         <translation>Prüfung: nicht möglich</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="120"/>
+        <location filename="order.cpp" line="131"/>
         <source>invalid</source>
         <comment>state</comment>
         <translation>ungültig</translation>
@@ -768,473 +778,637 @@ At least %1 Bits of random are required.</source>
         <location filename="order.cpp" line="147"/>
         <source>.</source>
         <comment>decimal dot</comment>
-        <translation>,</translation>
+        <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="351"/>
+        <location filename="order.cpp" line="377"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
         <translation>ddd, dd.MM.yyyy hh:mm &apos;Uhr&apos;</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="364"/>
+        <location filename="order.cpp" line="390"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation>d.M.yyyy</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="419"/>
+        <location filename="order.cpp" line="445"/>
         <source>This ticket is not part of this order.</source>
         <translation>Dieses Ticket ist nicht in einer Bestellung enthalten.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="453"/>
+        <location filename="order.cpp" line="531"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="449"/>
+        <location filename="order.cpp" line="527"/>
         <source>The request failed.</source>
         <translation>Anfrage ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="453"/>
+        <location filename="order.cpp" line="531"/>
         <source>A problem occurred during the order: %1</source>
         <translation>Die Bestellung ist fehlgeschlagen: %1</translation>
     </message>
+    <message>
+        <location filename="order.cpp" line="126"/>
+        <source>reserved</source>
+        <comment>state</comment>
+        <translation>reserviert</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="454"/>
+        <source>Cannot query DB, don&apos;t know it.</source>
+        <translation>Interner Fehler: Kann die Datenbank nicht abfragen.</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="466"/>
+        <source>Cannot update shipping: error while sending.</source>
+        <translation>Kann Versandinformationen nicht senden: Sendefehler.</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="486"/>
+        <source>This voucher is not part of this order.</source>
+        <translation>Dieser Gutschein ist nicht Teil der Bestellung.</translation>
+    </message>
+</context>
+<context>
+    <name>MOrderItemView</name>
+    <message>
+        <location filename="orderwin.cpp" line="692"/>
+        <source>Preview Tickets</source>
+        <translation>Karten-Vorschau</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="701"/>
+        <source>Ticket: </source>
+        <translation>Eintrittskarte:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="703"/>
+        <source>Voucher: </source>
+        <translation>Gutschein:</translation>
+    </message>
 </context>
 <context>
     <name>MOrderWindow</name>
     <message>
-        <location filename="orderwin.cpp" line="44"/>
+        <location filename="orderwin.cpp" line="45"/>
         <source>Order Details</source>
         <translation>Bestelldetails</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="49"/>
+        <location filename="orderwin.cpp" line="50"/>
         <source>&amp;Order</source>
         <translation>&amp;Bestellung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="50"/>
+        <location filename="orderwin.cpp" line="51"/>
         <source>&amp;Order...</source>
         <translation>&amp;Bestellung...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="52"/>
+        <location filename="orderwin.cpp" line="54"/>
         <source>&amp;Sell...</source>
         <translation>&amp;Verkauf...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="56"/>
+        <location filename="orderwin.cpp" line="62"/>
         <source>C&amp;ancel Order...</source>
         <translation>Bestellung &amp;Stornieren...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="68"/>
+        <location filename="orderwin.cpp" line="76"/>
         <source>&amp;Close</source>
         <translation>S&amp;chließen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="69"/>
+        <location filename="orderwin.cpp" line="78"/>
         <source>&amp;Payment</source>
         <translation>&amp;Bezahlung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="71"/>
+        <location filename="orderwin.cpp" line="80"/>
         <source>Receive &amp;Payment...</source>
         <translation>&amp;bezahlen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="73"/>
+        <location filename="orderwin.cpp" line="82"/>
         <source>&amp;Refund...</source>
         <translation>&amp;zurückgeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="75"/>
+        <location filename="orderwin.cpp" line="85"/>
         <source>P&amp;rinting</source>
         <translation>&amp;Druck</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="77"/>
+        <location filename="orderwin.cpp" line="87"/>
         <source>Print &amp;Bill...</source>
         <translation>&amp;Rechnung drucken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="78"/>
+        <location filename="orderwin.cpp" line="88"/>
         <source>Save Bill &amp;as file...</source>
         <translation>Rechnung &amp;speichern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="80"/>
+        <location filename="orderwin.cpp" line="90"/>
         <source>Print &amp;Tickets...</source>
         <translation>&amp;Eintrittskarten drucken...</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="81"/>
         <source>Print &amp;Current Ticket...</source>
-        <translation>markierte Eintrittskarte drucken</translation>
+        <translation type="obsolete">markierte Eintrittskarte drucken</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="82"/>
         <source>&amp;View Tickets...</source>
-        <translation>Eintrittskarten &amp;ansehen...</translation>
+        <translation type="obsolete">Eintrittskarten &amp;ansehen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="93"/>
+        <location filename="orderwin.cpp" line="104"/>
         <source>Order ID:</source>
         <translation>Bestell-Nr.:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="95"/>
+        <location filename="orderwin.cpp" line="106"/>
         <source>Order Date:</source>
         <translation>Bestelldatum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="97"/>
+        <location filename="orderwin.cpp" line="108"/>
         <source>Shipping Date:</source>
         <translation>Versandtdatum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="99"/>
+        <location filename="orderwin.cpp" line="110"/>
         <source>Customer:</source>
         <translation>Kunde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="104"/>
+        <location filename="orderwin.cpp" line="115"/>
         <source>Sold by:</source>
         <translation>Verkauft durch:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="106"/>
+        <location filename="orderwin.cpp" line="117"/>
         <source>Total Price:</source>
         <translation>Gesamtpreis:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="108"/>
+        <location filename="orderwin.cpp" line="119"/>
         <source>Already Paid:</source>
         <translation>bereits bezahlt:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="110"/>
+        <location filename="orderwin.cpp" line="121"/>
         <source>Order State:</source>
         <translation>Bestellstatus:</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="143"/>
         <source>Ticket ID</source>
-        <translation>Karten-Nr.</translation>
+        <translation type="obsolete">Karten-Nr.</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="143"/>
         <source>Event</source>
-        <translation>Veranstaltung</translation>
+        <translation type="obsolete">Veranstaltung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="orderwin.cpp" line="162"/>
         <source>Start Time</source>
         <translation>Anfangszeit</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="orderwin.cpp" line="162"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="orderwin.cpp" line="162"/>
         <source>Price</source>
         <translation>Preis</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="58"/>
+        <location filename="orderwin.cpp" line="64"/>
         <source>&amp;Mark Order as Shipped...</source>
         <translation>Bestellung als versandt markieren...</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="61"/>
         <source>Ch&amp;ange Ticket-Price...</source>
-        <translation>Kartenpreis ändern...</translation>
+        <translation type="obsolete">Kartenpreis ändern...</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="63"/>
         <source>&amp;Return Ticket...</source>
-        <translation>Karte zurückgeben...</translation>
+        <translation type="obsolete">Karte zurückgeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="454"/>
+        <location filename="orderwin.cpp" line="577"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="210"/>
+        <location filename="orderwin.cpp" line="263"/>
         <source>Unable to get template file (ticket.xtt). Giving up.</source>
         <translation>Kann Vorlage (ticket.xtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="238"/>
         <source>Unable to get template file (bill.odtt). Giving up.</source>
-        <translation>Kann Vorlage (bill.odtt) nicht finden. Gebe auf.</translation>
+        <translation type="obsolete">Kann Vorlage (bill.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="494"/>
+        <location filename="orderwin.cpp" line="638"/>
         <source>Mark as shipped?</source>
         <translation>Als versandt markieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="494"/>
+        <location filename="orderwin.cpp" line="638"/>
         <source>Mark this order as shipped now?</source>
         <translation>Diese Bestellung jetzt als versandt markieren?</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="261"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
-        <translation>Kann Vorlage (eventsummary.odtt) nicht finden. Gebe auf.</translation>
+        <translation type="obsolete">Kann Vorlage (eventsummary.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="347"/>
+        <location filename="orderwin.cpp" line="439"/>
         <source>Enter Payment</source>
         <translation>Zahlbetrag eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="347"/>
+        <location filename="orderwin.cpp" line="439"/>
         <source>Please enter the amount that has been paid:</source>
         <translation>Bitte geben Sie den Betrag ein, der bezahlt wurde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="354"/>
+        <location filename="orderwin.cpp" line="446"/>
         <source>Unable to submit payment request.</source>
         <translation>Kann Bestellung nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="358"/>
+        <location filename="orderwin.cpp" line="450"/>
         <source>Error while trying to pay: %1</source>
         <translation>Fehler während der Bezahlung: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="406"/>
+        <location filename="orderwin.cpp" line="462"/>
         <source>Enter Refund</source>
         <translation>Rückgabe eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="406"/>
+        <location filename="orderwin.cpp" line="462"/>
         <source>Please enter the amount that will be refunded:</source>
         <translation>Bitte geben Sie den Betrag ein, der zurückgegeben wird:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="377"/>
+        <location filename="orderwin.cpp" line="469"/>
         <source>Unable to submit refund request.</source>
         <translation>Kann Rückgabe nicht übermitteln.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="381"/>
+        <location filename="orderwin.cpp" line="473"/>
         <source>Error whily trying to refund: %1</source>
         <translation>Fehler während der Rückgabe: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="434"/>
+        <location filename="orderwin.cpp" line="534"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation>Diese Karte kann nicht zurückgegeben werden: sie wurde bereits verwendet.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="438"/>
+        <location filename="orderwin.cpp" line="538"/>
         <source>Return Ticket</source>
         <translation>Karte zurückgeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="438"/>
+        <location filename="orderwin.cpp" line="538"/>
         <source>Do you really want to return this ticket?</source>
         <translation>Wollen Sie diese Karte wirklich zurückgeben?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="448"/>
+        <location filename="orderwin.cpp" line="571"/>
         <source>Cancel Order?</source>
         <translation>Bestellung stornieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="448"/>
+        <location filename="orderwin.cpp" line="571"/>
         <source>Cancel this order now?</source>
         <translation>Diese Bestellung jetzt stornieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="450"/>
+        <location filename="orderwin.cpp" line="573"/>
         <source>Cannot cancel this order: it is in the wrong state.</source>
         <translation>Diese Bestellung kann nicht: sie ist im falschen Zustand.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="454"/>
+        <location filename="orderwin.cpp" line="577"/>
         <source>Failed to cancel this order.</source>
         <translation>Kann diese Bestellung nicht stornieren. Schade.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="101"/>
+        <location filename="orderwin.cpp" line="112"/>
         <source>Delivery Address:</source>
         <translation>Lieferadresse:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="112"/>
+        <location filename="orderwin.cpp" line="127"/>
         <source>Order Comment:</source>
         <translation>Bestellkommentar:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="65"/>
+        <location filename="orderwin.cpp" line="71"/>
         <source>Change Commen&amp;t...</source>
         <translation>Kommen&amp;tar ändern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="506"/>
+        <location filename="orderwin.cpp" line="650"/>
         <source>Set comment: order %1</source>
         <translation>Kommentar ändern: Bestellung %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="517"/>
+        <location filename="orderwin.cpp" line="661"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="519"/>
+        <location filename="orderwin.cpp" line="663"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="54"/>
+        <location filename="orderwin.cpp" line="59"/>
         <source>&amp;Prune and recheck...</source>
         <translation>Ungültige Einträge entfernen und erneut checken...</translation>
     </message>
+    <message>
+        <location filename="orderwin.cpp" line="57"/>
+        <source>Ma&amp;ke Reservation...</source>
+        <translation>Reservierung durchführen...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="67"/>
+        <source>Ch&amp;ange Item-Price...</source>
+        <translation>Artikelpreis ändern...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="69"/>
+        <source>&amp;Return Item...</source>
+        <translation>Artikel zurückgeben...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="73"/>
+        <source>Change Sh&amp;ipping Method...</source>
+        <translation>Versandoption ändern...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="91"/>
+        <source>Print V&amp;ouchers...</source>
+        <translation>Gutscheine drucken...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="92"/>
+        <source>Print &amp;Current Item...</source>
+        <translation>Aktuellen Artikel drucken...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="93"/>
+        <source>&amp;View Items...</source>
+        <translation>Artikel ansehen...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="123"/>
+        <source>Shipping Method:</source>
+        <translation>Versandoption:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="125"/>
+        <source>Shipping Costs:</source>
+        <translation>Versandkosten:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="162"/>
+        <source>Item ID</source>
+        <translation>Artikelnummer:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="162"/>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="182"/>
+        <source>Voucher (current value: %1)</source>
+        <translation>Gutschein (aktueller Wert: %1)</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="257"/>
+        <source>There are no tickets left to print.</source>
+        <translation>Es gibt keine Eintrittskarten zu drucken.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="296"/>
+        <source>There are no vouchers left to print.</source>
+        <translation>Es gibt keine Gutscheine zu drucken.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="302"/>
+        <source>Unable to get template file (voucher.xtt). Giving up.</source>
+        <translation>Kann Vorlage (voucher) nicht finden. Gebe auf.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="330"/>
+        <source>Unable to get template file (bill). Giving up.</source>
+        <translation>Kann Vorlage (bill) nicht finden. Gebe auf.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="353"/>
+        <source>Unable to get template file (eventsummary). Giving up.</source>
+        <translation>Kann Vorlage (eventsummary) nicht finden. Gebe auf.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="361"/>
+        <source>Open Document File (*.%1)</source>
+        <translation>ODF Datei (*.%1)</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="500"/>
+        <source>Enter Price</source>
+        <translation>Bitte Preis eingeben</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="500"/>
+        <source>Please enter the new price for the ticket:</source>
+        <translation>Bitte neuen Preis für die Eintrittskarte eingeben:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="507"/>
+        <source>Cannot change this item type.</source>
+        <translation>Diese Artikelart kann nicht geändert werden.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="555"/>
+        <source>This voucher cannot be returned, it has already been used.</source>
+        <translation>Diese Karte kann nicht zurückgegeben werden: sie wurde bereits verwendet.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="559"/>
+        <source>Return Voucher</source>
+        <translation>Gutschein zurückgeben</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="559"/>
+        <source>Do you really want to return this voucher?</source>
+        <translation>Wollen Sie diesen Gutschein wirklich zurückgeben?</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="566"/>
+        <source>Cannot return this item type.</source>
+        <translation>Diese Artikelart kann nicht zurückgegeben werden.</translation>
+    </message>
 </context>
 <context>
     <name>MOverview</name>
     <message>
-        <location filename="overview.cpp" line="63"/>
+        <location filename="overview.cpp" line="65"/>
         <source>&amp;Session</source>
         <translation>&amp;Session</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="64"/>
+        <location filename="overview.cpp" line="66"/>
         <source>&amp;Re-Login</source>
         <translation>&amp;Login wiederholen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="70"/>
+        <location filename="overview.cpp" line="73"/>
         <source>&amp;Close Session</source>
         <translation>Session &amp;schließen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="72"/>
+        <location filename="overview.cpp" line="75"/>
         <source>&amp;Event</source>
         <translation>&amp;Veranstaltung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="82"/>
+        <location filename="overview.cpp" line="85"/>
         <source>&amp;Customer</source>
         <translation>&amp;Kunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="108"/>
+        <location filename="overview.cpp" line="116"/>
         <source>Events</source>
         <translation>Veranstaltungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1162"/>
+        <location filename="overview.cpp" line="1283"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="369"/>
+        <location filename="overview.cpp" line="381"/>
         <source>I was unable to renew the login at the server, the error was: %1</source>
         <translation>Der erneute Login ist fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="65"/>
+        <location filename="overview.cpp" line="67"/>
         <source>&amp;Offline mode</source>
         <translation>&amp;Offlinemodus</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="75"/>
+        <location filename="overview.cpp" line="78"/>
         <source>&amp;New Event...</source>
         <translation>&amp;Neue Veranstaltung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="83"/>
+        <location filename="overview.cpp" line="86"/>
         <source>&amp;Show all customers</source>
         <translation>&amp;Alle Kunden anzeigen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="85"/>
+        <location filename="overview.cpp" line="88"/>
         <source>C&amp;art</source>
         <translation>&amp;Einkaufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="86"/>
+        <location filename="overview.cpp" line="89"/>
         <source>Add &amp;Ticket</source>
         <translation>Eintrittskarte &amp;hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="87"/>
+        <location filename="overview.cpp" line="90"/>
         <source>Add &amp;Voucher</source>
         <translation>&amp;Gutschein hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="88"/>
+        <location filename="overview.cpp" line="91"/>
         <source>&amp;Remove Item</source>
         <translation>&amp;Entfernen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="89"/>
+        <location filename="overview.cpp" line="92"/>
         <source>&amp;Abort Shopping</source>
         <translation>&amp;Einkauf abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="118"/>
+        <location filename="overview.cpp" line="126"/>
         <source>New Event...</source>
         <translation>Neue Veranstaltung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="207"/>
+        <location filename="overview.cpp" line="218"/>
         <source>Details...</source>
         <translation>Details...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="125"/>
+        <location filename="overview.cpp" line="133"/>
         <source>Order Ticket...</source>
         <translation>Bestellen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="139"/>
+        <location filename="overview.cpp" line="147"/>
         <source>Shopping Cart</source>
         <translation>Einkaufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="151"/>
+        <location filename="overview.cpp" line="159"/>
         <source>Add Ticket</source>
         <translation>Eintrittskarte hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="153"/>
+        <location filename="overview.cpp" line="161"/>
         <source>Add Voucher</source>
         <translation>Gutschein hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="156"/>
+        <location filename="overview.cpp" line="163"/>
         <source>Remove Item</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="162"/>
+        <location filename="overview.cpp" line="169"/>
         <source>Customer:</source>
         <translation>Kunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="168"/>
+        <location filename="overview.cpp" line="178"/>
         <source>Delivery Address:</source>
         <translation>Lieferadresse:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="171"/>
+        <location filename="overview.cpp" line="181"/>
         <source>Comments:</source>
         <translation>Kommentare:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="181"/>
+        <location filename="overview.cpp" line="191"/>
         <source>Clear</source>
         <translation>Von vorn</translation>
     </message>
@@ -1249,183 +1423,183 @@ At least %1 Bits of random are required.</source>
         <translation>Titel</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="338"/>
+        <location filename="overview.cpp" line="350"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="73"/>
+        <location filename="overview.cpp" line="76"/>
         <source>&amp;Update Event List</source>
         <translation>&amp;Veranstaltungsliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="74"/>
+        <location filename="overview.cpp" line="77"/>
         <source>&amp;Show/Edit details...</source>
         <translation>&amp;Details anzeigen/editieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="231"/>
+        <location filename="overview.cpp" line="242"/>
         <source>Users</source>
         <translation>Nutzer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="239"/>
+        <location filename="overview.cpp" line="250"/>
         <source>New User...</source>
         <translation>Neuer Nutzer...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="242"/>
+        <location filename="overview.cpp" line="253"/>
         <source>Delete User...</source>
         <translation>Nutzer löschen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="246"/>
+        <location filename="overview.cpp" line="257"/>
         <source>Description...</source>
         <translation>Beschreibung.,.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="249"/>
+        <location filename="overview.cpp" line="260"/>
         <source>Hosts...</source>
         <translation>Hosts...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="252"/>
+        <location filename="overview.cpp" line="263"/>
         <source>Roles...</source>
         <translation>Rollen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="261"/>
+        <location filename="overview.cpp" line="272"/>
         <source>Hosts</source>
         <translation>Hosts</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="431"/>
+        <location filename="overview.cpp" line="452"/>
         <source>Login Name</source>
         <translation>Loginname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="431"/>
+        <location filename="overview.cpp" line="452"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="445"/>
+        <location filename="overview.cpp" line="466"/>
         <source>New User</source>
         <translation>Neuer Nutzer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="445"/>
+        <location filename="overview.cpp" line="466"/>
         <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
         <translation>Neuen Nutzernamen eingeben (Buchstaben, Ziffern, Unterstrich):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="864"/>
+        <location filename="overview.cpp" line="978"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="495"/>
+        <location filename="overview.cpp" line="516"/>
         <source>Edit Description</source>
         <translation>Beschreibung ändern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="495"/>
+        <location filename="overview.cpp" line="516"/>
         <source>Descriptionof user %1:</source>
         <translation>Beschreibung von Nutzer %1:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="66"/>
+        <location filename="overview.cpp" line="68"/>
         <source>Change my &amp;Password</source>
         <translation>Mein &amp;Passwort ändern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="255"/>
+        <location filename="overview.cpp" line="266"/>
         <source>Set Password...</source>
         <translation>Passwort setzen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="269"/>
+        <location filename="overview.cpp" line="280"/>
         <source>New Host...</source>
         <translation>Neuer Host...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="272"/>
+        <location filename="overview.cpp" line="283"/>
         <source>Add This Host...</source>
         <translation>Diesen Host hinzufügen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="275"/>
+        <location filename="overview.cpp" line="286"/>
         <source>Delete Host...</source>
         <translation>Host löschen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="279"/>
+        <location filename="overview.cpp" line="290"/>
         <source>Generate New Key...</source>
         <translation>Neuen Schlüssel anlegen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="282"/>
+        <location filename="overview.cpp" line="293"/>
         <source>Import...</source>
         <translation>Importieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="285"/>
+        <location filename="overview.cpp" line="296"/>
         <source>Export...</source>
         <translation>Exportieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="454"/>
+        <location filename="overview.cpp" line="475"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="454"/>
+        <location filename="overview.cpp" line="475"/>
         <source>Please enter an initial password for the user:</source>
         <translation>Bitte geben Sie ein intiales Passwort ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="469"/>
+        <location filename="overview.cpp" line="490"/>
         <source>Delete User?</source>
         <translation>Nutzer löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="469"/>
+        <location filename="overview.cpp" line="490"/>
         <source>Really delete user &apos;%1&apos;?</source>
         <translation>Nutzer &apos;%1&apos; wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="538"/>
+        <location filename="overview.cpp" line="559"/>
         <source>Error setting password: %1</source>
         <translation>Passwort kann nicht gesetzt werden: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="553"/>
+        <location filename="overview.cpp" line="574"/>
         <source>The password must be non-empty and both lines must match</source>
         <translation>Das Passwort darf nicht leer sein und beide Zeilen müssen übereinstimmen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="569"/>
+        <location filename="overview.cpp" line="590"/>
         <source>Host Name</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="569"/>
+        <location filename="overview.cpp" line="590"/>
         <source>Host Key</source>
         <translation>Hostkey</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="586"/>
+        <location filename="overview.cpp" line="607"/>
         <source>Create New Host</source>
         <translation>Neuen Host anlegen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="586"/>
+        <location filename="overview.cpp" line="607"/>
         <source>Please enter a host name:</source>
         <translation>Bitte geben Sie einen neuen Hostnamen ein:</translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="594"/>
+        <location filename="overview.cpp" line="615"/>
         <source>The key of this new host could only be generated with %n bits entropy. Store anyway?</source>
         <translation>
             <numerusform>Der Key dieses Hosts konnte nur mit %n Bit Entropie angelegt werden. Trotzdem speichern?</numerusform>
@@ -1433,27 +1607,27 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="617"/>
+        <location filename="overview.cpp" line="638"/>
         <source>Delete this Host?</source>
         <translation>Diesen Host löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="617"/>
+        <location filename="overview.cpp" line="638"/>
         <source>Really delete host &apos;%1&apos;?</source>
         <translation>Den Host &apos;%1&apos; wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="631"/>
+        <location filename="overview.cpp" line="652"/>
         <source>Change Host Key?</source>
         <translation>Hostkey ändern?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="631"/>
+        <location filename="overview.cpp" line="652"/>
         <source>Really change the key of host &apos;%1&apos;?</source>
         <translation>Den Key von Host &apos;%1&apos; wirklich ändern?</translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="636"/>
+        <location filename="overview.cpp" line="657"/>
         <source>The new key of this host could only be generated with %n bits entropy. Store anyway?</source>
         <translation>
             <numerusform>Der Key dieses Hosts konnte nur mit %n Bit Entropie angelegt werden. Trotzdem speichern?</numerusform>
@@ -1461,82 +1635,82 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="647"/>
+        <location filename="overview.cpp" line="668"/>
         <source>Import Key from File</source>
         <translation>Key aus Datei importieren</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="656"/>
+        <location filename="overview.cpp" line="677"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation>Datei %1 kann nicht zum Lesen geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="668"/>
+        <location filename="overview.cpp" line="689"/>
         <source>This is not a host key file.</source>
         <translation>Dies ist keine Hostkeydatei.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="673"/>
+        <location filename="overview.cpp" line="694"/>
         <source>This host key file does not contain a valid host name.</source>
         <translation>Die Hostkeydatei enthält keinen gültigen Hostnamen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="678"/>
+        <location filename="overview.cpp" line="699"/>
         <source>This host key file does not contain a valid key.</source>
         <translation>Diese Datei enthält keinen gültigen Hostkey.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="683"/>
+        <location filename="overview.cpp" line="704"/>
         <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
         <translation>Die Checksumme dieser Datei ist fehlgeschlagen. Bitte besorgen Sie eine neue Kopie der Datei.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="701"/>
+        <location filename="overview.cpp" line="722"/>
         <source>This host cannot be exported.</source>
         <translation>Dieser Host kann nicht exportiert werden.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="706"/>
+        <location filename="overview.cpp" line="727"/>
         <source>Export Key to File</source>
         <translation>Hostkey als Datei speichern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="715"/>
+        <location filename="overview.cpp" line="736"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation>Datei %1 kann nicht zum Schreiben geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="178"/>
+        <location filename="overview.cpp" line="188"/>
         <source>Order Items</source>
         <translation>Bestellung anlegen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="185"/>
+        <location filename="overview.cpp" line="195"/>
         <source>Order List</source>
         <translation>Bestellungsliste</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="189"/>
+        <location filename="overview.cpp" line="199"/>
         <source>-select mode-</source>
         <translation>-Modus auswählen-</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="190"/>
+        <location filename="overview.cpp" line="200"/>
         <source>All Orders</source>
         <translation>Alle Bestellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="191"/>
+        <location filename="overview.cpp" line="201"/>
         <source>Open Orders</source>
         <translation>Offene Bestellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="192"/>
+        <location filename="overview.cpp" line="203"/>
         <source>Outstanding Payments</source>
         <translation>Noch nicht bezahlt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="193"/>
+        <location filename="overview.cpp" line="204"/>
         <source>Outstanding Refunds</source>
         <translation>Offene Rückerstattungen</translation>
     </message>
@@ -1546,513 +1720,914 @@ At least %1 Bits of random are required.</source>
         <translation>Anzahl</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="771"/>
+        <location filename="overview.cpp" line="781"/>
         <source>Select Event to order Ticket</source>
         <translation>Bitte wählen Sie eine Verstaltung aus, um zu bestellen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="784"/>
+        <location filename="overview.cpp" line="794"/>
         <source>Select</source>
         <translation>Auswählen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1043"/>
+        <location filename="overview.cpp" line="1165"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="820"/>
+        <location filename="overview.cpp" line="912"/>
         <source>There is nothing in the order. Ignoring it.</source>
         <translation>Bestellung ist leer. Vorgang abgebrochen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="824"/>
+        <location filename="overview.cpp" line="916"/>
         <source>Please chose a customer first!</source>
         <translation>Bitte wählen Sie zunächst einen Kunden aus!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="860"/>
+        <location filename="overview.cpp" line="974"/>
         <source>The request failed.</source>
         <translation>Anfrage ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="864"/>
+        <location filename="overview.cpp" line="978"/>
         <source>A problem occurred during the order: %1</source>
         <translation>Die Bestellung ist fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="223"/>
+        <location filename="overview.cpp" line="234"/>
         <source>Entrance</source>
         <translation>Einlasskontrolle</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="129"/>
+        <location filename="overview.cpp" line="137"/>
         <source>Event Summary...</source>
         <translation>Veranstaltungsübersicht...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="194"/>
+        <location filename="overview.cpp" line="205"/>
         <source>Undelivered Orders</source>
         <translation>Nicht ausgelieferte Bestellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="204"/>
+        <location filename="overview.cpp" line="215"/>
         <source>Update</source>
         <translation>Auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Total</source>
         <translation>Gesamt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Paid</source>
         <translation>bezahlt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Customer</source>
         <translation>Kunde</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="68"/>
         <source>&amp;Upload Template...</source>
-        <translation>Vorlage &amp;hochladen...</translation>
+        <translation type="obsolete">Vorlage &amp;hochladen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="91"/>
+        <location filename="overview.cpp" line="96"/>
         <source>&amp;Misc</source>
         <translation>&amp;Verschiedenes</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="92"/>
         <source>&amp;Return ticket...</source>
-        <translation>&amp;Karte zurückgeben...</translation>
+        <translation type="obsolete">&amp;Karte zurückgeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="133"/>
+        <location filename="overview.cpp" line="141"/>
         <source>Cancel Event...</source>
         <translation>Veranstaltung absagen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="211"/>
+        <location filename="overview.cpp" line="222"/>
         <source>Find by Ticket...</source>
         <translation>Mit Kartennummer finden...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="416"/>
+        <location filename="overview.cpp" line="428"/>
         <source>Cancel Event</source>
         <translation>Veranstaltung absagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="416"/>
+        <location filename="overview.cpp" line="428"/>
         <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
         <translation>Bitte geben Sie einen Grund für die Absage der Veranstaltung &quot;%1&quot; ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="419"/>
+        <location filename="overview.cpp" line="431"/>
         <source>Event Cancelled</source>
         <translation>Veranstaltung abgesagt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="419"/>
+        <location filename="overview.cpp" line="431"/>
         <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
         <translation>Die Veranstaltung &quot;%1&quot; wurde abgesagt. Bitte informieren Sie alle Kunden.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="421"/>
+        <location filename="overview.cpp" line="433"/>
         <source>Unable to cancel event &quot;%1&quot;.</source>
         <translation>Kann Veranstaltung &quot;%1&quot; nicht absagen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="912"/>
+        <location filename="overview.cpp" line="1033"/>
         <source>Ticket &quot;%1&quot; Not Valid</source>
         <translation>Karte &quot;%1&quot; ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="916"/>
+        <location filename="overview.cpp" line="1037"/>
         <source>Ticket &quot;%1&quot; has already been used</source>
         <translation>Karte &quot;%1&quot; wurde bereits verwendet.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="920"/>
+        <location filename="overview.cpp" line="1041"/>
         <source>Ticket &quot;%1&quot; has not been bought.</source>
         <translation>Karte &quot;%1&quot; wurde nicht gekauft.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="924"/>
+        <location filename="overview.cpp" line="1045"/>
         <source>Ticket &quot;%1&quot; Ok</source>
         <translation>Karte &quot;%1&quot; Okay.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="929"/>
+        <location filename="overview.cpp" line="1050"/>
         <source>Ticket &quot;%1&quot; Ok; the Order has a refund</source>
         <translation>Karte &quot;%1&quot; Okay.
 Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="934"/>
+        <location filename="overview.cpp" line="1055"/>
         <source>Ticket &quot;%1&quot; is not paid for!</source>
         <translation>Karte &quot;%1&quot; ist nicht bezahlt!!!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="937"/>
+        <location filename="overview.cpp" line="1058"/>
         <source>Ticket &quot;%1&quot; cannot be accepted, please check the order!</source>
         <translation>Karte &quot;%1&quot; kann nicht akzeptiert werden, bitte prüfen Sie die Bestellung.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1003"/>
+        <location filename="overview.cpp" line="1125"/>
         <source>Enter Ticket</source>
         <translation>Bitte Ticket eingeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1003"/>
+        <location filename="overview.cpp" line="1125"/>
         <source>Please enter the ID of one of the tickets of the order you seek:</source>
         <translation>Bitte geben Sie die Nr. einer Karte aus der gesuchten Bestellung ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1007"/>
+        <location filename="overview.cpp" line="1129"/>
         <source>Unable to query server.</source>
         <translation>Kann Server nicht abfragen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1016"/>
+        <location filename="overview.cpp" line="1138"/>
         <source>Server returned an invalid order ID.</source>
         <translation>Server hat eine ungültige Bestellnummer geliefert.</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1125"/>
         <source>Please select a template file.</source>
-        <translation>Bitte wählen Sie eine Vorlage aus.</translation>
+        <translation type="obsolete">Bitte wählen Sie eine Vorlage aus.</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1132"/>
         <source>Enter Template Name</source>
-        <translation>Vorlagenname eingeben</translation>
+        <translation type="obsolete">Vorlagenname eingeben</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1132"/>
         <source>Please enter a name for the template file, it should contain only letters, digits, underscores and dots:</source>
-        <translation>Bitte geben Sie einen Namen für die Vorlage ein. Der Name sollte nur Buchstaben, Zahlen und Unterstriche und Punkte enthalten:</translation>
+        <translation type="obsolete">Bitte geben Sie einen Namen für die Vorlage ein. Der Name sollte nur Buchstaben, Zahlen und Unterstriche und Punkte enthalten:</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1135"/>
         <source>The template name must only contain letters, digits, underscores and dots.</source>
-        <translation>Der Vorlagenname darf nur Buchstaben, Ziffern, Unterstriche und Punkte enthalten.</translation>
+        <translation type="obsolete">Der Vorlagenname darf nur Buchstaben, Ziffern, Unterstriche und Punkte enthalten.</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1139"/>
         <source>Success</source>
-        <translation>Erfolg</translation>
+        <translation type="obsolete">Erfolg</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1139"/>
         <source>Successfully uploaded the template.</source>
-        <translation>Vorlage wurde erfolgreich hochgeladen.</translation>
+        <translation type="obsolete">Vorlage wurde erfolgreich hochgeladen.</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1141"/>
         <source>Unable to upload the template.</source>
-        <translation>Kann Vorlage nicht hochladen.</translation>
+        <translation type="obsolete">Kann Vorlage nicht hochladen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1148"/>
+        <location filename="overview.cpp" line="1248"/>
         <source>Return Ticket</source>
         <translation>Karte zurückgeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1148"/>
+        <location filename="overview.cpp" line="1248"/>
         <source>Please enter the ticket ID to return:</source>
         <translation>Bitte geben Sie die Karte ein, die zurückgegeben wird:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1152"/>
+        <location filename="overview.cpp" line="1252"/>
         <source>This is not a valid ticket.</source>
         <translation>Dies ist keine gültige Karte.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1157"/>
+        <location filename="overview.cpp" line="1257"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation>Diese Karte kann nicht zurückgegeben werden: sie wurde bereits benutzt oder befindet sich im falschen Status.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="97"/>
+        <location filename="overview.cpp" line="105"/>
         <source>&amp;Admin</source>
         <translation>&amp;Administration</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="99"/>
+        <location filename="overview.cpp" line="107"/>
         <source>&amp;Schedule Backup...</source>
         <translation>&amp;Backupzeit festlegen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="100"/>
+        <location filename="overview.cpp" line="108"/>
         <source>&amp;Backup now...</source>
         <translation>&amp;Jetzt Backup machen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="101"/>
+        <location filename="overview.cpp" line="109"/>
         <source>&amp;Restore...</source>
         <translation>Backup &amp;wiederherstellen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="196"/>
+        <location filename="overview.cpp" line="207"/>
         <source>-search result-</source>
         <translation>-Suchresultat-</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="214"/>
+        <location filename="overview.cpp" line="225"/>
         <source>Find by Event...</source>
         <translation>Nach Veranstaltung finden...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="217"/>
+        <location filename="overview.cpp" line="228"/>
         <source>Find by Customer...</source>
         <translation>Nach Kunde finden...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="450"/>
+        <location filename="overview.cpp" line="471"/>
         <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
         <translation>Nutzernamen dürfen nur Buchstaben, Ziffern, Punkte und Unterstriche enthalten und müssen mindestens ein Zeichen lang sein!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1029"/>
+        <location filename="overview.cpp" line="1151"/>
         <source>Select Event</source>
         <translation>Veranstaltung auswählen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1041"/>
+        <location filename="overview.cpp" line="1163"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Capacity</source>
         <translation>Sitzplätze:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Sold</source>
         <translation>Verkauft</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Reserved</source>
         <translation>Reserviert</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Free</source>
         <translation>Frei</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="473"/>
+        <location filename="overview.cpp" line="494"/>
         <source>(Nobody)</source>
         <comment>this is a username for no user, the string must contain &apos;(&apos; to distinguish it from the others</comment>
         <translation>(Niemand)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="476"/>
+        <location filename="overview.cpp" line="497"/>
         <source>Delete User</source>
         <translation>Nutzer Löschen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="476"/>
+        <location filename="overview.cpp" line="497"/>
         <source>Select which user will inherit this users database objects:</source>
         <translation>Bitte wählen Sie einen Nutzer, der die Datenbankobjekte des gelöschten Nutzers erbt:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="481"/>
+        <location filename="overview.cpp" line="502"/>
         <source>Cannot delete user: %1</source>
         <translation>Kann Nutzer nicht löschen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="77"/>
+        <location filename="overview.cpp" line="80"/>
         <source>Show &amp;old Events</source>
         <translation>vergangene Veranstaltungen anzeigen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="94"/>
+        <location filename="overview.cpp" line="102"/>
         <source>C&amp;onfigure</source>
         <translation>Konfigurieren</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="95"/>
+        <location filename="overview.cpp" line="103"/>
         <source>&amp;Auto-Refresh settings...</source>
         <translation>Auto-Auffrisch-Einstellungen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1183"/>
+        <location filename="overview.cpp" line="1306"/>
         <source>Refresh Settings</source>
         <translation>Auffrischeinstellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1188"/>
+        <location filename="overview.cpp" line="1311"/>
         <source>Refresh Rate (minutes):</source>
         <translation>Auffrischrate (Minuten):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1194"/>
+        <location filename="overview.cpp" line="1317"/>
         <source>refresh &amp;event list</source>
         <translation>Veranstaltungsliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1196"/>
+        <location filename="overview.cpp" line="1319"/>
         <source>refresh &amp;user list</source>
         <translation>Nutzerliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1198"/>
+        <location filename="overview.cpp" line="1321"/>
         <source>refresh &amp;host list</source>
         <translation>Rechnerliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1205"/>
+        <location filename="overview.cpp" line="1330"/>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1207"/>
+        <location filename="overview.cpp" line="1332"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
+    <message>
+        <location filename="overview.cpp" line="70"/>
+        <source>&amp;Edit Templates...</source>
+        <translation>Vorlagen ändern...</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="71"/>
+        <source>&amp;Update Templates Now</source>
+        <translation>Vorlagen jetzt auffrischen</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="94"/>
+        <source>&amp;Update Shipping Options</source>
+        <translation>Versandoptionen auffrischen</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="97"/>
+        <source>Return &amp;ticket...</source>
+        <translation>Karte zurückgeben...</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="98"/>
+        <source>Return &amp;voucher...</source>
+        <translation>Gutschein zurückgeben...</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="100"/>
+        <source>Edit &amp;Shipping Options...</source>
+        <translation>Versandoptionen editieren</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="175"/>
+        <source>Shipping Method:</source>
+        <translation>Versandoption:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="202"/>
+        <source>Open Reservations</source>
+        <translation>Offene Reservierungen</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="440"/>
+        <source>(No Shipping)</source>
+        <translation>(Kein Versand)</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="844"/>
+        <source>Select Voucher</source>
+        <translation>Gutschein wählen</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="855"/>
+        <source>Select voucher price and value:</source>
+        <translation>Bitte Gutschein-Preis und -Wert wählen:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="856"/>
+        <source>Price:</source>
+        <translation>Preis:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="862"/>
+        <source>Value:</source>
+        <translation>Wert:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="894"/>
+        <source>Voucher (price: %1, value %2)</source>
+        <translation>Gutschein (Preis: %1, Wert: %2)</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1269"/>
+        <source>Return Voucher</source>
+        <translation>Gutschein zurückgeben</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1269"/>
+        <source>Please enter the voucher ID to return:</source>
+        <translation>Bitte geben Sie den Gutschein ein, der zurückgegeben wird:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1273"/>
+        <source>This is not a valid voucher.</source>
+        <translation>Dies ist kein gültiger Gutschein.</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1278"/>
+        <source>This voucher cannot be returned, it has already been used.</source>
+        <translation>Dieser Gutschein kann nicht zurückgegeben werden, er wurde bereits benutzt.</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1323"/>
+        <source>refresh &amp;shipping list</source>
+        <translation>Versandoptionen auffrischen</translation>
+    </message>
 </context>
 <context>
     <name>MPasswordChange</name>
     <message>
-        <location filename="overview.cpp" line="1228"/>
+        <location filename="overview.cpp" line="1354"/>
         <source>Change my password</source>
         <translation>Mein Passwort ändern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1234"/>
+        <location filename="overview.cpp" line="1360"/>
         <source>Old Password:</source>
         <translation>Altes Passwort:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1238"/>
+        <location filename="overview.cpp" line="1364"/>
         <source>New Password:</source>
         <translation>Neues Passwort:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1241"/>
+        <location filename="overview.cpp" line="1367"/>
         <source>Repeat Password:</source>
         <translation>Paswort wiederholen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1249"/>
+        <location filename="overview.cpp" line="1375"/>
         <source>Set Password</source>
         <translation>Passwort setzen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1251"/>
+        <location filename="overview.cpp" line="1377"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1230"/>
+        <location filename="overview.cpp" line="1356"/>
         <source>Reset password of user &quot;%1&quot;</source>
         <translation>Passwort des Nutzers &quot;%1&quot; zurücksetzen</translation>
     </message>
 </context>
 <context>
+    <name>MShipping</name>
+    <message>
+        <location filename="shipping.cpp" line="75"/>
+        <source>.</source>
+        <comment>decimal dot</comment>
+        <translation>,</translation>
+    </message>
+</context>
+<context>
+    <name>MShippingChange</name>
+    <message>
+        <location filename="orderwin.cpp" line="746"/>
+        <source>Change Shipping Method</source>
+        <translation>Versandoption ändern</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="753"/>
+        <source>Method:</source>
+        <translation>Option:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="755"/>
+        <source>Price:</source>
+        <translation>Preis:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="763"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="765"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="773"/>
+        <source>(None)</source>
+        <comment>shipping method</comment>
+        <translation>(Keine)</translation>
+    </message>
+</context>
+<context>
+    <name>MShippingEditor</name>
+    <message>
+        <location filename="shipping.cpp" line="130"/>
+        <source>Edit Shipping Options</source>
+        <translation>Versandoptionen editieren</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="142"/>
+        <source>Change Description</source>
+        <translation>Beschreibung ändern</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="144"/>
+        <source>Change Price</source>
+        <translation>Preis ändern</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="146"/>
+        <source>Change Availability</source>
+        <translation>Verfügbarkeit ändern</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="149"/>
+        <source>Add Option</source>
+        <translation>Option hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="151"/>
+        <source>Delete Option</source>
+        <translation>Option löschen</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="158"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="160"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>Price</source>
+        <translation>Preis</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>Web</source>
+        <translation>Web</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>Any User</source>
+        <translation>Jeder Nutzer</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="174"/>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="174"/>
+        <source>No</source>
+        <translation>Nein</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="248"/>
+        <source>Shipping Option Description</source>
+        <translation>Versandoptionsbeschreibung</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="188"/>
+        <source>Please select a new description for this shipping option:</source>
+        <translation>Bitte geben Sie eine Beschreibung für diese Versandoption ein:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="286"/>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="238"/>
+        <source>Could not store the changes.</source>
+        <translation>Konnte Änderungen nicht speichern.</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="251"/>
+        <source>Shipping Option Price</source>
+        <translation>Versandoptionspreis</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="209"/>
+        <source>Please select a new price for this shipping option:</source>
+        <translation>Bitte geben Sie einen Preis für diese Versandoption ein:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>None</source>
+        <translation>Nur privilegierte Nutzer</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>Web Interface</source>
+        <translation>Privilegierte Nutzer und Web-Kunden</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>Any User + Web Interface</source>
+        <translation>Jeder</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="255"/>
+        <source>Shipping Option Availability</source>
+        <translation>Versandoptionsverfügbarkeit</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="232"/>
+        <source>Please select a new availability for this shipping option:</source>
+        <translation>Bitte wählen Sie eine Verfügbarkeit für diese Versandoption:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="248"/>
+        <source>Please select a new description for this new shipping option:</source>
+        <translation>Bitte geben Sie eine Beschreibung für diese Versandoption ein:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="251"/>
+        <source>Please select a new price for this new shipping option:</source>
+        <translation>Bitte geben Sie einen Preis für diese Versandoption ein:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="255"/>
+        <source>Please select a new availability for this new shipping option:</source>
+        <translation>Bitte wählen Sie eine Verfügbarkeit für diese Versandoption:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="266"/>
+        <source>Could not create the new option.</source>
+        <translation>Konnte die neue Versandoption nicht anlegen.</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="286"/>
+        <source>Unable to delete this option.</source>
+        <translation>Kann diese Option nicht löschen.</translation>
+    </message>
+</context>
+<context>
+    <name>MTemplateChoice</name>
+    <message>
+        <location filename="templatedlg.cpp" line="29"/>
+        <source>Chose Template</source>
+        <translation>Vorlage auswählen</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="32"/>
+        <source>Please chose a variant of template %s:</source>
+        <translation>Bitte wählen Sie eine Variante für die Vorlage %1:</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="41"/>
+        <source>(default)</source>
+        <comment>default template pseudo-variant</comment>
+        <translation>(Standard)</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="50"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+</context>
+<context>
+    <name>MTemplateEditor</name>
+    <message>
+        <location filename="templatedlg.cpp" line="72"/>
+        <source>Edit Template Directory</source>
+        <translation>Vorlagenverzeichnis editieren</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="84"/>
+        <source>Update Now</source>
+        <translation>Jetzt auffrischen</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="86"/>
+        <source>Add Variant</source>
+        <translation>Variante hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="88"/>
+        <source>Delete Variant</source>
+        <translation>Variante löschen</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="95"/>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="110"/>
+        <source>Template/Variant</source>
+        <translation>Vorlage/Variante</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="110"/>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="110"/>
+        <source>Checksum</source>
+        <translation>Checksumme</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="221"/>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="167"/>
+        <source>Unable to delete this template.</source>
+        <translation>Kann diese Vorlage nicht löschen.</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="180"/>
+        <source>Select Template File</source>
+        <translation>Vorlagendatei wählen</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="185"/>
+        <source>Files with this extension (%1) are not legal for this template.</source>
+        <translation>Dateien mit der Erweiterung %1 sind für diese Vorlage nicht erlaubt.</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="204"/>
+        <source>Unable to upload file.</source>
+        <translation>Kann Datei nicht hochladen.</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="221"/>
+        <source>Unable to send new description to server.</source>
+        <translation>Kann die neue Beschreibung nicht speichern.</translation>
+    </message>
+</context>
+<context>
+    <name>MTemplateStore</name>
+    <message>
+        <location filename="templates.cpp" line="105"/>
+        <source>Retrieving templates from server.</source>
+        <translation>Hole Vorlagen vom Server.</translation>
+    </message>
+</context>
+<context>
     <name>MTicket</name>
     <message>
-        <location filename="order.cpp" line="617"/>
+        <location filename="order.cpp" line="722"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="652"/>
+        <location filename="order.cpp" line="757"/>
         <source>bought</source>
         <comment>ticket state</comment>
         <translation>gekauft</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="653"/>
+        <location filename="order.cpp" line="758"/>
         <source>to refund</source>
         <comment>ticket state</comment>
         <translation>zurückgegeben</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="654"/>
+        <location filename="order.cpp" line="759"/>
         <source>used</source>
         <comment>ticket state</comment>
         <translation>benutzt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="655"/>
+        <location filename="order.cpp" line="760"/>
         <source>reserved</source>
         <comment>ticket state</comment>
         <translation>reserviert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="656"/>
+        <location filename="order.cpp" line="761"/>
         <source>ok</source>
         <comment>ticket state</comment>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="657"/>
+        <location filename="order.cpp" line="762"/>
         <source>sale only</source>
         <comment>ticket state</comment>
         <translation>nur zum Verkauf</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="658"/>
+        <location filename="order.cpp" line="763"/>
         <source>order only</source>
         <comment>ticket state</comment>
         <translation>nur zur Bestellung</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="659"/>
+        <location filename="order.cpp" line="764"/>
         <source>too late: event over</source>
         <comment>ticket state</comment>
         <translation>zu spät: Veranstaltung ist vorbei</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="660"/>
+        <location filename="order.cpp" line="765"/>
         <source>no more tickets</source>
         <comment>ticket state</comment>
         <translation>keine Karten mehr verfügbar</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="661"/>
+        <location filename="order.cpp" line="766"/>
         <source>event cancelled</source>
         <comment>ticket state</comment>
         <translation>Veranstaltung abgesagt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="662"/>
+        <location filename="order.cpp" line="767"/>
         <source>no such event</source>
         <comment>ticket state</comment>
         <translation>Veranstaltung unbekannt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="663"/>
+        <location filename="order.cpp" line="768"/>
         <source>invalid</source>
         <comment>ticket state</comment>
         <translation>ungültig</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="682"/>
+        <location filename="order.cpp" line="787"/>
         <source>Cannot execute request.</source>
         <translation>Kann Anfrage nicht ausführen.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="709"/>
+        <location filename="order.cpp" line="814"/>
         <source>Ticket is not stored, can&apos;t return it.</source>
         <translation>Karte ist nicht gespeichert, kann sie nicht zurückgeben.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="711"/>
+        <location filename="order.cpp" line="816"/>
         <source>Failed to execute request</source>
         <translation>Kann Anfrage nicht ausführen.</translation>
     </message>
@@ -2062,7 +2637,7 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
     <message>
         <location filename="orderwin.cpp" line="534"/>
         <source>Preview Tickets</source>
-        <translation>Karten-Vorschau</translation>
+        <translation type="obsolete">Karten-Vorschau</translation>
     </message>
 </context>
 <context>
@@ -2074,97 +2649,140 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
     </message>
 </context>
 <context>
+    <name>MVoucher</name>
+    <message>
+        <location filename="order.cpp" line="908"/>
+        <source>invalid</source>
+        <translation>ungültig</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="910"/>
+        <source>cancelled</source>
+        <translation>storniert</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="911"/>
+        <source>empty</source>
+        <translation>leer</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="912"/>
+        <source>used</source>
+        <translation>benutzt</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="913"/>
+        <source>unused</source>
+        <translation>unbenutzt</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="930"/>
+        <source>Voucher is not stored, can&apos;t return it.</source>
+        <translation>Gutschein ist nicht gespeichert, kann ihn nicht zurückgeben.</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="932"/>
+        <source>Failed to execute request</source>
+        <translation>Kann Anfrage nicht ausführen.</translation>
+    </message>
+</context>
+<context>
     <name>MWebRequest</name>
     <message>
-        <location filename="webrequest.cpp" line="179"/>
+        <location filename="webrequest.cpp" line="182"/>
         <source>Unable to get server info.</source>
         <translation>Serverdaten können nicht gelesen werden.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="186"/>
+        <location filename="webrequest.cpp" line="189"/>
         <source>Error while parsing server info (line %1 col %2): %3</source>
         <translation>Fehler beim Lesen der Serverdaten (Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="191"/>
+        <location filename="webrequest.cpp" line="194"/>
         <source>Error in server info: missing authentication algorithm info.</source>
         <translation>Fehler in Serverdaten: Authentifikationsalgorithmus fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="196"/>
+        <location filename="webrequest.cpp" line="199"/>
         <source>The server requested an unsupported hash algorithm: %1.</source>
         <translation>Der Server verlangt einen nicht unterstützten Algorithmus (%1). Kann nicht fortsetzen.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="202"/>
+        <location filename="webrequest.cpp" line="205"/>
         <source>Unable to get authentication challenge.</source>
         <translation>Authentifikation fehlgeschlagen (es wurde kein Challenge angeboten).</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="206"/>
+        <location filename="webrequest.cpp" line="209"/>
         <source>Error while parsing session challenge (line %1 col %2): %3</source>
         <translation>Fehler beim Lesen der Authentifikationsdaten (Challenge; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="212"/>
+        <location filename="webrequest.cpp" line="215"/>
         <source>Error in session challenge: missing session ID.</source>
         <translation>Fehler in Authentifikationsdaten (Challenge): Session-ID fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="218"/>
+        <location filename="webrequest.cpp" line="221"/>
         <source>Error in session challenge: missing host challenge.</source>
         <translation>Fehler in Authentifikationsdaten (Challenge): Host-Challenge fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="224"/>
+        <location filename="webrequest.cpp" line="227"/>
         <source>Error in session challenge: missing user challenge.</source>
         <translation>Fehler in Authentifikationsdaten (Challenge): Nutzer-Challenge fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="250"/>
+        <location filename="webrequest.cpp" line="253"/>
         <source>Failed to log in: user/password mismatch, non-allowed host key, or challenge timed out.</source>
         <translation>Authentifikation fehlgeschlagen: Passwort ist falsch, Host ist nicht zugelassen oder Challenge-Timeout.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="254"/>
+        <location filename="webrequest.cpp" line="257"/>
         <source>Unable to authenticate.</source>
         <translation>Authentifikation fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="346"/>
+        <location filename="webrequest.cpp" line="349"/>
         <source>Error parsing EventList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Lesen der XML-Daten (Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="297"/>
+        <location filename="webrequest.cpp" line="300"/>
         <source>Cannot change password, old password does not match!</source>
         <translation>Passwort kann nicht geändert werden: altes Passwort ist falsch.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="370"/>
+        <location filename="webrequest.cpp" line="373"/>
         <source>Error parsing RoomList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Lesen der Daten (RoomList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="394"/>
+        <location filename="webrequest.cpp" line="397"/>
         <source>Error parsing UserList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Lesen der Daten (UserList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="418"/>
+        <location filename="webrequest.cpp" line="421"/>
         <source>Error parsing HostList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Lesen der Daten (HostList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="442"/>
+        <location filename="webrequest.cpp" line="445"/>
         <source>Error parsing CustomerList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Lesen der Daten (CustomerList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="493"/>
+        <location filename="webrequest.cpp" line="538"/>
         <source>Error parsing OrderList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Parsen der XML-Daten (Zeile %1, Spalte %2): %3</translation>
     </message>
+    <message>
+        <location filename="webrequest.cpp" line="494"/>
+        <source>Error parsing ShippingList XML data (line %1 column %2): %3</source>
+        <translation>Fehler beim Lesen der Daten (ShippingList; Zeile %1, Spalte %2): %3</translation>
+    </message>
 </context>
 <context>
     <name>SpecialHost</name>
@@ -2187,265 +2805,345 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
 <context>
     <name>TransactionNames::</name>
     <message>
-        <location filename="../www/machine.php" line="17"/>
+        <location filename="../www/machine.php" line="19"/>
         <source>serverinfo</source>
         <translation>Serverinformationen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="18"/>
+        <location filename="../www/machine.php" line="21"/>
         <source>startsession</source>
         <translation>Session beginnen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="18"/>
+        <location filename="../www/machine.php" line="21"/>
         <source>sessionauth</source>
         <translation>Session authentifizieren</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="18"/>
+        <location filename="../www/machine.php" line="21"/>
         <source>closesession</source>
         <translation>Sessen beenden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="20"/>
+        <location filename="../www/machine.php" line="25"/>
         <source>getmyroles</source>
         <translation>meine Rollen herausfinden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>getusers</source>
         <translation>Nutzer abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>setuserdescription</source>
         <translation>Nutzerkommentar setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>getuseracl</source>
         <translation>Nutzerrechte abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>setuseracl</source>
         <translation>Nutzerrechte setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>getuserhosts</source>
         <translation>erlaubte Hosts eines Nutzers abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>setuserhosts</source>
         <translation>erlaubte Hosts eines Nutzers setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>adduser</source>
         <translation>neue Nutzer anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>deleteuser</source>
         <translation>Nutzer löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>setmypasswd</source>
         <translation>eigenes Passwort ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>setpasswd</source>
         <translation>Passwort eines anderen Nutzers ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>gethosts</source>
         <translation>Hosts abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>sethost</source>
         <translation>Hosts anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>addhost</source>
         <translation>Neue Hosts anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>deletehost</source>
         <translation>Hosts löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>geteventlist</source>
         <translation>Liste der Veranstaltungen abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>geteventdata</source>
         <translation>Veranstaltungsdetails abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>seteventdata</source>
         <translation>Veranstaltungsdetails ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>eventsummary</source>
         <translation>Veranstaltungübersicht</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>cancelevent</source>
         <translation>Veranstaltung abbrechen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
+        <location filename="../www/machine.php" line="36"/>
         <source>getroomdata</source>
         <translation>Raumdaten abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
+        <location filename="../www/machine.php" line="36"/>
         <source>setroomdata</source>
         <translation>Raumdaten setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>getcustomerlist</source>
         <translation>Kunden abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>getcustomer</source>
         <translation>Kunde abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>setcustomer</source>
         <translation>Kunde anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>deletecustomer</source>
         <translation>Nutzer löschen/ersetzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>checkorder</source>
         <translation>Bestellung testen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>createorder</source>
         <translation>Bestellung anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>createsale</source>
         <translation>Verkaufen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>getorderlist</source>
         <translation>Liste der Bestellungen abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>getorder</source>
         <translation>Bestellung: Details abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>orderpay</source>
         <translation>Bestellung bezahlen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>orderrefund</source>
         <translation>Bestellung: Geld zurück geben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>ordershipped</source>
         <translation>Bestellung als verschickt markieren</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>cancelorder</source>
         <translation>Bestellung rückgängig machen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="42"/>
         <source>orderbyticket</source>
         <translation>Bestellung mit Ticket finden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="42"/>
         <source>getordersbyevents</source>
         <translation>Bestellungen finden, die Veranstaltung enthalten</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="42"/>
         <source>setordercomment</source>
         <translation>Bestellkommentar (in angelegter Bestellung) ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>getticket</source>
         <translation>Ticket abrufen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>useticket</source>
         <translation>Ticket entwerten</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>changeticketprice</source>
         <translation>Ticketpreis ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>ticketreturn</source>
         <translation>Ticket zurückgeben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
+        <location filename="../www/machine.php" line="51"/>
         <source>gettemplatelist</source>
         <translation>Vorlagenliste abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
+        <location filename="../www/machine.php" line="51"/>
         <source>gettemplate</source>
         <translation>Vorlage abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
+        <location filename="../www/machine.php" line="51"/>
         <source>settemplate</source>
         <translation>Vorlage erstellen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="33"/>
+        <location filename="../www/machine.php" line="56"/>
         <source>_admin</source>
         <translation>Alle Rechte, Administrator</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
+        <location filename="../www/machine.php" line="57"/>
         <source>_anyshipping</source>
         <translation>Nutzer darf beliebige (auch privilegierte) Versandmethode benutzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
+        <location filename="../www/machine.php" line="58"/>
         <source>_repriceshipping</source>
         <translation>Beliebigen Versandpreis festlegen</translation>
     </message>
+    <message>
+        <location filename="../www/machine.php" line="40"/>
+        <source>createreservedorder</source>
+        <translation>Reservierung anlegen</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="42"/>
+        <source>orderchangeshipping</source>
+        <translation>Versandoption einer Bestellung ändern</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="43"/>
+        <source>reservationtoorder</source>
+        <translation>Reservierung in Bestellung wandeln</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="43"/>
+        <source>reservationtosale</source>
+        <translation>Reservierung in Verkauf wandeln</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="45"/>
+        <source>getshipping</source>
+        <translation>Versandoptionen holen</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="45"/>
+        <source>setshipping</source>
+        <translation>Versandoptionen ändern/anlegen</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="45"/>
+        <source>deleteshipping</source>
+        <translation>Versandoptionen löschen</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>getvoucherprices</source>
+        <translation>Gutscheinpreise abfragen (zB. für Bestellformular)</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>cancelvoucher</source>
+        <translation>Gutschein zurückgeben</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>emptyvoucher</source>
+        <translation>Gutschein ungültig machen</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>usevoucher</source>
+        <translation>Gutschein benutzen (damit bezahlen)</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>getvoucher</source>
+        <translation>Gutschein abfragen</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="51"/>
+        <source>settemplatedescription</source>
+        <translation>Vorlagenbeschreibung ändern/setzen</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="53"/>
+        <source>deletetemplate</source>
+        <translation>Vorlage löschen</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="59"/>
+        <source>_anyvoucher</source>
+        <translation>Gutscheine mit beliebigem Wert anlegen</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="61"/>
+        <source>_anypricevoucher</source>
+        <translation>Gutscheine anlegen bei denen Preis und Wert unterschiedlich sind</translation>
+    </message>
 </context>
 <context>
     <name>initkey</name>
@@ -2518,6 +3216,27 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
     </message>
 </context>
 <context>
+    <name>misc</name>
+    <message>
+        <location filename="misc.cpp" line="35"/>
+        <source>%1.%2</source>
+        <comment>price with decimal dot</comment>
+        <translation>%1,%2</translation>
+    </message>
+    <message>
+        <location filename="misc.cpp" line="41"/>
+        <source>.</source>
+        <comment>decimal dot in price</comment>
+        <translation>,</translation>
+    </message>
+    <message>
+        <location filename="misc.cpp" line="48"/>
+        <source>[0-9]+\.[0-9]{2}</source>
+        <comment>regexp for price</comment>
+        <translation>[0-9]+,[0-9]{2}</translation>
+    </message>
+</context>
+<context>
     <name>php::</name>
     <message>
         <location filename="../www/inc/classes/customer.php" line="259"/>
@@ -2575,77 +3294,77 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
         <translation>Ungültige Veranstaltungsnummer.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="526"/>
+        <location filename="../www/inc/classes/order.php" line="795"/>
         <source>Cannot place order, sorry.</source>
         <translation>Kann Bestellung nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="537"/>
+        <location filename="../www/inc/classes/order.php" line="785"/>
         <source>Cannot place sale, sorry.</source>
         <translation>Kann Verkauf nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="542"/>
+        <location filename="../www/inc/classes/order.php" line="800"/>
         <source>Internal Error: unknown action.</source>
         <translation>Interner Fehler: unbekannte Aktion.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="600"/>
+        <location filename="../www/inc/classes/order.php" line="868"/>
         <source>No such orderID in database.</source>
         <translation>Diese Bestellnummer existiert nicht in der Datenbank.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="611"/>
+        <location filename="../www/inc/classes/order.php" line="879"/>
         <source>Expected 2 arguments.</source>
         <translation>2 Argumente erwartet.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="617"/>
+        <location filename="../www/inc/classes/order.php" line="885"/>
         <source>Invalid Order ID</source>
         <translation>Ungültige Bestellnummer.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="623"/>
+        <location filename="../www/inc/classes/order.php" line="891"/>
         <source>Expected positive amount.</source>
         <translation>Die Anzahl muss eine positive Zahl sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="632"/>
+        <location filename="../www/inc/classes/order.php" line="900"/>
         <source>Order does not exist.</source>
         <translation>Bestellung existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="638"/>
+        <location filename="../www/inc/classes/order.php" line="906"/>
         <source>Order cannot be changed, it is closed.</source>
         <translation>Die Bestellung kann nicht geändert werden, da sie bereits geschlossen ist.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="680"/>
+        <location filename="../www/inc/classes/order.php" line="953"/>
         <source>Order ID must be numeric.</source>
         <translation>Bestellnummer muss numerisch sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="690"/>
+        <location filename="../www/inc/classes/order.php" line="963"/>
         <source>Order ID is invalid.</source>
         <translation>Bestellnummer ist ungültig.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="671"/>
+        <location filename="../www/inc/classes/order.php" line="944"/>
         <source>Wrong state, cannot set order to shipped.</source>
         <translation>Kann Bestellung nicht auf &quot;versandt&quot; setzen: sie ist im falschen Ausgangszustand.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="696"/>
+        <location filename="../www/inc/classes/order.php" line="969"/>
         <source>Wrong state, cannot set order to cancelled.</source>
         <translation>Kann Bestellung nicht auf &quot;abgebrochen&quot; setzen: sie ist im falschen Ausgangszustand.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="707"/>
+        <location filename="../www/inc/classes/order.php" line="980"/>
         <source>Ticket not found.</source>
         <translation>Karte nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="711"/>
+        <location filename="../www/inc/classes/order.php" line="984"/>
         <source>Ticket has no order.</source>
         <translation>Karte hat keine Bestellung.</translation>
     </message>
@@ -2780,44 +3499,116 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
         <translation>Dieses Passwort kann nicht geändert werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="36"/>
+        <location filename="../www/inc/machine/template.php" line="42"/>
         <source>Template File not found in database</source>
         <translation>Vorlage kann nicht gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="47"/>
+        <location filename="../www/inc/machine/template.php" line="83"/>
         <source>Unable to find file name</source>
         <translation>Dateiname kann nicht gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="55"/>
+        <location filename="../www/inc/machine/template.php" line="91"/>
         <source>Illegal File Name</source>
         <translation>Illegaler Dateiname</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
+        <location filename="../www/machine.php" line="68"/>
         <source>Invalid Request, please use the MagicSmoke Client with this page.</source>
         <translation>Interner Fehler: Fehlerhafte Anfrage - bitte einen aktuellen MagicSmoke Client benutzen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="94"/>
+        <location filename="../www/machine.php" line="122"/>
         <source>Invalid or missing sessionid, or session timed out.</source>
         <translation>Die Session kann nicht benutzt werden. Bitte neu anmelden.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="106"/>
+        <location filename="../www/machine.php" line="134"/>
         <source>Session not yet authenticated.</source>
         <translation>Die Session ist noch nicht authentifiziert.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="118"/>
+        <location filename="../www/machine.php" line="146"/>
         <source>You do not have the right to execute this transaction.</source>
         <translation>Sie haben nicht das Recht diese Transaktin durchzuführen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="367"/>
+        <location filename="../www/machine.php" line="467"/>
         <source>Internal Error: unknown command, hiccup in code structure.</source>
         <translation>Interner Fehler: unbekanntes Kommando, Fehler in Code-Struktur. Bitte melden Sie diesen Fehler und wie es dazu kam dem Programmierer.</translation>
     </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="406"/>
+        <source>invalidvalue</source>
+        <comment>voucher state</comment>
+        <translation>Gutscheinwert nicht zulässig</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="412"/>
+        <source>invalidprice</source>
+        <comment>voucher state</comment>
+        <translation>Gutscheinpreis nicht zulässig</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="433"/>
+        <source>Shipping type not available to user.</source>
+        <translation>Diese Versandoption ist privilegierten Nutzern vorbehalten.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="450"/>
+        <source>Illegal shipping type.</source>
+        <translation>Ungültige Versandoption.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="911"/>
+        <source>Order cannot be paid for, it is only a reservation. Order or sell it first!</source>
+        <translation>Dies ist eine Reservierung: kann keine Bezahlung annehmen solange sie nicht bestellt wurde.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1051"/>
+        <source>Unable to update order comment.</source>
+        <translation>Kann Bestellkommentar nicht ändern.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1195"/>
+        <source>Invalid Order.</source>
+        <translation>Ungültige Bestellung.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1091"/>
+        <source>Invalid Shipping Method.</source>
+        <translation>Ungültige Versandoption.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1157"/>
+        <source>Unable to create new shipping method.</source>
+        <translation>Kann neue Versandoption nicht anlegen.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1166"/>
+        <source>Unable to change shipping method.</source>
+        <translation>Kann Versandoption nicht ändern.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1179"/>
+        <source>Expected a numeric shipping ID.</source>
+        <translation>Erwarte numerische Versandoptionsnummer.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1184"/>
+        <source>Unable to delete shipping method.</source>
+        <translation>Kann Versandoption nicht löschen.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1202"/>
+        <source>Cannot change order from reservation.</source>
+        <translation>Kann Reservierung nicht wandeln.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/template.php" line="98"/>
+        <source>Template file does not exist</source>
+        <translation>Vorlage existiert nicht.</translation>
+    </message>
 </context>
 </TS>
diff --git a/src/smoke_de_SAX.ts b/src/smoke_de_SAX.ts
index 95b30ef..c5d3fad 100644
--- a/src/smoke_de_SAX.ts
+++ b/src/smoke_de_SAX.ts
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="de">
+<defaultcodec></defaultcodec>
 <context>
     <name>MCheckDialog</name>
     <message>
@@ -295,132 +296,142 @@
 <context>
     <name>MEventSummary</name>
     <message>
-        <location filename="eventsummary.cpp" line="56"/>
+        <location filename="eventsummary.cpp" line="40"/>
         <source>Summary for Event %1</source>
         <translation>Zusamm&apos;fassung für de Veranschdaldung %1</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="66"/>
+        <location filename="eventsummary.cpp" line="50"/>
         <source>Title:</source>
         <translation>Diddel:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="68"/>
+        <location filename="eventsummary.cpp" line="52"/>
         <source>Artist:</source>
         <translation>Günsdlor:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="54"/>
         <source>Start:</source>
         <translation>Da gehds los:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="237"/>
+        <location filename="eventsummary.cpp" line="221"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>Date+Time format for displaying event start time</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="eventsummary.cpp" line="57"/>
         <source>Capacity:</source>
         <translation>Magsimale Gäsde:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="75"/>
+        <location filename="eventsummary.cpp" line="59"/>
         <source>Tickets currently reserved:</source>
         <translation>Garden die resorvierd sind:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="77"/>
+        <location filename="eventsummary.cpp" line="61"/>
         <source>Tickets currently cancelled:</source>
         <translation>Garden die zurüggegeben wurd&apos;n:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="79"/>
+        <location filename="eventsummary.cpp" line="63"/>
         <source>Tickets currently usable:</source>
         <translation>Garden die genudsd werden gönn&apos;:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="81"/>
+        <location filename="eventsummary.cpp" line="65"/>
         <source>Total Income:</source>
         <translation>Summe dor Einnahm&apos;n:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="285"/>
+        <location filename="eventsummary.cpp" line="269"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Price</source>
         <translation>Breis</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Bought</source>
         <translation>Gegaufd</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Used</source>
         <translation>Benudsd</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Unused</source>
         <translation>Unbenudsd</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="122"/>
+        <location filename="eventsummary.cpp" line="106"/>
         <source>Print</source>
         <translation>Druggn</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="124"/>
+        <location filename="eventsummary.cpp" line="108"/>
         <source>Save as...</source>
         <translation>Schbeichorn undor...</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="127"/>
+        <location filename="eventsummary.cpp" line="111"/>
         <source>Close</source>
         <translation>Zumachn</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="206"/>
+        <location filename="eventsummary.cpp" line="190"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
         <location filename="eventsummary.cpp" line="206"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
-        <translation>Gann de Vorlache (eventsummary.odtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+        <translation type="obsolete">Gann de Vorlache (eventsummary.odtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="62"/>
+        <location filename="eventsummary.cpp" line="46"/>
         <source>Summary</source>
         <translation>Zusamm&apos;fassung</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="87"/>
+        <location filename="eventsummary.cpp" line="71"/>
         <source>Tickets</source>
         <translation>Garden</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="104"/>
+        <location filename="eventsummary.cpp" line="88"/>
         <source>Comments</source>
         <translation>Gommendare</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="110"/>
+        <location filename="eventsummary.cpp" line="94"/>
         <source>Order: </source>
         <translation>Beschdellung:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="112"/>
+        <location filename="eventsummary.cpp" line="96"/>
         <source>Customer: </source>
         <translation>Gunde:</translation>
     </message>
+    <message>
+        <location filename="eventsummary.cpp" line="190"/>
+        <source>Unable to get template file (eventsummary). Giving up.</source>
+        <translation>Gann de Vorlache (eventsummary) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="197"/>
+        <source>Open Document File (*.%1)</source>
+        <translation>ODF Dadai (*.%1)</translation>
+    </message>
 </context>
 <context>
     <name>MKeyGen</name>
@@ -710,55 +721,55 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrder</name>
     <message>
-        <location filename="order.cpp" line="112"/>
+        <location filename="order.cpp" line="122"/>
         <source>placed</source>
         <comment>state</comment>
         <translation>bladsierd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="113"/>
+        <location filename="order.cpp" line="123"/>
         <source>sent</source>
         <comment>state</comment>
         <translation>abgeschiggd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="114"/>
+        <location filename="order.cpp" line="124"/>
         <source>cancelled</source>
         <comment>state</comment>
         <translation>abgebroch&apos;n</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="115"/>
+        <location filename="order.cpp" line="125"/>
         <source>closed</source>
         <comment>state</comment>
         <translation>geschlossn</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="116"/>
+        <location filename="order.cpp" line="127"/>
         <source>check: ok</source>
         <comment>state</comment>
         <translation>Brüfung: is gud so</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="117"/>
+        <location filename="order.cpp" line="128"/>
         <source>check: sale only</source>
         <comment>state</comment>
         <translation>Brüfung: nur zum Vergauf</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="118"/>
+        <location filename="order.cpp" line="129"/>
         <source>check: order only</source>
         <comment>state</comment>
         <translation>Brüfung: nur zur Beschdellung</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="119"/>
+        <location filename="order.cpp" line="130"/>
         <source>check: failed</source>
         <comment>state</comment>
         <translation>Brüfung: gehd ni. Wirschlich ni.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="120"/>
+        <location filename="order.cpp" line="131"/>
         <source>invalid</source>
         <comment>state</comment>
         <translation>ungüldsch</translation>
@@ -767,473 +778,637 @@ At least %1 Bits of random are required.</source>
         <location filename="order.cpp" line="147"/>
         <source>.</source>
         <comment>decimal dot</comment>
-        <translation>,</translation>
+        <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="351"/>
+        <location filename="order.cpp" line="377"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="364"/>
+        <location filename="order.cpp" line="390"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation>d.M.yyyy</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="419"/>
+        <location filename="order.cpp" line="445"/>
         <source>This ticket is not part of this order.</source>
         <translation>De Garde gehörd ni zu dor Beschdellung. Da mussde was vorwegseld ham!</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="453"/>
+        <location filename="order.cpp" line="531"/>
         <source>Error</source>
         <translation>Gans doller falschor Fehler</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="449"/>
+        <location filename="order.cpp" line="527"/>
         <source>The request failed.</source>
         <translation>De Anfrache is schiefgegangen.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="453"/>
+        <location filename="order.cpp" line="531"/>
         <source>A problem occurred during the order: %1</source>
         <translation>Isch hadde nen Broblem mit dor Beschdellung: %1</translation>
     </message>
+    <message>
+        <location filename="order.cpp" line="126"/>
+        <source>reserved</source>
+        <comment>state</comment>
+        <translation>resorvierd</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="454"/>
+        <source>Cannot query DB, don&apos;t know it.</source>
+        <translation>Gann de Dadenbank ni frachn, isch wes im Momend ni so rischdsch wo se iss.</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="466"/>
+        <source>Cannot update shipping: error while sending.</source>
+        <translation>Gann de Versandmedode ni ändorn. &apos;S iss was beim Sendn schiefgegang&apos;.</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="486"/>
+        <source>This voucher is not part of this order.</source>
+        <translation>Das isn&apos; rischdsch hübschor Gudschein, abor der gehörd ni in diese Beschdellung nei!</translation>
+    </message>
+</context>
+<context>
+    <name>MOrderItemView</name>
+    <message>
+        <location filename="orderwin.cpp" line="692"/>
+        <source>Preview Tickets</source>
+        <translation>Garden anguggn.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="701"/>
+        <source>Ticket: </source>
+        <translation>Garde:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="703"/>
+        <source>Voucher: </source>
+        <translation>Gudschein:</translation>
+    </message>
 </context>
 <context>
     <name>MOrderWindow</name>
     <message>
-        <location filename="orderwin.cpp" line="44"/>
+        <location filename="orderwin.cpp" line="45"/>
         <source>Order Details</source>
         <translation>Beschdelldedails</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="49"/>
+        <location filename="orderwin.cpp" line="50"/>
         <source>&amp;Order</source>
         <translation>&amp;Beschdellen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="50"/>
+        <location filename="orderwin.cpp" line="51"/>
         <source>&amp;Order...</source>
         <translation>&amp;Beschdellen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="52"/>
+        <location filename="orderwin.cpp" line="54"/>
         <source>&amp;Sell...</source>
         <translation>&amp;Vorgofen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="56"/>
+        <location filename="orderwin.cpp" line="62"/>
         <source>C&amp;ancel Order...</source>
         <translation>Beschdellung &amp;abbreschn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="68"/>
+        <location filename="orderwin.cpp" line="76"/>
         <source>&amp;Close</source>
         <translation>&amp;Schließen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="69"/>
+        <location filename="orderwin.cpp" line="78"/>
         <source>&amp;Payment</source>
         <translation>Bed&amp;sahlung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="71"/>
+        <location filename="orderwin.cpp" line="80"/>
         <source>Receive &amp;Payment...</source>
         <translation>&amp;Bedsahln...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="73"/>
+        <location filename="orderwin.cpp" line="82"/>
         <source>&amp;Refund...</source>
         <translation>&amp;Zurüggeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="75"/>
+        <location filename="orderwin.cpp" line="85"/>
         <source>P&amp;rinting</source>
         <translation>&amp;Druggn</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="77"/>
+        <location filename="orderwin.cpp" line="87"/>
         <source>Print &amp;Bill...</source>
         <translation>&amp;Reschnung druggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="78"/>
+        <location filename="orderwin.cpp" line="88"/>
         <source>Save Bill &amp;as file...</source>
         <translation>Reschnung als Dadai &amp;schbeichorn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="80"/>
+        <location filename="orderwin.cpp" line="90"/>
         <source>Print &amp;Tickets...</source>
         <translation>&amp;Garden druggn...</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="81"/>
         <source>Print &amp;Current Ticket...</source>
-        <translation>&amp;agduelle Garde druggn...</translation>
+        <translation type="obsolete">&amp;agduelle Garde druggn...</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="82"/>
         <source>&amp;View Tickets...</source>
-        <translation>Gar&amp;den anguggn...</translation>
+        <translation type="obsolete">Gar&amp;den anguggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="93"/>
+        <location filename="orderwin.cpp" line="104"/>
         <source>Order ID:</source>
         <translation>Beschdellnummer:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="95"/>
+        <location filename="orderwin.cpp" line="106"/>
         <source>Order Date:</source>
         <translation>Beschdelldadum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="97"/>
+        <location filename="orderwin.cpp" line="108"/>
         <source>Shipping Date:</source>
         <translation>Versanddadum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="99"/>
+        <location filename="orderwin.cpp" line="110"/>
         <source>Customer:</source>
         <translation>Gunde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="104"/>
+        <location filename="orderwin.cpp" line="115"/>
         <source>Sold by:</source>
         <translation>Vergaufd von:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="106"/>
+        <location filename="orderwin.cpp" line="117"/>
         <source>Total Price:</source>
         <translation>Endvorbraucherbreis:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="108"/>
+        <location filename="orderwin.cpp" line="119"/>
         <source>Already Paid:</source>
         <translation>Schon bedsahld:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="110"/>
+        <location filename="orderwin.cpp" line="121"/>
         <source>Order State:</source>
         <translation>Beschdellschdadus:</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="143"/>
         <source>Ticket ID</source>
-        <translation>Gardennummer</translation>
+        <translation type="obsolete">Gardennummer</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="143"/>
         <source>Event</source>
-        <translation>Veranschdaldung</translation>
+        <translation type="obsolete">Veranschdaldung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="orderwin.cpp" line="162"/>
         <source>Start Time</source>
         <translation>Anfangszeit</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="orderwin.cpp" line="162"/>
         <source>Status</source>
         <translation>Schdadus</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="orderwin.cpp" line="162"/>
         <source>Price</source>
         <translation>Breis</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="58"/>
+        <location filename="orderwin.cpp" line="64"/>
         <source>&amp;Mark Order as Shipped...</source>
         <translation>Beschdellung is weschgeschiggd...</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="61"/>
         <source>Ch&amp;ange Ticket-Price...</source>
-        <translation>Gardenbreis ändorn...</translation>
+        <translation type="obsolete">Gardenbreis ändorn...</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="63"/>
         <source>&amp;Return Ticket...</source>
-        <translation>Garde zurüggeben...</translation>
+        <translation type="obsolete">Garde zurüggeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="454"/>
+        <location filename="orderwin.cpp" line="577"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="210"/>
+        <location filename="orderwin.cpp" line="263"/>
         <source>Unable to get template file (ticket.xtt). Giving up.</source>
         <translation>Gann de Vorlache (ticket.xtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="238"/>
         <source>Unable to get template file (bill.odtt). Giving up.</source>
-        <translation>Gann de Vorlache (bill.xtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+        <translation type="obsolete">Gann de Vorlache (bill.xtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="494"/>
+        <location filename="orderwin.cpp" line="638"/>
         <source>Mark as shipped?</source>
         <translation>Als wechgeschiggd margieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="494"/>
+        <location filename="orderwin.cpp" line="638"/>
         <source>Mark this order as shipped now?</source>
         <translation>Als wechgeschiggd margieren? Also jedsd. Rischdisch weg? Beim Gunden?</translation>
     </message>
     <message>
         <location filename="orderwin.cpp" line="261"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
-        <translation>Gann de Vorlache (eventsummary.odtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+        <translation type="obsolete">Gann de Vorlache (eventsummary.odtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="347"/>
+        <location filename="orderwin.cpp" line="439"/>
         <source>Enter Payment</source>
         <translation>Geldbedrach eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="347"/>
+        <location filename="orderwin.cpp" line="439"/>
         <source>Please enter the amount that has been paid:</source>
         <translation>Bidde den Bedrach eingebn der bedsahld wurde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="354"/>
+        <location filename="orderwin.cpp" line="446"/>
         <source>Unable to submit payment request.</source>
         <translation>Gann de Bedsahlung nisch schbeischorn. De Gommunisdn wolln das Neds vom Geld frei haldn.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="358"/>
+        <location filename="orderwin.cpp" line="450"/>
         <source>Error while trying to pay: %1</source>
         <translation>&apos;S is bleede, abor da war&apos;n Fehlor beim bedsahln: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="406"/>
+        <location filename="orderwin.cpp" line="462"/>
         <source>Enter Refund</source>
         <translation>Rügggabe eingäben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="406"/>
+        <location filename="orderwin.cpp" line="462"/>
         <source>Please enter the amount that will be refunded:</source>
         <translation>Bidde den Bedrach eingebn der zurüggegebn wurde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="377"/>
+        <location filename="orderwin.cpp" line="469"/>
         <source>Unable to submit refund request.</source>
         <translation>Gann de Rügggabe nisch schbeischorn. De Bankengriese hadd uns wiedor.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="381"/>
+        <location filename="orderwin.cpp" line="473"/>
         <source>Error whily trying to refund: %1</source>
         <translation>&apos;S is bleede, abor da war&apos;n Fehlor beim zurüggeben: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="434"/>
+        <location filename="orderwin.cpp" line="534"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation>De Garde gannsch ni zurügnehm. Die wurde schonma benudsd oder so.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="438"/>
+        <location filename="orderwin.cpp" line="538"/>
         <source>Return Ticket</source>
         <translation>Garde zurüggeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="438"/>
+        <location filename="orderwin.cpp" line="538"/>
         <source>Do you really want to return this ticket?</source>
         <translation>Wolln&apos;se de Garde wirschlisch zurüggeben? S&apos;wär schade drum.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="448"/>
+        <location filename="orderwin.cpp" line="571"/>
         <source>Cancel Order?</source>
         <translation>Beschdellung abbreschn?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="448"/>
+        <location filename="orderwin.cpp" line="571"/>
         <source>Cancel this order now?</source>
         <translation>De Beschdellung jedsd wirschlich abbreschn? S&apos;gibd dann kee zurüg mehr - also ni rumheuln!</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="450"/>
+        <location filename="orderwin.cpp" line="573"/>
         <source>Cannot cancel this order: it is in the wrong state.</source>
         <translation>Gann de Beschdellung ni abbreschn: die hadd wie&apos;n bissl &apos;n falschn Schdadus.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="454"/>
+        <location filename="orderwin.cpp" line="577"/>
         <source>Failed to cancel this order.</source>
         <translation>Gann de Beschdellung ni abbreschn.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="101"/>
+        <location filename="orderwin.cpp" line="112"/>
         <source>Delivery Address:</source>
         <translation>Adresse wo&apos;s Zeuch hin soll:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="112"/>
+        <location filename="orderwin.cpp" line="127"/>
         <source>Order Comment:</source>
         <translation>Beschdellgommendar:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="65"/>
+        <location filename="orderwin.cpp" line="71"/>
         <source>Change Commen&amp;t...</source>
         <translation>Gommendar ändorn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="506"/>
+        <location filename="orderwin.cpp" line="650"/>
         <source>Set comment: order %1</source>
         <translation>Gommendar ändorn: Beschdellung %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="517"/>
+        <location filename="orderwin.cpp" line="661"/>
         <source>&amp;Save</source>
         <translation>&amp;Schbeichorn</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="519"/>
+        <location filename="orderwin.cpp" line="663"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Nee lass mal.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="54"/>
+        <location filename="orderwin.cpp" line="59"/>
         <source>&amp;Prune and recheck...</source>
         <translation>Mist wegschmeißn und nochma&apos; scheggn...</translation>
     </message>
+    <message>
+        <location filename="orderwin.cpp" line="57"/>
+        <source>Ma&amp;ke Reservation...</source>
+        <translation>Nu da resorviern wor&apos;s hald ersdma!...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="67"/>
+        <source>Ch&amp;ange Item-Price...</source>
+        <translation>Vom margierden den Breis ändorn...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="69"/>
+        <source>&amp;Return Item...</source>
+        <translation>Das margierde Ding zurüggeben...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="73"/>
+        <source>Change Sh&amp;ipping Method...</source>
+        <translation>Versandmedode ändorn...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="91"/>
+        <source>Print V&amp;ouchers...</source>
+        <translation>Gudscheine Druggn...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="92"/>
+        <source>Print &amp;Current Item...</source>
+        <translation>Margierdes druggen...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="93"/>
+        <source>&amp;View Items...</source>
+        <translation>Alles ma genau anguggn...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="123"/>
+        <source>Shipping Method:</source>
+        <translation>Versandmedode:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="125"/>
+        <source>Shipping Costs:</source>
+        <translation>Versandgosden:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="162"/>
+        <source>Item ID</source>
+        <translation>De Nummor</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="162"/>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="182"/>
+        <source>Voucher (current value: %1)</source>
+        <translation>Gudschein (agduell issor %1 werd)</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="257"/>
+        <source>There are no tickets left to print.</source>
+        <translation>Eivorbübbschd, da ist gehne Garde, die mor druggn gönn&apos;.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="296"/>
+        <source>There are no vouchers left to print.</source>
+        <translation>Eivorbübbschd, da ist gehn Gudschein, den mor druggn gönn&apos;.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="302"/>
+        <source>Unable to get template file (voucher.xtt). Giving up.</source>
+        <translation>Gann de Vorlache (voucher) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="330"/>
+        <source>Unable to get template file (bill). Giving up.</source>
+        <translation>Gann de Vorlache (bill) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="353"/>
+        <source>Unable to get template file (eventsummary). Giving up.</source>
+        <translation>Gann de Vorlache (eventsummary) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="361"/>
+        <source>Open Document File (*.%1)</source>
+        <translation>ODF Dadai (*.%1)</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="500"/>
+        <source>Enter Price</source>
+        <translation>Breis eingäbn</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="500"/>
+        <source>Please enter the new price for the ticket:</source>
+        <translation>Gib ma een Breis ein, und machn hübsch rund:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="507"/>
+        <source>Cannot change this item type.</source>
+        <translation>Die Ard von Ardiggel gansch&apos; ni ändorn.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="555"/>
+        <source>This voucher cannot be returned, it has already been used.</source>
+        <translation>Den Gudschein gannsch ni zurügnehm. Der wurde schonma benudsd, der iss ja schon angebissn.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="559"/>
+        <source>Return Voucher</source>
+        <translation>Gudschein zurüggeben</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="559"/>
+        <source>Do you really want to return this voucher?</source>
+        <translation>Wolln&apos;se den Gudschein wirschlisch zurüggeben? S&apos;wär schade drum.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="566"/>
+        <source>Cannot return this item type.</source>
+        <translation>Die Ard von Ardiggel gansch&apos; ni zurüggnehm. S&apos;duhd mir leid.</translation>
+    </message>
 </context>
 <context>
     <name>MOverview</name>
     <message>
-        <location filename="overview.cpp" line="63"/>
+        <location filename="overview.cpp" line="65"/>
         <source>&amp;Session</source>
         <translation>&amp;Sidsung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="64"/>
+        <location filename="overview.cpp" line="66"/>
         <source>&amp;Re-Login</source>
         <translation>&amp;Noch&apos;ma einloggn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="70"/>
+        <location filename="overview.cpp" line="73"/>
         <source>&amp;Close Session</source>
         <translation>Sidsung &amp;Zumachn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="72"/>
+        <location filename="overview.cpp" line="75"/>
         <source>&amp;Event</source>
         <translation>&amp;Veranschdaldung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="82"/>
+        <location filename="overview.cpp" line="85"/>
         <source>&amp;Customer</source>
         <translation>&amp;Gunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="108"/>
+        <location filename="overview.cpp" line="116"/>
         <source>Events</source>
         <translation>Veranschdaldungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1162"/>
+        <location filename="overview.cpp" line="1283"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="369"/>
+        <location filename="overview.cpp" line="381"/>
         <source>I was unable to renew the login at the server, the error was: %1</source>
         <translation>Isch gann de&apos; Verbindung off&apos;n gross&apos;n Reschner nisch erneuern. Der will nisch weil: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="65"/>
+        <location filename="overview.cpp" line="67"/>
         <source>&amp;Offline mode</source>
         <translation>&amp;Ohne Neds und Dobbelden Boden</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="75"/>
+        <location filename="overview.cpp" line="78"/>
         <source>&amp;New Event...</source>
         <translation>Veranschdaldung &amp;absach&apos;n...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="83"/>
+        <location filename="overview.cpp" line="86"/>
         <source>&amp;Show all customers</source>
         <translation>&amp;Alle Gunden anzeigen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="85"/>
+        <location filename="overview.cpp" line="88"/>
         <source>C&amp;art</source>
         <translation>Eing&amp;aufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="86"/>
+        <location filename="overview.cpp" line="89"/>
         <source>Add &amp;Ticket</source>
         <translation>Ein&amp;driddsgarde hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="87"/>
+        <location filename="overview.cpp" line="90"/>
         <source>Add &amp;Voucher</source>
         <translation>&amp;Gudschein hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="88"/>
+        <location filename="overview.cpp" line="91"/>
         <source>&amp;Remove Item</source>
         <translation>Doch &amp;ni&apos; nehm&apos;</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="89"/>
+        <location filename="overview.cpp" line="92"/>
         <source>&amp;Abort Shopping</source>
         <translation>&amp;Eingauf Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="118"/>
+        <location filename="overview.cpp" line="126"/>
         <source>New Event...</source>
         <translation>Neue Veranschdaldung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="207"/>
+        <location filename="overview.cpp" line="218"/>
         <source>Details...</source>
         <translation>Dedails anzeichen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="125"/>
+        <location filename="overview.cpp" line="133"/>
         <source>Order Ticket...</source>
         <translation>Eindriddsgarde beschdellen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="139"/>
+        <location filename="overview.cpp" line="147"/>
         <source>Shopping Cart</source>
         <translation>Eingaufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="151"/>
+        <location filename="overview.cpp" line="159"/>
         <source>Add Ticket</source>
         <translation>Eindriddsgarde hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="153"/>
+        <location filename="overview.cpp" line="161"/>
         <source>Add Voucher</source>
         <translation>Gudschein hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="156"/>
+        <location filename="overview.cpp" line="163"/>
         <source>Remove Item</source>
         <translation>Doch ni&apos; nehm&apos;</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="162"/>
+        <location filename="overview.cpp" line="169"/>
         <source>Customer:</source>
         <translation>Gunde:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="168"/>
+        <location filename="overview.cpp" line="178"/>
         <source>Delivery Address:</source>
         <translation>Adresse wo&apos;s Zeuch hin soll:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="171"/>
+        <location filename="overview.cpp" line="181"/>
         <source>Comments:</source>
         <translation>Wischdiches Gelaber und Gerede:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="181"/>
+        <location filename="overview.cpp" line="191"/>
         <source>Clear</source>
         <translation>Wechwerfen und von vorne!</translation>
     </message>
@@ -1248,183 +1423,183 @@ At least %1 Bits of random are required.</source>
         <translation>Diddel</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="338"/>
+        <location filename="overview.cpp" line="350"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="73"/>
+        <location filename="overview.cpp" line="76"/>
         <source>&amp;Update Event List</source>
         <translation>&amp;Voranschdaldungsliste nochma holen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="74"/>
+        <location filename="overview.cpp" line="77"/>
         <source>&amp;Show/Edit details...</source>
         <translation>&amp;Dedails anzeichen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="231"/>
+        <location filename="overview.cpp" line="242"/>
         <source>Users</source>
         <translation>Nudsor</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="239"/>
+        <location filename="overview.cpp" line="250"/>
         <source>New User...</source>
         <translation>Neier Nudsor...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="242"/>
+        <location filename="overview.cpp" line="253"/>
         <source>Delete User...</source>
         <translation>Nudsor löschen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="246"/>
+        <location filename="overview.cpp" line="257"/>
         <source>Description...</source>
         <translation>Beschreibung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="249"/>
+        <location filename="overview.cpp" line="260"/>
         <source>Hosts...</source>
         <translation>Reschnor...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="252"/>
+        <location filename="overview.cpp" line="263"/>
         <source>Roles...</source>
         <translation>Rollen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="261"/>
+        <location filename="overview.cpp" line="272"/>
         <source>Hosts</source>
         <translation>Reschnor</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="431"/>
+        <location filename="overview.cpp" line="452"/>
         <source>Login Name</source>
         <translation>Name zum Anmelden</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="431"/>
+        <location filename="overview.cpp" line="452"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="445"/>
+        <location filename="overview.cpp" line="466"/>
         <source>New User</source>
         <translation>Neier Nudsor</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="445"/>
+        <location filename="overview.cpp" line="466"/>
         <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
         <translation>Bidde gib ma nen neien Nudsornam&apos; ein (nur Buchschdaben, Ziffern und &quot;_&quot;):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="864"/>
+        <location filename="overview.cpp" line="978"/>
         <source>Error</source>
         <translation>Gans doller falschor Fehler</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="495"/>
+        <location filename="overview.cpp" line="516"/>
         <source>Edit Description</source>
         <translation>Beschreibung ändorn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="495"/>
+        <location filename="overview.cpp" line="516"/>
         <source>Descriptionof user %1:</source>
         <translation>Beschreibung vom Nudsor %1:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="66"/>
+        <location filename="overview.cpp" line="68"/>
         <source>Change my &amp;Password</source>
         <translation>Mei eechnes &amp;Bassword ändorn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="255"/>
+        <location filename="overview.cpp" line="266"/>
         <source>Set Password...</source>
         <translation>Bassword sedsen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="269"/>
+        <location filename="overview.cpp" line="280"/>
         <source>New Host...</source>
         <translation>Neier Reschnor...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="272"/>
+        <location filename="overview.cpp" line="283"/>
         <source>Add This Host...</source>
         <translation>Die Gisde hier hinzufüchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="275"/>
+        <location filename="overview.cpp" line="286"/>
         <source>Delete Host...</source>
         <translation>Reschnor löschen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="279"/>
+        <location filename="overview.cpp" line="290"/>
         <source>Generate New Key...</source>
         <translation>Neien Schlüssel erzeuchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="282"/>
+        <location filename="overview.cpp" line="293"/>
         <source>Import...</source>
         <translation>Imbordieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="285"/>
+        <location filename="overview.cpp" line="296"/>
         <source>Export...</source>
         <translation>Eggsbordieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="454"/>
+        <location filename="overview.cpp" line="475"/>
         <source>Password</source>
         <translation>Bassword</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="454"/>
+        <location filename="overview.cpp" line="475"/>
         <source>Please enter an initial password for the user:</source>
         <translation>Bidde gib ma een Bassword für den Nudsor ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="469"/>
+        <location filename="overview.cpp" line="490"/>
         <source>Delete User?</source>
         <translation>Nudsor löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="469"/>
+        <location filename="overview.cpp" line="490"/>
         <source>Really delete user &apos;%1&apos;?</source>
         <translation>Nudsor &apos;%1&apos; wirklich löschen? Bissde Dir da och gans sischor?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="538"/>
+        <location filename="overview.cpp" line="559"/>
         <source>Error setting password: %1</source>
         <translation>Gann Bassword ni sedsen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="553"/>
+        <location filename="overview.cpp" line="574"/>
         <source>The password must be non-empty and both lines must match</source>
         <translation>Das Bassword darf nisch leer sein und beide Basswordzeilen müssen gleisch sein.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="569"/>
+        <location filename="overview.cpp" line="590"/>
         <source>Host Name</source>
         <translation>Reschnorname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="569"/>
+        <location filename="overview.cpp" line="590"/>
         <source>Host Key</source>
         <translation>Reschnorschlüssel</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="586"/>
+        <location filename="overview.cpp" line="607"/>
         <source>Create New Host</source>
         <translation>Neien Reschnor anlechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="586"/>
+        <location filename="overview.cpp" line="607"/>
         <source>Please enter a host name:</source>
         <translation>Gib ma nen Nam&apos; für de Gisde ein:</translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="594"/>
+        <location filename="overview.cpp" line="615"/>
         <source>The key of this new host could only be generated with %n bits entropy. Store anyway?</source>
         <translation>
             <numerusform>Dor Schlüssel von der Gisde hat nur %n zufälliges Bid. Das is a bissl wenisch. Drodsdem schbeichorn?</numerusform>
@@ -1432,27 +1607,27 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="617"/>
+        <location filename="overview.cpp" line="638"/>
         <source>Delete this Host?</source>
         <translation>De Gisdge löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="617"/>
+        <location filename="overview.cpp" line="638"/>
         <source>Really delete host &apos;%1&apos;?</source>
         <translation>De Gisde &apos;%1&apos; wirklisch löschen? Bissde da och sischor?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="631"/>
+        <location filename="overview.cpp" line="652"/>
         <source>Change Host Key?</source>
         <translation>Den Schlüssel von dem Reschnor ändorn?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="631"/>
+        <location filename="overview.cpp" line="652"/>
         <source>Really change the key of host &apos;%1&apos;?</source>
         <translation>Wirglich den Schlüssel von dem Reschnor &apos;%1&apos; ändorn? Gans sischor?</translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="636"/>
+        <location filename="overview.cpp" line="657"/>
         <source>The new key of this host could only be generated with %n bits entropy. Store anyway?</source>
         <translation>
             <numerusform>Dor Schlüssel von der Gisde hat nur %n zufälliges Bid. Das is a bissl wenisch. Drodsdem schbeichorn?</numerusform>
@@ -1460,82 +1635,82 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="647"/>
+        <location filename="overview.cpp" line="668"/>
         <source>Import Key from File</source>
         <translation>Schlüssel aus nor Dadai holen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="656"/>
+        <location filename="overview.cpp" line="677"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation>Gann de Dadai %1 nisch lesen. Des iss jedsd geene Ordografieschwäche, sondern: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="668"/>
+        <location filename="overview.cpp" line="689"/>
         <source>This is not a host key file.</source>
         <translation>Das is abor doch gar ge Schlüssel! Willsde misch verarschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="673"/>
+        <location filename="overview.cpp" line="694"/>
         <source>This host key file does not contain a valid host name.</source>
         <translation>De Schlüsseldadai had nen gans seldsamen Reschnornamen da drin. Desdorweschen gannsch die ni nehm.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="678"/>
+        <location filename="overview.cpp" line="699"/>
         <source>This host key file does not contain a valid key.</source>
         <translation>De Dadai is a bissl gabudd. Die mussde nochmal holen, ich gann die so ned lesen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="683"/>
+        <location filename="overview.cpp" line="704"/>
         <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
         <translation>Isch hab da ma nachgereschned. De Scheggsumme vom Schlüssel is falsch. Das gannsch Dir so ni abnehm.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="701"/>
+        <location filename="overview.cpp" line="722"/>
         <source>This host cannot be exported.</source>
         <translation>Den Reschnor gannsch ni schbeichorn.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="706"/>
+        <location filename="overview.cpp" line="727"/>
         <source>Export Key to File</source>
         <translation>Schlüssel als Dadei ablechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="715"/>
+        <location filename="overview.cpp" line="736"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation>Gann de Dadai %1 nicht zum Schreiben offmachen weil: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="178"/>
+        <location filename="overview.cpp" line="188"/>
         <source>Order Items</source>
         <translation>Ne Beschdellung anlegn.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="185"/>
+        <location filename="overview.cpp" line="195"/>
         <source>Order List</source>
         <translation>Beschdelllisde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="189"/>
+        <location filename="overview.cpp" line="199"/>
         <source>-select mode-</source>
         <translation>-wähl ma was aus-</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="190"/>
+        <location filename="overview.cpp" line="200"/>
         <source>All Orders</source>
         <translation>Alle Beschdellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="191"/>
+        <location filename="overview.cpp" line="201"/>
         <source>Open Orders</source>
         <translation>Offene Beschdellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="192"/>
+        <location filename="overview.cpp" line="203"/>
         <source>Outstanding Payments</source>
         <translation>Wo noch ni bezahld is</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="193"/>
+        <location filename="overview.cpp" line="204"/>
         <source>Outstanding Refunds</source>
         <translation>Wo was zurügerschdadded werden muss</translation>
     </message>
@@ -1545,512 +1720,913 @@ At least %1 Bits of random are required.</source>
         <translation>Anzahl</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="771"/>
+        <location filename="overview.cpp" line="781"/>
         <source>Select Event to order Ticket</source>
         <translation>Wähl ma ne Voranschdaldung aus um ne Garde zu beschdelln</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="784"/>
+        <location filename="overview.cpp" line="794"/>
         <source>Select</source>
         <translation>Auswähln</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1043"/>
+        <location filename="overview.cpp" line="1165"/>
         <source>Cancel</source>
         <translation>Ni machen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="820"/>
+        <location filename="overview.cpp" line="912"/>
         <source>There is nothing in the order. Ignoring it.</source>
         <translation>Da is doch gar nischd drin. Isch mach das jedsd ni!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="824"/>
+        <location filename="overview.cpp" line="916"/>
         <source>Please chose a customer first!</source>
         <translation>Du mussd schon nen Gunden auswähln, sonsd wees isch doch ni wer&apos;s griechen soll!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="860"/>
+        <location filename="overview.cpp" line="974"/>
         <source>The request failed.</source>
         <translation>De Anfrache is schiefgegangen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="864"/>
+        <location filename="overview.cpp" line="978"/>
         <source>A problem occurred during the order: %1</source>
         <translation>Isch hadde nen Broblem mit dor Beschdellung: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="223"/>
+        <location filename="overview.cpp" line="234"/>
         <source>Entrance</source>
         <translation>Einlassgondrolle</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="129"/>
+        <location filename="overview.cpp" line="137"/>
         <source>Event Summary...</source>
         <translation>Veranschdaldungszusammenfassung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="194"/>
+        <location filename="overview.cpp" line="205"/>
         <source>Undelivered Orders</source>
         <translation>Beschdellungen die noch ni ausgelieford sind</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="204"/>
+        <location filename="overview.cpp" line="215"/>
         <source>Update</source>
         <translation>Auffrischn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Status</source>
         <translation>Schdadus</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Total</source>
         <translation>Summe</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Paid</source>
         <translation>Bedsahld</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Customer</source>
         <translation>Gunde</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="68"/>
         <source>&amp;Upload Template...</source>
-        <translation>Vorlache hochladn...</translation>
+        <translation type="obsolete">Vorlache hochladn...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="91"/>
+        <location filename="overview.cpp" line="96"/>
         <source>&amp;Misc</source>
         <translation>Vorschiednes</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="92"/>
         <source>&amp;Return ticket...</source>
-        <translation>Garde zurüggeben...</translation>
+        <translation type="obsolete">Garde zurüggeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="133"/>
+        <location filename="overview.cpp" line="141"/>
         <source>Cancel Event...</source>
         <translation>Veranschdaldung absach&apos;n...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="211"/>
+        <location filename="overview.cpp" line="222"/>
         <source>Find by Ticket...</source>
         <translation>Mit Garde finden...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="416"/>
+        <location filename="overview.cpp" line="428"/>
         <source>Cancel Event</source>
         <translation>Veranschdaldung absach&apos;n</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="416"/>
+        <location filename="overview.cpp" line="428"/>
         <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
         <translation>Nu&apos; gib mir ma&apos;n rischdsch guden Grund warum Du de Veranschdaldung &quot;%1&quot; absachn willsd oder lass&apos;es sein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="419"/>
+        <location filename="overview.cpp" line="431"/>
         <source>Event Cancelled</source>
         <translation>Veranschaldung abgesachd</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="419"/>
+        <location filename="overview.cpp" line="431"/>
         <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
         <translation>De Veranschdaldung &quot;%1&quot; wurde abgesacht. Bidde sorsch ma dafür dass och jedor Bescheid wees.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="421"/>
+        <location filename="overview.cpp" line="433"/>
         <source>Unable to cancel event &quot;%1&quot;.</source>
         <translation>Gann de Veranschdaldung &quot;%1&quot; ni absachn.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="912"/>
+        <location filename="overview.cpp" line="1033"/>
         <source>Ticket &quot;%1&quot; Not Valid</source>
         <translation>De Garde &quot;%1&quot; is ni güldsch.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="916"/>
+        <location filename="overview.cpp" line="1037"/>
         <source>Ticket &quot;%1&quot; has already been used</source>
         <translation>De Garde &quot;%1&quot; wurde schonma benudsd.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="920"/>
+        <location filename="overview.cpp" line="1041"/>
         <source>Ticket &quot;%1&quot; has not been bought.</source>
         <translation>De Garde &quot;%1&quot; wurde ni gegauft.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="924"/>
+        <location filename="overview.cpp" line="1045"/>
         <source>Ticket &quot;%1&quot; Ok</source>
         <translation>De Garde &quot;%1&quot; is in Ordnung.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="929"/>
+        <location filename="overview.cpp" line="1050"/>
         <source>Ticket &quot;%1&quot; Ok; the Order has a refund</source>
         <translation>De Garde &quot;%1&quot; is in Ordnung. Dor Gunde griggd sogar noch Geld zurüg.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="934"/>
+        <location filename="overview.cpp" line="1055"/>
         <source>Ticket &quot;%1&quot; is not paid for!</source>
         <translation>De Garde &quot;%1&quot; is abor ni bedsahld!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="937"/>
+        <location filename="overview.cpp" line="1058"/>
         <source>Ticket &quot;%1&quot; cannot be accepted, please check the order!</source>
         <translation>De Garde &quot;%1&quot; gönnmor so abor ni agsebdiern. Schegg ma&apos; de Beschdellung!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1003"/>
+        <location filename="overview.cpp" line="1125"/>
         <source>Enter Ticket</source>
         <translation>Garde eingebn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1003"/>
+        <location filename="overview.cpp" line="1125"/>
         <source>Please enter the ID of one of the tickets of the order you seek:</source>
         <translation>Bidde gib de Gennung von nor Garde ein, die Du suchsd:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1007"/>
+        <location filename="overview.cpp" line="1129"/>
         <source>Unable to query server.</source>
         <translation>Gann den großen Reschnor im Neds ni erreischn. Da sin wo wiedor de Mäuse drin.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1016"/>
+        <location filename="overview.cpp" line="1138"/>
         <source>Server returned an invalid order ID.</source>
         <translation>Dor große Reschnor will misch verarschn: der gibd mir ne falsche Beschdellnummer.</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1125"/>
         <source>Please select a template file.</source>
-        <translation>Wähl ma nen Vorlachennam&apos;n.</translation>
+        <translation type="obsolete">Wähl ma nen Vorlachennam&apos;n.</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1132"/>
         <source>Enter Template Name</source>
-        <translation>Vorlachennam&apos;n eingeben</translation>
+        <translation type="obsolete">Vorlachennam&apos;n eingeben</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1132"/>
         <source>Please enter a name for the template file, it should contain only letters, digits, underscores and dots:</source>
-        <translation>Bidde gib ma nen neien Vorlachnnam&apos; ein (nur Buchschdaben, Ziffern, Bungde und &quot;_&quot;):</translation>
+        <translation type="obsolete">Bidde gib ma nen neien Vorlachnnam&apos; ein (nur Buchschdaben, Ziffern, Bungde und &quot;_&quot;):</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1135"/>
         <source>The template name must only contain letters, digits, underscores and dots.</source>
-        <translation>Nee. So ned. Du darfsd nur Buchschdaben, Zifforn, Bungde und &quot;_&quot; verwenden. Umlaude sind och nisch gud. Und es muss mid nem Buchschdaben anfangen. Is a bissl gomblizierd, aber Du schaffsd das schon!</translation>
+        <translation type="obsolete">Nee. So ned. Du darfsd nur Buchschdaben, Zifforn, Bungde und &quot;_&quot; verwenden. Umlaude sind och nisch gud. Und es muss mid nem Buchschdaben anfangen. Is a bissl gomblizierd, aber Du schaffsd das schon!</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1139"/>
         <source>Success</source>
-        <translation>Heuregah! Erfolsch!</translation>
+        <translation type="obsolete">Heuregah! Erfolsch!</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1139"/>
         <source>Successfully uploaded the template.</source>
-        <translation>Isch graduliere! Dank unermüdlischer Arbeid im Gollegdief hammor de Vorlache erfolgreisch hochgeladn!</translation>
+        <translation type="obsolete">Isch graduliere! Dank unermüdlischer Arbeid im Gollegdief hammor de Vorlache erfolgreisch hochgeladn!</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="1141"/>
         <source>Unable to upload the template.</source>
-        <translation>Gann de Vorlache ni hochladn. S&apos; lieschd vielleischd am Weddor.</translation>
+        <translation type="obsolete">Gann de Vorlache ni hochladn. S&apos; lieschd vielleischd am Weddor.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1148"/>
+        <location filename="overview.cpp" line="1248"/>
         <source>Return Ticket</source>
         <translation>Garde zurüggeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1148"/>
+        <location filename="overview.cpp" line="1248"/>
         <source>Please enter the ticket ID to return:</source>
         <translation>Bitte die Gennung von dor Garde eingeben die Se&apos; zurüggeben wolln:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1152"/>
+        <location filename="overview.cpp" line="1252"/>
         <source>This is not a valid ticket.</source>
         <translation>Das is abor gehne güldsche Garde!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1157"/>
+        <location filename="overview.cpp" line="1257"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation>De Garde gannsch ni zurügnehm. Die wurde schonma benudsd oder so.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="97"/>
+        <location filename="overview.cpp" line="105"/>
         <source>&amp;Admin</source>
         <translation>&amp;Adminischdradsion</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="99"/>
+        <location filename="overview.cpp" line="107"/>
         <source>&amp;Schedule Backup...</source>
         <translation>&amp;Zeit für Sischerungsgobie fesdlechn...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="100"/>
+        <location filename="overview.cpp" line="108"/>
         <source>&amp;Backup now...</source>
         <translation>Jedsd &amp;Sischorungsgobie anleschn...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="101"/>
+        <location filename="overview.cpp" line="109"/>
         <source>&amp;Restore...</source>
         <translation>&amp;Wiedorherschdelln...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="196"/>
+        <location filename="overview.cpp" line="207"/>
         <source>-search result-</source>
         <translation>-Suchräsuldahd-</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="214"/>
+        <location filename="overview.cpp" line="225"/>
         <source>Find by Event...</source>
         <translation>Nach Veranschdaldung suchn...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="217"/>
+        <location filename="overview.cpp" line="228"/>
         <source>Find by Customer...</source>
         <translation>Nach Gunde suchn...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="450"/>
+        <location filename="overview.cpp" line="471"/>
         <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
         <translation>Nee. So ned. Du darfsd nur Buchschdaben, Zifforn, Bungde und &quot;_&quot; verwenden. Umlaude sind och nisch gud. Und es muss mid nem Buchschdaben anfangen. Is a bissl gomblizierd, aber Du schaffsd das schon!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1029"/>
+        <location filename="overview.cpp" line="1151"/>
         <source>Select Event</source>
         <translation>Veranschdaldung auswähln</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1041"/>
+        <location filename="overview.cpp" line="1163"/>
         <source>Ok</source>
         <translation>Is gud so.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Capacity</source>
         <translation>Magsimale Gäsde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Sold</source>
         <translation>Vergaufd</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Reserved</source>
         <translation>Resorvierd</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Free</source>
         <translation>Frei</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="473"/>
+        <location filename="overview.cpp" line="494"/>
         <source>(Nobody)</source>
         <comment>this is a username for no user, the string must contain &apos;(&apos; to distinguish it from the others</comment>
         <translation>(Gar Geener)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="476"/>
+        <location filename="overview.cpp" line="497"/>
         <source>Delete User</source>
         <translation>Nudsor Löschn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="476"/>
+        <location filename="overview.cpp" line="497"/>
         <source>Select which user will inherit this users database objects:</source>
         <translation>Such ma raus wer de Beschdellung&apos;n und so von dem Nudsor erbd:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="481"/>
+        <location filename="overview.cpp" line="502"/>
         <source>Cannot delete user: %1</source>
         <translation>Gann den Nudsor ni löschn: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="77"/>
+        <location filename="overview.cpp" line="80"/>
         <source>Show &amp;old Events</source>
         <translation>Aldes Zeuch zeichen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="94"/>
+        <location filename="overview.cpp" line="102"/>
         <source>C&amp;onfigure</source>
         <translation>Gonfiguriern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="95"/>
+        <location filename="overview.cpp" line="103"/>
         <source>&amp;Auto-Refresh settings...</source>
         <translation>Schdändisch-Nachgugg-Einschdellungen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1183"/>
+        <location filename="overview.cpp" line="1306"/>
         <source>Refresh Settings</source>
         <translation>Schdändisch-Nachgugg-Einschdellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1188"/>
+        <location filename="overview.cpp" line="1311"/>
         <source>Refresh Rate (minutes):</source>
         <translation>Nachguggfregwens (Minuden)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1194"/>
+        <location filename="overview.cpp" line="1317"/>
         <source>refresh &amp;event list</source>
         <translation>Veranschdaldungslisde nachguggn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1196"/>
+        <location filename="overview.cpp" line="1319"/>
         <source>refresh &amp;user list</source>
         <translation>Nudsorlisde nachguggn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1198"/>
+        <location filename="overview.cpp" line="1321"/>
         <source>refresh &amp;host list</source>
         <translation>Reschnorlisde nachguggn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1205"/>
+        <location filename="overview.cpp" line="1330"/>
         <source>&amp;OK</source>
         <translation>Nu &amp;glar! Nehm&apos;sch.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1207"/>
+        <location filename="overview.cpp" line="1332"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Nee lass mal.</translation>
     </message>
+    <message>
+        <location filename="overview.cpp" line="70"/>
+        <source>&amp;Edit Templates...</source>
+        <translation>Vorlachen bearbeeden...</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="71"/>
+        <source>&amp;Update Templates Now</source>
+        <translation>Jedsd soford nochmal nachguggen was es neues gibd</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="94"/>
+        <source>&amp;Update Shipping Options</source>
+        <translation>Jedsd soford Versandmedoden nachguggn</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="97"/>
+        <source>Return &amp;ticket...</source>
+        <translation>Eindriddsgarde zurüggeben...</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="98"/>
+        <source>Return &amp;voucher...</source>
+        <translation>Gudschein zurüggeben...</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="100"/>
+        <source>Edit &amp;Shipping Options...</source>
+        <translation>Versandmedoden bearbeeden...</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="175"/>
+        <source>Shipping Method:</source>
+        <translation>Versandmedode:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="202"/>
+        <source>Open Reservations</source>
+        <translation>Offene Resorvierungen</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="440"/>
+        <source>(No Shipping)</source>
+        <translation>(gar gee Vorsand)</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="844"/>
+        <source>Select Voucher</source>
+        <translation>Gudschein auswähln</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="855"/>
+        <source>Select voucher price and value:</source>
+        <translation>Beschdimm mal &apos;n Gudscheinpreis und -werd:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="856"/>
+        <source>Price:</source>
+        <translation>Breis:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="862"/>
+        <source>Value:</source>
+        <translation>Werd:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="894"/>
+        <source>Voucher (price: %1, value %2)</source>
+        <translation>Gudschein (gosded %1 und iss noch %2 werd)</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1269"/>
+        <source>Return Voucher</source>
+        <translation>Gudschein zurüggeben</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1269"/>
+        <source>Please enter the voucher ID to return:</source>
+        <translation>Bidde gib ma de Nummor von dem Gudschein ein, den De zurüggeben willsd:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1273"/>
+        <source>This is not a valid voucher.</source>
+        <translation>Das is abor gee güldschor Gudschein. So ni!</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1278"/>
+        <source>This voucher cannot be returned, it has already been used.</source>
+        <translation>Den Gudschein gannsch ni zurügnehm. Der wurde schonma benudsd, der iss ja schon angebissn.</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1323"/>
+        <source>refresh &amp;shipping list</source>
+        <translation>Versandmedoden offfrischen</translation>
+    </message>
 </context>
 <context>
     <name>MPasswordChange</name>
     <message>
-        <location filename="overview.cpp" line="1228"/>
+        <location filename="overview.cpp" line="1354"/>
         <source>Change my password</source>
         <translation>Mei eechnes Bassword ändorn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1234"/>
+        <location filename="overview.cpp" line="1360"/>
         <source>Old Password:</source>
         <translation>Aldes Bassword:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1238"/>
+        <location filename="overview.cpp" line="1364"/>
         <source>New Password:</source>
         <translation>Neies Bassword:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1241"/>
+        <location filename="overview.cpp" line="1367"/>
         <source>Repeat Password:</source>
         <translation>Nochma neies Bassword:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1249"/>
+        <location filename="overview.cpp" line="1375"/>
         <source>Set Password</source>
         <translation>Bassword sedsen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1251"/>
+        <location filename="overview.cpp" line="1377"/>
         <source>Cancel</source>
         <translation>Vorgisses, ni sedsen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1230"/>
+        <location filename="overview.cpp" line="1356"/>
         <source>Reset password of user &quot;%1&quot;</source>
         <translation>Bassword von Nudsor &quot;%1&quot; zurügsedsen</translation>
     </message>
 </context>
 <context>
+    <name>MShipping</name>
+    <message>
+        <location filename="shipping.cpp" line="75"/>
+        <source>.</source>
+        <comment>decimal dot</comment>
+        <translation>,</translation>
+    </message>
+</context>
+<context>
+    <name>MShippingChange</name>
+    <message>
+        <location filename="orderwin.cpp" line="746"/>
+        <source>Change Shipping Method</source>
+        <translation>Versandmedode ändorn</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="753"/>
+        <source>Method:</source>
+        <translation>Medode:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="755"/>
+        <source>Price:</source>
+        <translation>Breis:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="763"/>
+        <source>Ok</source>
+        <translation>Is gud so.</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="765"/>
+        <source>Cancel</source>
+        <translation>Abbreschen</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="773"/>
+        <source>(None)</source>
+        <comment>shipping method</comment>
+        <translation>(Gar Geene)</translation>
+    </message>
+</context>
+<context>
+    <name>MShippingEditor</name>
+    <message>
+        <location filename="shipping.cpp" line="130"/>
+        <source>Edit Shipping Options</source>
+        <translation>Versandmedoden bearbeeden</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="142"/>
+        <source>Change Description</source>
+        <translation>Beschreibung ändorn</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="144"/>
+        <source>Change Price</source>
+        <translation>Breis ändorn</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="146"/>
+        <source>Change Availability</source>
+        <translation>Vorfügborgeed ändorn</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="149"/>
+        <source>Add Option</source>
+        <translation>Medode hinzufüschn</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="151"/>
+        <source>Delete Option</source>
+        <translation>Medode löschn</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="158"/>
+        <source>Ok</source>
+        <translation>Is gud so.</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="160"/>
+        <source>Cancel</source>
+        <translation>Doch ni&apos; machen</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>ID</source>
+        <translation>Nummor</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>Price</source>
+        <translation>Breis</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>Web</source>
+        <translation>Web</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>Any User</source>
+        <translation>Jedor</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="174"/>
+        <source>Yes</source>
+        <translation>Nu!</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="174"/>
+        <source>No</source>
+        <translation>Nee!</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="248"/>
+        <source>Shipping Option Description</source>
+        <translation>Versandmedodenbeschreibung</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="188"/>
+        <source>Please select a new description for this shipping option:</source>
+        <translation>Und nu&apos; gib ma ne neue Beschreibung für de Versandmedode ein und wenn&apos;de ferdsch bist drüggsde de &quot;Endor&quot;-Dasde:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="286"/>
+        <source>Warning</source>
+        <translation>Dumm gelaufen</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="238"/>
+        <source>Could not store the changes.</source>
+        <translation>Gann de Ändorung ni schbeichorn. S&apos; muss was schiefgelofen sein.</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="251"/>
+        <source>Shipping Option Price</source>
+        <translation>Versandmedodenbreis</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="209"/>
+        <source>Please select a new price for this shipping option:</source>
+        <translation>Gib&apos; doch och ma ein was&apos;de Dir vorschdellsd dass de Versandmedode gosden soll:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>None</source>
+        <translation>Nur de ganz brivilischierden</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>Web Interface</source>
+        <translation>och de Nudsor vom Web-Indorfähs</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>Any User + Web Interface</source>
+        <translation>Wirschlich jedor.</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="255"/>
+        <source>Shipping Option Availability</source>
+        <translation>Versandmedodenverfüschbargeed</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="232"/>
+        <source>Please select a new availability for this shipping option:</source>
+        <translation>Sach&apos; mir ma gans genau wer alles die Medode verwenden darf:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="248"/>
+        <source>Please select a new description for this new shipping option:</source>
+        <translation>Und nu&apos; gib ma ne neue Beschreibung für de Versandmedode ein und wenn&apos;de ferdsch bist drüggsde de &quot;Endor&quot;-Dasde:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="251"/>
+        <source>Please select a new price for this new shipping option:</source>
+        <translation>Gib&apos; doch och ma ein was&apos;de Dir vorschdellsd dass de Versandmedode gosden soll:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="255"/>
+        <source>Please select a new availability for this new shipping option:</source>
+        <translation>Sach&apos; mir ma gans genau wer alles die Medode verwenden darf:</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="266"/>
+        <source>Could not create the new option.</source>
+        <translation>Gonnde de neue Versandmedode ni anleschn. S&apos; iss schade abor wahr.</translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="286"/>
+        <source>Unable to delete this option.</source>
+        <translation>Gann de Medode ni löschen.</translation>
+    </message>
+</context>
+<context>
+    <name>MTemplateChoice</name>
+    <message>
+        <location filename="templatedlg.cpp" line="29"/>
+        <source>Chose Template</source>
+        <translation>Vorlache auswähln</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="32"/>
+        <source>Please chose a variant of template %s:</source>
+        <translation>Such Dir ma&apos; ne Variande von dor Vorlache %1 raus:</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="41"/>
+        <source>(default)</source>
+        <comment>default template pseudo-variant</comment>
+        <translation>(Schdandard)</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="50"/>
+        <source>Ok</source>
+        <translation>Is gud so.</translation>
+    </message>
+</context>
+<context>
+    <name>MTemplateEditor</name>
+    <message>
+        <location filename="templatedlg.cpp" line="72"/>
+        <source>Edit Template Directory</source>
+        <translation>Vorlachenverzeischnis bearbeeden</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="84"/>
+        <source>Update Now</source>
+        <translation>Jedsd neu holn</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="86"/>
+        <source>Add Variant</source>
+        <translation>Variande hinzufüschn</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="88"/>
+        <source>Delete Variant</source>
+        <translation>Variante löschn</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="95"/>
+        <source>Close</source>
+        <translation>Zumachn</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="110"/>
+        <source>Template/Variant</source>
+        <translation>Vorlache/Variande</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="110"/>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="110"/>
+        <source>Checksum</source>
+        <translation>Scheggsumme</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="221"/>
+        <source>Warning</source>
+        <translation>Dumm gelaufen</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="167"/>
+        <source>Unable to delete this template.</source>
+        <translation>Gann de Vorlache ni löschn. Da gann mor nüschd machn.</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="180"/>
+        <source>Select Template File</source>
+        <translation>Vorlachendadei auswähln</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="185"/>
+        <source>Files with this extension (%1) are not legal for this template.</source>
+        <translation>Gugge ma: Dadein mir dor Erweederung %1 sind hier nisch erloobd. Und Du Droddel mussd genau so eene nehm!</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="204"/>
+        <source>Unable to upload file.</source>
+        <translation>Gann de Dadei nisch hochladn.</translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="221"/>
+        <source>Unable to send new description to server.</source>
+        <translation>Isch gann und gann den Sörvor nisch überzeuschn dass Deine Beschreibung besser iss. S&apos; iss hald n&apos; aldor Esel!</translation>
+    </message>
+</context>
+<context>
+    <name>MTemplateStore</name>
+    <message>
+        <location filename="templates.cpp" line="105"/>
+        <source>Retrieving templates from server.</source>
+        <translation>Hole Vorlachn vom Sörvor. S&apos; gann ä bissl dauern.</translation>
+    </message>
+</context>
+<context>
     <name>MTicket</name>
     <message>
-        <location filename="order.cpp" line="617"/>
+        <location filename="order.cpp" line="722"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="652"/>
+        <location filename="order.cpp" line="757"/>
         <source>bought</source>
         <comment>ticket state</comment>
         <translation>gegaufd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="653"/>
+        <location filename="order.cpp" line="758"/>
         <source>to refund</source>
         <comment>ticket state</comment>
         <translation>zurügzugebn</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="654"/>
+        <location filename="order.cpp" line="759"/>
         <source>used</source>
         <comment>ticket state</comment>
         <translation>benudsd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="655"/>
+        <location filename="order.cpp" line="760"/>
         <source>reserved</source>
         <comment>ticket state</comment>
         <translation>resorvierd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="656"/>
+        <location filename="order.cpp" line="761"/>
         <source>ok</source>
         <comment>ticket state</comment>
         <translation>nudsbar</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="657"/>
+        <location filename="order.cpp" line="762"/>
         <source>sale only</source>
         <comment>ticket state</comment>
         <translation>nur vergaufen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="658"/>
+        <location filename="order.cpp" line="763"/>
         <source>order only</source>
         <comment>ticket state</comment>
         <translation>nur beschdelln</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="659"/>
+        <location filename="order.cpp" line="764"/>
         <source>too late: event over</source>
         <comment>ticket state</comment>
         <translation>zu schbäd: de Veranschdaldung is schon vorbei</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="660"/>
+        <location filename="order.cpp" line="765"/>
         <source>no more tickets</source>
         <comment>ticket state</comment>
         <translation>geene Garden mehr übrisch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="661"/>
+        <location filename="order.cpp" line="766"/>
         <source>event cancelled</source>
         <comment>ticket state</comment>
         <translation>Veranschdaldung abgesachd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="662"/>
+        <location filename="order.cpp" line="767"/>
         <source>no such event</source>
         <comment>ticket state</comment>
         <translation>de Veranschdaldung egsisdierd nisch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="663"/>
+        <location filename="order.cpp" line="768"/>
         <source>invalid</source>
         <comment>ticket state</comment>
         <translation>ungüldsch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="682"/>
+        <location filename="order.cpp" line="787"/>
         <source>Cannot execute request.</source>
         <translation>Gann de Anfrache nisch ausführn. S&apos; is manschma gomisch.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="709"/>
+        <location filename="order.cpp" line="814"/>
         <source>Ticket is not stored, can&apos;t return it.</source>
         <translation>De Garde is ni geschbeichord, also gannsch se och ni zurüggeben.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="711"/>
+        <location filename="order.cpp" line="816"/>
         <source>Failed to execute request</source>
         <translation>Gann de Anfrache nisch ausführn. S&apos; is manschma gomisch.</translation>
     </message>
@@ -2060,7 +2636,7 @@ At least %1 Bits of random are required.</source>
     <message>
         <location filename="orderwin.cpp" line="534"/>
         <source>Preview Tickets</source>
-        <translation>Garden anguggn.</translation>
+        <translation type="obsolete">Garden anguggn.</translation>
     </message>
 </context>
 <context>
@@ -2072,97 +2648,140 @@ At least %1 Bits of random are required.</source>
     </message>
 </context>
 <context>
+    <name>MVoucher</name>
+    <message>
+        <location filename="order.cpp" line="908"/>
+        <source>invalid</source>
+        <translation>ungüldsch</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="910"/>
+        <source>cancelled</source>
+        <translation>abgebroch&apos;n</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="911"/>
+        <source>empty</source>
+        <translation>leer, dodal leer</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="912"/>
+        <source>used</source>
+        <translation>benudsd</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="913"/>
+        <source>unused</source>
+        <translation>gans frisch</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="930"/>
+        <source>Voucher is not stored, can&apos;t return it.</source>
+        <translation>Dor Gudschein is doch gar ni geschbeichord, da gannsch&apos; den ooch ni löschn.</translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="932"/>
+        <source>Failed to execute request</source>
+        <translation>Gann de Anfrache nisch ausführn. S&apos; is manschma gomisch.</translation>
+    </message>
+</context>
+<context>
     <name>MWebRequest</name>
     <message>
-        <location filename="webrequest.cpp" line="179"/>
+        <location filename="webrequest.cpp" line="182"/>
         <source>Unable to get server info.</source>
         <translation>Dor grosse Reschner will mir nischd über sisch sach&apos;n. Dummer Hund der.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="186"/>
+        <location filename="webrequest.cpp" line="189"/>
         <source>Error while parsing server info (line %1 col %2): %3</source>
         <translation>Isch gann den gross&apos;n Reschner nich verschdehn. Dor Fählor &quot;%3&quot; bassierd auf dor Dseile %1, Schbalde %2.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="191"/>
+        <location filename="webrequest.cpp" line="194"/>
         <source>Error in server info: missing authentication algorithm info.</source>
         <translation>Dor grosse Reschnor will mir nedd sach&apos;n wie mor offn&apos; droff gommd. Missd.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="196"/>
+        <location filename="webrequest.cpp" line="199"/>
         <source>The server requested an unsupported hash algorithm: %1.</source>
         <translation>Dor grosse Reschnor will &apos;ne Bereschnung von mir, die isch nedd gann: %1.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="202"/>
+        <location filename="webrequest.cpp" line="205"/>
         <source>Unable to get authentication challenge.</source>
         <translation>Dor grosse Reschnor reded nedd mit mir. Isch grich gehn &quot;Schällänsch&quot;.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="206"/>
+        <location filename="webrequest.cpp" line="209"/>
         <source>Error while parsing session challenge (line %1 col %2): %3</source>
         <translation>Isch gann den gross&apos;n Reschner nich verschdehn. Dor Fählor &quot;%3&quot; bassierd auf dor Dseile %1, Schbalde %2.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="212"/>
+        <location filename="webrequest.cpp" line="215"/>
         <source>Error in session challenge: missing session ID.</source>
         <translation>Fählor im &quot;Schällänsch&quot;: der had gehne &quot;Säschn-Ei-Dih&quot;.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="218"/>
+        <location filename="webrequest.cpp" line="221"/>
         <source>Error in session challenge: missing host challenge.</source>
         <translation>Fählor im &quot;Schällänsch&quot;: der had nischd fürn Gombjuder.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="224"/>
+        <location filename="webrequest.cpp" line="227"/>
         <source>Error in session challenge: missing user challenge.</source>
         <translation>Fählor im &quot;Schällänsch&quot;: der had nischd fürn Nudsor.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="250"/>
+        <location filename="webrequest.cpp" line="253"/>
         <source>Failed to log in: user/password mismatch, non-allowed host key, or challenge timed out.</source>
         <translation>Isch gann nisch offn&apos; grossen Reschnor. Das hadd zu lange gedauerd oder Du hasd&apos;sch vordibbd.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="254"/>
+        <location filename="webrequest.cpp" line="257"/>
         <source>Unable to authenticate.</source>
         <translation>Isch gann misch ned anmälden.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="346"/>
+        <location filename="webrequest.cpp" line="349"/>
         <source>Error parsing EventList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor EventList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="297"/>
+        <location filename="webrequest.cpp" line="300"/>
         <source>Cannot change password, old password does not match!</source>
         <translation>Gann Bassword ni&apos; ändorn, das alde war falsch!</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="370"/>
+        <location filename="webrequest.cpp" line="373"/>
         <source>Error parsing RoomList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor RoomList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="394"/>
+        <location filename="webrequest.cpp" line="397"/>
         <source>Error parsing UserList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor UserList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="418"/>
+        <location filename="webrequest.cpp" line="421"/>
         <source>Error parsing HostList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor HostList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="442"/>
+        <location filename="webrequest.cpp" line="445"/>
         <source>Error parsing CustomerList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor CustomerList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="493"/>
+        <location filename="webrequest.cpp" line="538"/>
         <source>Error parsing OrderList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor OrderList ni verschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
+    <message>
+        <location filename="webrequest.cpp" line="494"/>
+        <source>Error parsing ShippingList XML data (line %1 column %2): %3</source>
+        <translation>Isch gann des XML von dor ShippingList ni vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
+    </message>
 </context>
 <context>
     <name>SpecialHost</name>
@@ -2185,265 +2804,345 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>TransactionNames::</name>
     <message>
-        <location filename="../www/machine.php" line="17"/>
+        <location filename="../www/machine.php" line="19"/>
         <source>serverinfo</source>
         <translation>Informadschjon&apos; übern Sörvor.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="18"/>
+        <location filename="../www/machine.php" line="21"/>
         <source>startsession</source>
         <translation>&apos;Ne Seschon anfang&apos;</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="18"/>
+        <location filename="../www/machine.php" line="21"/>
         <source>sessionauth</source>
         <translation>Am Sörvor anmeld&apos;n</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="18"/>
+        <location filename="../www/machine.php" line="21"/>
         <source>closesession</source>
         <translation>Dsum Sörvor gude Nachd sachn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="20"/>
+        <location filename="../www/machine.php" line="25"/>
         <source>getmyroles</source>
         <translation>Rausfinden was isch machn darf</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>getusers</source>
         <translation>Guggn welche Nudsor es gibd</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>setuserdescription</source>
         <translation>Nen bleeden Gommendar über jemand andres machn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>getuseracl</source>
         <translation>Rausfinden was een andror darf</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>setuseracl</source>
         <translation>Dem Andorn was vorbiedn dürfen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>getuserhosts</source>
         <translation>Rausfinden von wo ä Nudsor arbäden darf</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>setuserhosts</source>
         <translation>Fesdleechn von wo ä Nudsor arbäden darf</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>adduser</source>
         <translation>&apos;Nen neuen Nudsor anlechen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>deleteuser</source>
         <translation>&apos;Nen Nudsor löschen. Eefach so.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>setmypasswd</source>
         <translation>Des eechne Bassword ändorn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>setpasswd</source>
         <translation>Des Bassword von jemand gans andors ändorn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>gethosts</source>
         <translation>Rausfinden von wo mor alles arbäden gönnde.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>sethost</source>
         <translation>&apos;Ne Arbedsschdelle ändorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>addhost</source>
         <translation>&apos;Ne neue Arbedsschdelle einrischdn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>deletehost</source>
         <translation>&apos;Ne Arbedsschdelle dichd machn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>geteventlist</source>
         <translation>Lisde dor Veranschdaldungen holen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>geteventdata</source>
         <translation>Dedails zu eener Veranschdaldung holen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>seteventdata</source>
         <translation>Dedails zu eener Veranschdaldung ändorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>eventsummary</source>
         <translation>Veranschdaltungsdsusamm&apos;nfassung holen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>cancelevent</source>
         <translation>Veranschdaldung absach&apos;n</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
+        <location filename="../www/machine.php" line="36"/>
         <source>getroomdata</source>
         <translation>Räumlischgeden anzeichen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
+        <location filename="../www/machine.php" line="36"/>
         <source>setroomdata</source>
         <translation>Räumlischgeden ändorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>getcustomerlist</source>
         <translation>Lisde dor Gunden anguggn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>getcustomer</source>
         <translation>Gunde abfrachen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>setcustomer</source>
         <translation>Gunde anlechen oder ändorn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>deletecustomer</source>
         <translation>Gunde löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>checkorder</source>
         <translation>Ma guggn ob ne Beschdellung gehen würde.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>createorder</source>
         <translation>Ne Beschdellung anlegn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>createsale</source>
         <translation>Was vorkofen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>getorderlist</source>
         <translation>Beschdellungslisde holen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>getorder</source>
         <translation>Beschdellung anguggn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>orderpay</source>
         <translation>Beschdellung bezahl&apos;n</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>orderrefund</source>
         <translation>Geld zurüggeben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>ordershipped</source>
         <translation>Beschdellung wegschiggn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>cancelorder</source>
         <translation>Beschdellung abbrech&apos;n</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="42"/>
         <source>orderbyticket</source>
         <translation>gans dief ins Arschief guggn und &apos;ne Beschdellung nur mit nor Garte finden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="42"/>
         <source>getordersbyevents</source>
         <translation>de Beschdellungen zu nor Veranschdaldung finden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="42"/>
         <source>setordercomment</source>
         <translation>Dummen Schbruch in dor Beschdellung ändorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>getticket</source>
         <translation>Garde anguggn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>useticket</source>
         <translation>Garde benudsen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>changeticketprice</source>
         <translation>Gardenbreis ändorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>ticketreturn</source>
         <translation>Garde zurüggeben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
+        <location filename="../www/machine.php" line="51"/>
         <source>gettemplatelist</source>
         <translation>Vorlachenlisde anguggen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
+        <location filename="../www/machine.php" line="51"/>
         <source>gettemplate</source>
         <translation>Vorlache runderladen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
+        <location filename="../www/machine.php" line="51"/>
         <source>settemplate</source>
         <translation>Vorlache erschdellen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="33"/>
+        <location filename="../www/machine.php" line="56"/>
         <source>_admin</source>
         <translation>Godd. Darf alles, gann alles, wees alles bessor.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
+        <location filename="../www/machine.php" line="57"/>
         <source>_anyshipping</source>
         <translation>alle wechschigarden benudsen derfen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
+        <location filename="../www/machine.php" line="58"/>
         <source>_repriceshipping</source>
         <translation>beim wechschiggn &apos;nen Fandasiebreis nehm&apos;</translation>
     </message>
+    <message>
+        <location filename="../www/machine.php" line="40"/>
+        <source>createreservedorder</source>
+        <translation>Ne Resorvierung anleechn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="42"/>
+        <source>orderchangeshipping</source>
+        <translation>De Versandmedode von dor Beschdellung ändorn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="43"/>
+        <source>reservationtoorder</source>
+        <translation>Ne Resorvierung zur Beschdellung machn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="43"/>
+        <source>reservationtosale</source>
+        <translation>Ne Resorvierung zu nem Vorgauf machn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="45"/>
+        <source>getshipping</source>
+        <translation>Versandmedoden abfrachn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="45"/>
+        <source>setshipping</source>
+        <translation>Versandmedoden ändorn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="45"/>
+        <source>deleteshipping</source>
+        <translation>Versandmedoden löschn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>getvoucherprices</source>
+        <translation>erloobde Gudscheinbreise holn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>cancelvoucher</source>
+        <translation>Gudschein zurüggeben</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>emptyvoucher</source>
+        <translation>Gudschein ungüldsch machn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>usevoucher</source>
+        <translation>mit Gudschein bedsahln</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>getvoucher</source>
+        <translation>Gudschein abfrachn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="51"/>
+        <source>settemplatedescription</source>
+        <translation>Vorlachenbeschreibung ändorn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="53"/>
+        <source>deletetemplate</source>
+        <translation>Vorlache löschn</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="59"/>
+        <source>_anyvoucher</source>
+        <translation>Gudschein mit belibschm Werd vergoofen</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="61"/>
+        <source>_anypricevoucher</source>
+        <translation>Gudscheine vorgoofen, die &apos;n andorn Breis ham&apos; als wo &apos;se werd sin</translation>
+    </message>
 </context>
 <context>
     <name>initkey</name>
@@ -2516,6 +3215,27 @@ At least %1 Bits of random are required.</source>
     </message>
 </context>
 <context>
+    <name>misc</name>
+    <message>
+        <location filename="misc.cpp" line="35"/>
+        <source>%1.%2</source>
+        <comment>price with decimal dot</comment>
+        <translation>%1,%2</translation>
+    </message>
+    <message>
+        <location filename="misc.cpp" line="41"/>
+        <source>.</source>
+        <comment>decimal dot in price</comment>
+        <translation>,</translation>
+    </message>
+    <message>
+        <location filename="misc.cpp" line="48"/>
+        <source>[0-9]+\.[0-9]{2}</source>
+        <comment>regexp for price</comment>
+        <translation>[0-9]+,[0-9]{2}</translation>
+    </message>
+</context>
+<context>
     <name>php::</name>
     <message>
         <location filename="../www/inc/classes/customer.php" line="259"/>
@@ -2573,77 +3293,77 @@ At least %1 Bits of random are required.</source>
         <translation>Ungüldsche Veranschdaldungsnummer.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="526"/>
+        <location filename="../www/inc/classes/order.php" line="795"/>
         <source>Cannot place order, sorry.</source>
         <translation>Jedsd gann&apos;sch vor Schregg die Beschdellung ni anleschn. Dud mir wirschlich leid!</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="537"/>
+        <location filename="../www/inc/classes/order.php" line="785"/>
         <source>Cannot place sale, sorry.</source>
         <translation>Das gann&apos;sch jedsd aus irschendnem Grund ni vergaufen. Gomisch.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="542"/>
+        <location filename="../www/inc/classes/order.php" line="800"/>
         <source>Internal Error: unknown action.</source>
         <translation>Huch! Jedsd habsch was falsch gemachd: de &quot;Action&quot; is ni begannd. Frach ma jemand anders.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="600"/>
+        <location filename="../www/inc/classes/order.php" line="868"/>
         <source>No such orderID in database.</source>
         <translation>De Beschdellung is ni in dor Dadenbank.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="611"/>
+        <location filename="../www/inc/classes/order.php" line="879"/>
         <source>Expected 2 arguments.</source>
         <translation>Eischendlich hadsch zwee Argumende erwarded. Wasn&apos; nu?</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="617"/>
+        <location filename="../www/inc/classes/order.php" line="885"/>
         <source>Invalid Order ID</source>
         <translation>Ungüldsche Beschdellnummer</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="623"/>
+        <location filename="../www/inc/classes/order.php" line="891"/>
         <source>Expected positive amount.</source>
         <translation>Wenn&apos;de mir sachst wieviel&apos;s sein soll, dann versuch mich ni zu verarschen: s&apos; muss schon &apos;ne bosidive Zahl sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="632"/>
+        <location filename="../www/inc/classes/order.php" line="900"/>
         <source>Order does not exist.</source>
         <translation>Beschdellung gibsd ni. Wirschlich ni. Bionierärenword.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="638"/>
+        <location filename="../www/inc/classes/order.php" line="906"/>
         <source>Order cannot be changed, it is closed.</source>
         <translation>De Beschdellung gansch jedsd ni mehr ändern. Ärsdens is gleisch Feierahmd und zweed&apos;ns is die schon geschloss&apos;n.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="680"/>
+        <location filename="../www/inc/classes/order.php" line="953"/>
         <source>Order ID must be numeric.</source>
         <translation>Du hör ma! Das heesd Beschdellnummer weils &apos;ne Nummer sein soll, ni weil&apos;de Göthe zidiern sollsd.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="690"/>
+        <location filename="../www/inc/classes/order.php" line="963"/>
         <source>Order ID is invalid.</source>
         <translation>Ungüldsche Beschdellnummer</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="671"/>
+        <location filename="../www/inc/classes/order.php" line="944"/>
         <source>Wrong state, cannot set order to shipped.</source>
         <translation>De Beschdellung gann ni weggeschiggd werden. Bungd.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="696"/>
+        <location filename="../www/inc/classes/order.php" line="969"/>
         <source>Wrong state, cannot set order to cancelled.</source>
         <translation>De Beschdellung gann ni abgebrochn werden. Bungd.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="707"/>
+        <location filename="../www/inc/classes/order.php" line="980"/>
         <source>Ticket not found.</source>
         <translation>Garde nisch gefunden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="711"/>
+        <location filename="../www/inc/classes/order.php" line="984"/>
         <source>Ticket has no order.</source>
         <translation>Garde had geene Beschdellung. Seid wann machn&apos; worn sowas?</translation>
     </message>
@@ -2778,44 +3498,116 @@ At least %1 Bits of random are required.</source>
         <translation>Isch gann das Bassword &apos;ne ändern.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="36"/>
+        <location filename="../www/inc/machine/template.php" line="42"/>
         <source>Template File not found in database</source>
         <translation>De Vorlache gibsd ned in dor Dadenbank.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="47"/>
+        <location filename="../www/inc/machine/template.php" line="83"/>
         <source>Unable to find file name</source>
         <translation>De Dadai gibsd ned.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="55"/>
+        <location filename="../www/inc/machine/template.php" line="91"/>
         <source>Illegal File Name</source>
         <translation>De Dadai is nich erlaubd. Du mussd Disch schon an de Gonvendsion halden.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
+        <location filename="../www/machine.php" line="68"/>
         <source>Invalid Request, please use the MagicSmoke Client with this page.</source>
         <translation>Da iss was gabudd mit Deim Brogramm, Du mussd schon &apos;s rischdsche nehm.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="94"/>
+        <location filename="../www/machine.php" line="122"/>
         <source>Invalid or missing sessionid, or session timed out.</source>
         <translation>De Seschion gehd nimmer.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="106"/>
+        <location filename="../www/machine.php" line="134"/>
         <source>Session not yet authenticated.</source>
         <translation>De Seschion gann noch ned benudsd werden. Du mussd schon alle Zeddl ausfüllen bevor isch Disch reenlass.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="118"/>
+        <location filename="../www/machine.php" line="146"/>
         <source>You do not have the right to execute this transaction.</source>
         <translation>Des darfsde nisch. Da mussde den Baba Adminischdrador frachn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="367"/>
+        <location filename="../www/machine.php" line="467"/>
         <source>Internal Error: unknown command, hiccup in code structure.</source>
         <translation>Isch hab da een Broblem. Irschendwie gibsd das Gommando nur halb, aber och ni&apos; rischdisch. Frach ma&apos; den Brogrammierer.</translation>
     </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="406"/>
+        <source>invalidvalue</source>
+        <comment>voucher state</comment>
+        <translation>ungüldschor Werd</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="412"/>
+        <source>invalidprice</source>
+        <comment>voucher state</comment>
+        <translation>ungüldschor Breis</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="433"/>
+        <source>Shipping type not available to user.</source>
+        <translation>De Versandmedode gannsde nisch benudsen. S&apos; had dor Scheff verboden.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="450"/>
+        <source>Illegal shipping type.</source>
+        <translation>De Versandmedode gibs doch gar nisch!</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="911"/>
+        <source>Order cannot be paid for, it is only a reservation. Order or sell it first!</source>
+        <translation>Isch gann das Geld jedsd wirschlisch ni nehm. Gands änsdhafd. S&apos; iss nämlisch noch ni beschdelld, sondorn nur resorvierd.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1051"/>
+        <source>Unable to update order comment.</source>
+        <translation>Gann den Gommendar ni anbassn.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1195"/>
+        <source>Invalid Order.</source>
+        <translation>Ungüldsche Beschdellung.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1091"/>
+        <source>Invalid Shipping Method.</source>
+        <translation>Ungüldsche Versandmedode.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1157"/>
+        <source>Unable to create new shipping method.</source>
+        <translation>GAnn de neue Versandmedode ni anlechn.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1166"/>
+        <source>Unable to change shipping method.</source>
+        <translation>Gann de Versandmedode ni ändorn.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1179"/>
+        <source>Expected a numeric shipping ID.</source>
+        <translation>Also eechendlich habsch &apos;ne Nummor erwarded als Versandmedodennummer. Desweschn heesd das och Versandmedodennummer.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1184"/>
+        <source>Unable to delete shipping method.</source>
+        <translation>Gann de Versandmedode ni löschn.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1202"/>
+        <source>Cannot change order from reservation.</source>
+        <translation>Gann de Resorvierung ni ändorn.</translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/template.php" line="98"/>
+        <source>Template file does not exist</source>
+        <translation>Vorlache eggsisdierd ni. Wirschlisch ni. Isch hab gesuchd wie&apos;n Bleeder. Isch gonnd&apos;s ni find&apos;n!</translation>
+    </message>
 </context>
 </TS>
diff --git a/src/smoke_en.ts b/src/smoke_en.ts
index 84f510f..489e741 100644
--- a/src/smoke_en.ts
+++ b/src/smoke_en.ts
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="en">
+<defaultcodec></defaultcodec>
 <context>
     <name>MCheckDialog</name>
     <message>
@@ -295,130 +296,135 @@
 <context>
     <name>MEventSummary</name>
     <message>
-        <location filename="eventsummary.cpp" line="56"/>
+        <location filename="eventsummary.cpp" line="40"/>
         <source>Summary for Event %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="62"/>
+        <location filename="eventsummary.cpp" line="46"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="66"/>
+        <location filename="eventsummary.cpp" line="50"/>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="68"/>
+        <location filename="eventsummary.cpp" line="52"/>
         <source>Artist:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="54"/>
         <source>Start:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="237"/>
+        <location filename="eventsummary.cpp" line="221"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>Date+Time format for displaying event start time</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="eventsummary.cpp" line="57"/>
         <source>Capacity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="75"/>
+        <location filename="eventsummary.cpp" line="59"/>
         <source>Tickets currently reserved:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="77"/>
+        <location filename="eventsummary.cpp" line="61"/>
         <source>Tickets currently cancelled:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="79"/>
+        <location filename="eventsummary.cpp" line="63"/>
         <source>Tickets currently usable:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="81"/>
+        <location filename="eventsummary.cpp" line="65"/>
         <source>Total Income:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="285"/>
+        <location filename="eventsummary.cpp" line="269"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="87"/>
+        <location filename="eventsummary.cpp" line="71"/>
         <source>Tickets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Price</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Bought</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="eventsummary.cpp" line="76"/>
         <source>Unused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="104"/>
+        <location filename="eventsummary.cpp" line="88"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="110"/>
+        <location filename="eventsummary.cpp" line="94"/>
         <source>Order: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="112"/>
+        <location filename="eventsummary.cpp" line="96"/>
         <source>Customer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="122"/>
+        <location filename="eventsummary.cpp" line="106"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="124"/>
+        <location filename="eventsummary.cpp" line="108"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="127"/>
+        <location filename="eventsummary.cpp" line="111"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="206"/>
+        <location filename="eventsummary.cpp" line="190"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="206"/>
-        <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
+        <location filename="eventsummary.cpp" line="190"/>
+        <source>Unable to get template file (eventsummary). Giving up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="197"/>
+        <source>Open Document File (*.%1)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -710,735 +716,843 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrder</name>
     <message>
-        <location filename="order.cpp" line="112"/>
+        <location filename="order.cpp" line="122"/>
         <source>placed</source>
         <comment>state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="113"/>
+        <location filename="order.cpp" line="123"/>
         <source>sent</source>
         <comment>state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="114"/>
+        <location filename="order.cpp" line="124"/>
         <source>cancelled</source>
         <comment>state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="115"/>
+        <location filename="order.cpp" line="125"/>
         <source>closed</source>
         <comment>state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="116"/>
+        <location filename="order.cpp" line="127"/>
         <source>check: ok</source>
         <comment>state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="117"/>
+        <location filename="order.cpp" line="128"/>
         <source>check: sale only</source>
         <comment>state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="118"/>
+        <location filename="order.cpp" line="129"/>
         <source>check: order only</source>
         <comment>state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="119"/>
+        <location filename="order.cpp" line="130"/>
         <source>check: failed</source>
         <comment>state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="120"/>
+        <location filename="order.cpp" line="131"/>
         <source>invalid</source>
         <comment>state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="147"/>
-        <source>.</source>
-        <comment>decimal dot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="order.cpp" line="351"/>
+        <location filename="order.cpp" line="377"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="364"/>
+        <location filename="order.cpp" line="390"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="419"/>
+        <location filename="order.cpp" line="445"/>
         <source>This ticket is not part of this order.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="453"/>
+        <location filename="order.cpp" line="531"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="449"/>
+        <location filename="order.cpp" line="527"/>
         <source>The request failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="453"/>
+        <location filename="order.cpp" line="531"/>
         <source>A problem occurred during the order: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="order.cpp" line="126"/>
+        <source>reserved</source>
+        <comment>state</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="454"/>
+        <source>Cannot query DB, don&apos;t know it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="466"/>
+        <source>Cannot update shipping: error while sending.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="486"/>
+        <source>This voucher is not part of this order.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MOrderItemView</name>
+    <message>
+        <location filename="orderwin.cpp" line="692"/>
+        <source>Preview Tickets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="701"/>
+        <source>Ticket: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="703"/>
+        <source>Voucher: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MOrderWindow</name>
     <message>
-        <location filename="orderwin.cpp" line="44"/>
+        <location filename="orderwin.cpp" line="45"/>
         <source>Order Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="49"/>
+        <location filename="orderwin.cpp" line="50"/>
         <source>&amp;Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="50"/>
+        <location filename="orderwin.cpp" line="51"/>
         <source>&amp;Order...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="52"/>
+        <location filename="orderwin.cpp" line="54"/>
         <source>&amp;Sell...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="54"/>
+        <location filename="orderwin.cpp" line="59"/>
         <source>&amp;Prune and recheck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="56"/>
+        <location filename="orderwin.cpp" line="62"/>
         <source>C&amp;ancel Order...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="58"/>
+        <location filename="orderwin.cpp" line="64"/>
         <source>&amp;Mark Order as Shipped...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="61"/>
-        <source>Ch&amp;ange Ticket-Price...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="63"/>
-        <source>&amp;Return Ticket...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="65"/>
+        <location filename="orderwin.cpp" line="71"/>
         <source>Change Commen&amp;t...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="68"/>
+        <location filename="orderwin.cpp" line="76"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="69"/>
+        <location filename="orderwin.cpp" line="78"/>
         <source>&amp;Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="71"/>
+        <location filename="orderwin.cpp" line="80"/>
         <source>Receive &amp;Payment...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="73"/>
+        <location filename="orderwin.cpp" line="82"/>
         <source>&amp;Refund...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="75"/>
+        <location filename="orderwin.cpp" line="85"/>
         <source>P&amp;rinting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="77"/>
+        <location filename="orderwin.cpp" line="87"/>
         <source>Print &amp;Bill...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="78"/>
+        <location filename="orderwin.cpp" line="88"/>
         <source>Save Bill &amp;as file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="80"/>
+        <location filename="orderwin.cpp" line="90"/>
         <source>Print &amp;Tickets...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="81"/>
-        <source>Print &amp;Current Ticket...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="82"/>
-        <source>&amp;View Tickets...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="93"/>
+        <location filename="orderwin.cpp" line="104"/>
         <source>Order ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="95"/>
+        <location filename="orderwin.cpp" line="106"/>
         <source>Order Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="97"/>
+        <location filename="orderwin.cpp" line="108"/>
         <source>Shipping Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="99"/>
+        <location filename="orderwin.cpp" line="110"/>
         <source>Customer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="101"/>
+        <location filename="orderwin.cpp" line="112"/>
         <source>Delivery Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="104"/>
+        <location filename="orderwin.cpp" line="115"/>
         <source>Sold by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="106"/>
+        <location filename="orderwin.cpp" line="117"/>
         <source>Total Price:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="108"/>
+        <location filename="orderwin.cpp" line="119"/>
         <source>Already Paid:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="110"/>
+        <location filename="orderwin.cpp" line="121"/>
         <source>Order State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="112"/>
+        <location filename="orderwin.cpp" line="127"/>
         <source>Order Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
-        <source>Ticket ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="143"/>
-        <source>Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="orderwin.cpp" line="162"/>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="orderwin.cpp" line="162"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="orderwin.cpp" line="162"/>
         <source>Price</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="454"/>
+        <location filename="orderwin.cpp" line="577"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="210"/>
+        <location filename="orderwin.cpp" line="263"/>
         <source>Unable to get template file (ticket.xtt). Giving up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="238"/>
-        <source>Unable to get template file (bill.odtt). Giving up.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="494"/>
+        <location filename="orderwin.cpp" line="638"/>
         <source>Mark as shipped?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="494"/>
+        <location filename="orderwin.cpp" line="638"/>
         <source>Mark this order as shipped now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="261"/>
-        <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="347"/>
+        <location filename="orderwin.cpp" line="439"/>
         <source>Enter Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="347"/>
+        <location filename="orderwin.cpp" line="439"/>
         <source>Please enter the amount that has been paid:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="354"/>
+        <location filename="orderwin.cpp" line="446"/>
         <source>Unable to submit payment request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="358"/>
+        <location filename="orderwin.cpp" line="450"/>
         <source>Error while trying to pay: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="406"/>
+        <location filename="orderwin.cpp" line="462"/>
         <source>Enter Refund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="406"/>
+        <location filename="orderwin.cpp" line="462"/>
         <source>Please enter the amount that will be refunded:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="377"/>
+        <location filename="orderwin.cpp" line="469"/>
         <source>Unable to submit refund request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="381"/>
+        <location filename="orderwin.cpp" line="473"/>
         <source>Error whily trying to refund: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="434"/>
+        <location filename="orderwin.cpp" line="534"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="438"/>
+        <location filename="orderwin.cpp" line="538"/>
         <source>Return Ticket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="438"/>
+        <location filename="orderwin.cpp" line="538"/>
         <source>Do you really want to return this ticket?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="448"/>
+        <location filename="orderwin.cpp" line="571"/>
         <source>Cancel Order?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="448"/>
+        <location filename="orderwin.cpp" line="571"/>
         <source>Cancel this order now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="450"/>
+        <location filename="orderwin.cpp" line="573"/>
         <source>Cannot cancel this order: it is in the wrong state.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="454"/>
+        <location filename="orderwin.cpp" line="577"/>
         <source>Failed to cancel this order.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="506"/>
+        <location filename="orderwin.cpp" line="650"/>
         <source>Set comment: order %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="517"/>
+        <location filename="orderwin.cpp" line="661"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="519"/>
+        <location filename="orderwin.cpp" line="663"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="orderwin.cpp" line="57"/>
+        <source>Ma&amp;ke Reservation...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="67"/>
+        <source>Ch&amp;ange Item-Price...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="69"/>
+        <source>&amp;Return Item...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="73"/>
+        <source>Change Sh&amp;ipping Method...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="91"/>
+        <source>Print V&amp;ouchers...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="92"/>
+        <source>Print &amp;Current Item...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="93"/>
+        <source>&amp;View Items...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="123"/>
+        <source>Shipping Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="125"/>
+        <source>Shipping Costs:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="162"/>
+        <source>Item ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="162"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="182"/>
+        <source>Voucher (current value: %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="257"/>
+        <source>There are no tickets left to print.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="296"/>
+        <source>There are no vouchers left to print.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="302"/>
+        <source>Unable to get template file (voucher.xtt). Giving up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="330"/>
+        <source>Unable to get template file (bill). Giving up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="353"/>
+        <source>Unable to get template file (eventsummary). Giving up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="361"/>
+        <source>Open Document File (*.%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="500"/>
+        <source>Enter Price</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="500"/>
+        <source>Please enter the new price for the ticket:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="507"/>
+        <source>Cannot change this item type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="555"/>
+        <source>This voucher cannot be returned, it has already been used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="559"/>
+        <source>Return Voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="559"/>
+        <source>Do you really want to return this voucher?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="566"/>
+        <source>Cannot return this item type.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MOverview</name>
     <message>
-        <location filename="overview.cpp" line="63"/>
+        <location filename="overview.cpp" line="65"/>
         <source>&amp;Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="64"/>
+        <location filename="overview.cpp" line="66"/>
         <source>&amp;Re-Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="65"/>
+        <location filename="overview.cpp" line="67"/>
         <source>&amp;Offline mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="66"/>
-        <source>Change my &amp;Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="68"/>
-        <source>&amp;Upload Template...</source>
+        <source>Change my &amp;Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="70"/>
+        <location filename="overview.cpp" line="73"/>
         <source>&amp;Close Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="72"/>
+        <location filename="overview.cpp" line="75"/>
         <source>&amp;Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="73"/>
+        <location filename="overview.cpp" line="76"/>
         <source>&amp;Update Event List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="74"/>
+        <location filename="overview.cpp" line="77"/>
         <source>&amp;Show/Edit details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="75"/>
+        <location filename="overview.cpp" line="78"/>
         <source>&amp;New Event...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="77"/>
+        <location filename="overview.cpp" line="80"/>
         <source>Show &amp;old Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="82"/>
+        <location filename="overview.cpp" line="85"/>
         <source>&amp;Customer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="83"/>
+        <location filename="overview.cpp" line="86"/>
         <source>&amp;Show all customers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="85"/>
+        <location filename="overview.cpp" line="88"/>
         <source>C&amp;art</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="86"/>
+        <location filename="overview.cpp" line="89"/>
         <source>Add &amp;Ticket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="87"/>
+        <location filename="overview.cpp" line="90"/>
         <source>Add &amp;Voucher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="88"/>
+        <location filename="overview.cpp" line="91"/>
         <source>&amp;Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="89"/>
+        <location filename="overview.cpp" line="92"/>
         <source>&amp;Abort Shopping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="91"/>
+        <location filename="overview.cpp" line="96"/>
         <source>&amp;Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="92"/>
-        <source>&amp;Return ticket...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="94"/>
+        <location filename="overview.cpp" line="102"/>
         <source>C&amp;onfigure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="95"/>
+        <location filename="overview.cpp" line="103"/>
         <source>&amp;Auto-Refresh settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="97"/>
+        <location filename="overview.cpp" line="105"/>
         <source>&amp;Admin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="99"/>
+        <location filename="overview.cpp" line="107"/>
         <source>&amp;Schedule Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="100"/>
+        <location filename="overview.cpp" line="108"/>
         <source>&amp;Backup now...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="101"/>
+        <location filename="overview.cpp" line="109"/>
         <source>&amp;Restore...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="108"/>
+        <location filename="overview.cpp" line="116"/>
         <source>Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="118"/>
+        <location filename="overview.cpp" line="126"/>
         <source>New Event...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="207"/>
+        <location filename="overview.cpp" line="218"/>
         <source>Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="125"/>
+        <location filename="overview.cpp" line="133"/>
         <source>Order Ticket...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="129"/>
+        <location filename="overview.cpp" line="137"/>
         <source>Event Summary...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="133"/>
+        <location filename="overview.cpp" line="141"/>
         <source>Cancel Event...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="139"/>
+        <location filename="overview.cpp" line="147"/>
         <source>Shopping Cart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="151"/>
+        <location filename="overview.cpp" line="159"/>
         <source>Add Ticket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="153"/>
+        <location filename="overview.cpp" line="161"/>
         <source>Add Voucher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="156"/>
+        <location filename="overview.cpp" line="163"/>
         <source>Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="162"/>
+        <location filename="overview.cpp" line="169"/>
         <source>Customer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="168"/>
+        <location filename="overview.cpp" line="178"/>
         <source>Delivery Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="171"/>
+        <location filename="overview.cpp" line="181"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="178"/>
+        <location filename="overview.cpp" line="188"/>
         <source>Order Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="181"/>
+        <location filename="overview.cpp" line="191"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="185"/>
+        <location filename="overview.cpp" line="195"/>
         <source>Order List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="189"/>
+        <location filename="overview.cpp" line="199"/>
         <source>-select mode-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="190"/>
+        <location filename="overview.cpp" line="200"/>
         <source>All Orders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="191"/>
+        <location filename="overview.cpp" line="201"/>
         <source>Open Orders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="192"/>
+        <location filename="overview.cpp" line="203"/>
         <source>Outstanding Payments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="193"/>
+        <location filename="overview.cpp" line="204"/>
         <source>Outstanding Refunds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="194"/>
+        <location filename="overview.cpp" line="205"/>
         <source>Undelivered Orders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="196"/>
+        <location filename="overview.cpp" line="207"/>
         <source>-search result-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="204"/>
+        <location filename="overview.cpp" line="215"/>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="211"/>
+        <location filename="overview.cpp" line="222"/>
         <source>Find by Ticket...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="214"/>
+        <location filename="overview.cpp" line="225"/>
         <source>Find by Event...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="217"/>
+        <location filename="overview.cpp" line="228"/>
         <source>Find by Customer...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="223"/>
+        <location filename="overview.cpp" line="234"/>
         <source>Entrance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="231"/>
+        <location filename="overview.cpp" line="242"/>
         <source>Users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="239"/>
+        <location filename="overview.cpp" line="250"/>
         <source>New User...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="242"/>
+        <location filename="overview.cpp" line="253"/>
         <source>Delete User...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="246"/>
+        <location filename="overview.cpp" line="257"/>
         <source>Description...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="249"/>
+        <location filename="overview.cpp" line="260"/>
         <source>Hosts...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="252"/>
+        <location filename="overview.cpp" line="263"/>
         <source>Roles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="255"/>
+        <location filename="overview.cpp" line="266"/>
         <source>Set Password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="261"/>
+        <location filename="overview.cpp" line="272"/>
         <source>Hosts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="269"/>
+        <location filename="overview.cpp" line="280"/>
         <source>New Host...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="272"/>
+        <location filename="overview.cpp" line="283"/>
         <source>Add This Host...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="275"/>
+        <location filename="overview.cpp" line="286"/>
         <source>Delete Host...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="279"/>
+        <location filename="overview.cpp" line="290"/>
         <source>Generate New Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="282"/>
+        <location filename="overview.cpp" line="293"/>
         <source>Import...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="285"/>
+        <location filename="overview.cpp" line="296"/>
         <source>Export...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1453,179 +1567,179 @@ At least %1 Bits of random are required.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Capacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Sold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="331"/>
+        <location filename="overview.cpp" line="343"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="338"/>
+        <location filename="overview.cpp" line="350"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1162"/>
+        <location filename="overview.cpp" line="1283"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="369"/>
+        <location filename="overview.cpp" line="381"/>
         <source>I was unable to renew the login at the server, the error was: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="416"/>
+        <location filename="overview.cpp" line="428"/>
         <source>Cancel Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="416"/>
+        <location filename="overview.cpp" line="428"/>
         <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="419"/>
+        <location filename="overview.cpp" line="431"/>
         <source>Event Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="419"/>
+        <location filename="overview.cpp" line="431"/>
         <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="421"/>
+        <location filename="overview.cpp" line="433"/>
         <source>Unable to cancel event &quot;%1&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="431"/>
+        <location filename="overview.cpp" line="452"/>
         <source>Login Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="431"/>
+        <location filename="overview.cpp" line="452"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="445"/>
+        <location filename="overview.cpp" line="466"/>
         <source>New User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="445"/>
+        <location filename="overview.cpp" line="466"/>
         <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="864"/>
+        <location filename="overview.cpp" line="978"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="450"/>
+        <location filename="overview.cpp" line="471"/>
         <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="454"/>
+        <location filename="overview.cpp" line="475"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="454"/>
+        <location filename="overview.cpp" line="475"/>
         <source>Please enter an initial password for the user:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="469"/>
+        <location filename="overview.cpp" line="490"/>
         <source>Delete User?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="469"/>
+        <location filename="overview.cpp" line="490"/>
         <source>Really delete user &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="473"/>
+        <location filename="overview.cpp" line="494"/>
         <source>(Nobody)</source>
         <comment>this is a username for no user, the string must contain &apos;(&apos; to distinguish it from the others</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="476"/>
+        <location filename="overview.cpp" line="497"/>
         <source>Delete User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="476"/>
+        <location filename="overview.cpp" line="497"/>
         <source>Select which user will inherit this users database objects:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="481"/>
+        <location filename="overview.cpp" line="502"/>
         <source>Cannot delete user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="495"/>
+        <location filename="overview.cpp" line="516"/>
         <source>Edit Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="495"/>
+        <location filename="overview.cpp" line="516"/>
         <source>Descriptionof user %1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="538"/>
+        <location filename="overview.cpp" line="559"/>
         <source>Error setting password: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="553"/>
+        <location filename="overview.cpp" line="574"/>
         <source>The password must be non-empty and both lines must match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="569"/>
+        <location filename="overview.cpp" line="590"/>
         <source>Host Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="569"/>
+        <location filename="overview.cpp" line="590"/>
         <source>Host Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="586"/>
+        <location filename="overview.cpp" line="607"/>
         <source>Create New Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="586"/>
+        <location filename="overview.cpp" line="607"/>
         <source>Please enter a host name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="594"/>
+        <location filename="overview.cpp" line="615"/>
         <source>The key of this new host could only be generated with %n bits entropy. Store anyway?</source>
         <translation>
             <numerusform>The key of this new host could only be generated with %n bit of entropy. Store anyway?</numerusform>
@@ -1633,27 +1747,27 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="617"/>
+        <location filename="overview.cpp" line="638"/>
         <source>Delete this Host?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="617"/>
+        <location filename="overview.cpp" line="638"/>
         <source>Really delete host &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="631"/>
+        <location filename="overview.cpp" line="652"/>
         <source>Change Host Key?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="631"/>
+        <location filename="overview.cpp" line="652"/>
         <source>Really change the key of host &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="636"/>
+        <location filename="overview.cpp" line="657"/>
         <source>The new key of this host could only be generated with %n bits entropy. Store anyway?</source>
         <translation>
             <numerusform>The key of this new host could only be generated with %n bit of entropy. Store anyway?</numerusform>
@@ -1661,47 +1775,47 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="647"/>
+        <location filename="overview.cpp" line="668"/>
         <source>Import Key from File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="656"/>
+        <location filename="overview.cpp" line="677"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="668"/>
+        <location filename="overview.cpp" line="689"/>
         <source>This is not a host key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="673"/>
+        <location filename="overview.cpp" line="694"/>
         <source>This host key file does not contain a valid host name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="678"/>
+        <location filename="overview.cpp" line="699"/>
         <source>This host key file does not contain a valid key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="683"/>
+        <location filename="overview.cpp" line="704"/>
         <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="701"/>
+        <location filename="overview.cpp" line="722"/>
         <source>This host cannot be exported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="706"/>
+        <location filename="overview.cpp" line="727"/>
         <source>Export Key to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="715"/>
+        <location filename="overview.cpp" line="736"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1711,458 +1825,859 @@ At least %1 Bits of random are required.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="771"/>
+        <location filename="overview.cpp" line="781"/>
         <source>Select Event to order Ticket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="784"/>
+        <location filename="overview.cpp" line="794"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1043"/>
+        <location filename="overview.cpp" line="1165"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="820"/>
+        <location filename="overview.cpp" line="912"/>
         <source>There is nothing in the order. Ignoring it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="824"/>
+        <location filename="overview.cpp" line="916"/>
         <source>Please chose a customer first!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="860"/>
+        <location filename="overview.cpp" line="974"/>
         <source>The request failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="864"/>
+        <location filename="overview.cpp" line="978"/>
         <source>A problem occurred during the order: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="912"/>
+        <location filename="overview.cpp" line="1033"/>
         <source>Ticket &quot;%1&quot; Not Valid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="916"/>
+        <location filename="overview.cpp" line="1037"/>
         <source>Ticket &quot;%1&quot; has already been used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="920"/>
+        <location filename="overview.cpp" line="1041"/>
         <source>Ticket &quot;%1&quot; has not been bought.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="924"/>
+        <location filename="overview.cpp" line="1045"/>
         <source>Ticket &quot;%1&quot; Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="929"/>
+        <location filename="overview.cpp" line="1050"/>
         <source>Ticket &quot;%1&quot; Ok; the Order has a refund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="934"/>
+        <location filename="overview.cpp" line="1055"/>
         <source>Ticket &quot;%1&quot; is not paid for!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="937"/>
+        <location filename="overview.cpp" line="1058"/>
         <source>Ticket &quot;%1&quot; cannot be accepted, please check the order!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Paid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1100"/>
+        <location filename="overview.cpp" line="1222"/>
         <source>Customer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1003"/>
+        <location filename="overview.cpp" line="1125"/>
         <source>Enter Ticket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1003"/>
+        <location filename="overview.cpp" line="1125"/>
         <source>Please enter the ID of one of the tickets of the order you seek:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1007"/>
+        <location filename="overview.cpp" line="1129"/>
         <source>Unable to query server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1016"/>
+        <location filename="overview.cpp" line="1138"/>
         <source>Server returned an invalid order ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1029"/>
+        <location filename="overview.cpp" line="1151"/>
         <source>Select Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1041"/>
+        <location filename="overview.cpp" line="1163"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1125"/>
-        <source>Please select a template file.</source>
+        <location filename="overview.cpp" line="1248"/>
+        <source>Return Ticket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1132"/>
-        <source>Enter Template Name</source>
+        <location filename="overview.cpp" line="1248"/>
+        <source>Please enter the ticket ID to return:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1132"/>
-        <source>Please enter a name for the template file, it should contain only letters, digits, underscores and dots:</source>
+        <location filename="overview.cpp" line="1252"/>
+        <source>This is not a valid ticket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1135"/>
-        <source>The template name must only contain letters, digits, underscores and dots.</source>
+        <location filename="overview.cpp" line="1257"/>
+        <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1139"/>
-        <source>Success</source>
+        <location filename="overview.cpp" line="1306"/>
+        <source>Refresh Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1139"/>
-        <source>Successfully uploaded the template.</source>
+        <location filename="overview.cpp" line="1311"/>
+        <source>Refresh Rate (minutes):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1141"/>
-        <source>Unable to upload the template.</source>
+        <location filename="overview.cpp" line="1317"/>
+        <source>refresh &amp;event list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1148"/>
-        <source>Return Ticket</source>
+        <location filename="overview.cpp" line="1319"/>
+        <source>refresh &amp;user list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1148"/>
-        <source>Please enter the ticket ID to return:</source>
+        <location filename="overview.cpp" line="1321"/>
+        <source>refresh &amp;host list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1152"/>
-        <source>This is not a valid ticket.</source>
+        <location filename="overview.cpp" line="1330"/>
+        <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1157"/>
-        <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
+        <location filename="overview.cpp" line="1332"/>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1183"/>
-        <source>Refresh Settings</source>
+        <location filename="overview.cpp" line="70"/>
+        <source>&amp;Edit Templates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1188"/>
-        <source>Refresh Rate (minutes):</source>
+        <location filename="overview.cpp" line="71"/>
+        <source>&amp;Update Templates Now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1194"/>
-        <source>refresh &amp;event list</source>
+        <location filename="overview.cpp" line="94"/>
+        <source>&amp;Update Shipping Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1196"/>
-        <source>refresh &amp;user list</source>
+        <location filename="overview.cpp" line="97"/>
+        <source>Return &amp;ticket...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1198"/>
-        <source>refresh &amp;host list</source>
+        <location filename="overview.cpp" line="98"/>
+        <source>Return &amp;voucher...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1205"/>
-        <source>&amp;OK</source>
+        <location filename="overview.cpp" line="100"/>
+        <source>Edit &amp;Shipping Options...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1207"/>
-        <source>&amp;Cancel</source>
+        <location filename="overview.cpp" line="175"/>
+        <source>Shipping Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="202"/>
+        <source>Open Reservations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="440"/>
+        <source>(No Shipping)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="844"/>
+        <source>Select Voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="855"/>
+        <source>Select voucher price and value:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="856"/>
+        <source>Price:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="862"/>
+        <source>Value:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="894"/>
+        <source>Voucher (price: %1, value %2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1269"/>
+        <source>Return Voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1269"/>
+        <source>Please enter the voucher ID to return:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1273"/>
+        <source>This is not a valid voucher.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1278"/>
+        <source>This voucher cannot be returned, it has already been used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="1323"/>
+        <source>refresh &amp;shipping list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MPasswordChange</name>
     <message>
-        <location filename="overview.cpp" line="1228"/>
+        <location filename="overview.cpp" line="1354"/>
         <source>Change my password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1230"/>
+        <location filename="overview.cpp" line="1356"/>
         <source>Reset password of user &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1234"/>
+        <location filename="overview.cpp" line="1360"/>
         <source>Old Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1238"/>
+        <location filename="overview.cpp" line="1364"/>
         <source>New Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1241"/>
+        <location filename="overview.cpp" line="1367"/>
         <source>Repeat Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1249"/>
+        <location filename="overview.cpp" line="1375"/>
         <source>Set Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1251"/>
+        <location filename="overview.cpp" line="1377"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MShipping</name>
+    <message>
+        <location filename="shipping.cpp" line="75"/>
+        <source>.</source>
+        <comment>decimal dot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MShippingChange</name>
+    <message>
+        <location filename="orderwin.cpp" line="746"/>
+        <source>Change Shipping Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="753"/>
+        <source>Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="755"/>
+        <source>Price:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="763"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="765"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="773"/>
+        <source>(None)</source>
+        <comment>shipping method</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MShippingEditor</name>
+    <message>
+        <location filename="shipping.cpp" line="130"/>
+        <source>Edit Shipping Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="142"/>
+        <source>Change Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="144"/>
+        <source>Change Price</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="146"/>
+        <source>Change Availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="149"/>
+        <source>Add Option</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="151"/>
+        <source>Delete Option</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="158"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="160"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>Price</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="168"/>
+        <source>Web</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>Any User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="174"/>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="174"/>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="248"/>
+        <source>Shipping Option Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="188"/>
+        <source>Please select a new description for this shipping option:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="286"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="238"/>
+        <source>Could not store the changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="251"/>
+        <source>Shipping Option Price</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="209"/>
+        <source>Please select a new price for this shipping option:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>Web Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="254"/>
+        <source>Any User + Web Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="255"/>
+        <source>Shipping Option Availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="232"/>
+        <source>Please select a new availability for this shipping option:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="248"/>
+        <source>Please select a new description for this new shipping option:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="251"/>
+        <source>Please select a new price for this new shipping option:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="255"/>
+        <source>Please select a new availability for this new shipping option:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="266"/>
+        <source>Could not create the new option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="shipping.cpp" line="286"/>
+        <source>Unable to delete this option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MTemplateChoice</name>
+    <message>
+        <location filename="templatedlg.cpp" line="29"/>
+        <source>Chose Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="32"/>
+        <source>Please chose a variant of template %s:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="41"/>
+        <source>(default)</source>
+        <comment>default template pseudo-variant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="50"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MTemplateEditor</name>
+    <message>
+        <location filename="templatedlg.cpp" line="72"/>
+        <source>Edit Template Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="84"/>
+        <source>Update Now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="86"/>
+        <source>Add Variant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="88"/>
+        <source>Delete Variant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="95"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="110"/>
+        <source>Template/Variant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="110"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="110"/>
+        <source>Checksum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="221"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="167"/>
+        <source>Unable to delete this template.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="180"/>
+        <source>Select Template File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="185"/>
+        <source>Files with this extension (%1) are not legal for this template.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="204"/>
+        <source>Unable to upload file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="templatedlg.cpp" line="221"/>
+        <source>Unable to send new description to server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MTemplateStore</name>
+    <message>
+        <location filename="templates.cpp" line="105"/>
+        <source>Retrieving templates from server.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MTicket</name>
     <message>
-        <location filename="order.cpp" line="617"/>
+        <location filename="order.cpp" line="722"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="652"/>
+        <location filename="order.cpp" line="757"/>
         <source>bought</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="653"/>
+        <location filename="order.cpp" line="758"/>
         <source>to refund</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="654"/>
+        <location filename="order.cpp" line="759"/>
         <source>used</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="655"/>
+        <location filename="order.cpp" line="760"/>
         <source>reserved</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="656"/>
+        <location filename="order.cpp" line="761"/>
         <source>ok</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="657"/>
+        <location filename="order.cpp" line="762"/>
         <source>sale only</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="658"/>
+        <location filename="order.cpp" line="763"/>
         <source>order only</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="659"/>
+        <location filename="order.cpp" line="764"/>
         <source>too late: event over</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="660"/>
+        <location filename="order.cpp" line="765"/>
         <source>no more tickets</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="661"/>
+        <location filename="order.cpp" line="766"/>
         <source>event cancelled</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="662"/>
+        <location filename="order.cpp" line="767"/>
         <source>no such event</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="663"/>
+        <location filename="order.cpp" line="768"/>
         <source>invalid</source>
         <comment>ticket state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="682"/>
+        <location filename="order.cpp" line="787"/>
         <source>Cannot execute request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="709"/>
+        <location filename="order.cpp" line="814"/>
         <source>Ticket is not stored, can&apos;t return it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="711"/>
+        <location filename="order.cpp" line="816"/>
         <source>Failed to execute request</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MTicketView</name>
+    <name>MUser</name>
     <message>
-        <location filename="orderwin.cpp" line="534"/>
-        <source>Preview Tickets</source>
+        <location filename="user.cpp" line="106"/>
+        <source>User not valid: cannot delete.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MUser</name>
+    <name>MVoucher</name>
     <message>
-        <location filename="user.cpp" line="106"/>
-        <source>User not valid: cannot delete.</source>
+        <location filename="order.cpp" line="908"/>
+        <source>invalid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="910"/>
+        <source>cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="911"/>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="912"/>
+        <source>used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="913"/>
+        <source>unused</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="930"/>
+        <source>Voucher is not stored, can&apos;t return it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="order.cpp" line="932"/>
+        <source>Failed to execute request</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MWebRequest</name>
     <message>
-        <location filename="webrequest.cpp" line="179"/>
+        <location filename="webrequest.cpp" line="182"/>
         <source>Unable to get server info.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="186"/>
+        <location filename="webrequest.cpp" line="189"/>
         <source>Error while parsing server info (line %1 col %2): %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="191"/>
+        <location filename="webrequest.cpp" line="194"/>
         <source>Error in server info: missing authentication algorithm info.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="196"/>
+        <location filename="webrequest.cpp" line="199"/>
         <source>The server requested an unsupported hash algorithm: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="202"/>
+        <location filename="webrequest.cpp" line="205"/>
         <source>Unable to get authentication challenge.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="206"/>
+        <location filename="webrequest.cpp" line="209"/>
         <source>Error while parsing session challenge (line %1 col %2): %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="212"/>
+        <location filename="webrequest.cpp" line="215"/>
         <source>Error in session challenge: missing session ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="218"/>
+        <location filename="webrequest.cpp" line="221"/>
         <source>Error in session challenge: missing host challenge.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="224"/>
+        <location filename="webrequest.cpp" line="227"/>
         <source>Error in session challenge: missing user challenge.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="250"/>
+        <location filename="webrequest.cpp" line="253"/>
         <source>Failed to log in: user/password mismatch, non-allowed host key, or challenge timed out.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="254"/>
+        <location filename="webrequest.cpp" line="257"/>
         <source>Unable to authenticate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="297"/>
+        <location filename="webrequest.cpp" line="300"/>
         <source>Cannot change password, old password does not match!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="346"/>
+        <location filename="webrequest.cpp" line="349"/>
         <source>Error parsing EventList XML data (line %1 column %2): %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="370"/>
+        <location filename="webrequest.cpp" line="373"/>
         <source>Error parsing RoomList XML data (line %1 column %2): %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="394"/>
+        <location filename="webrequest.cpp" line="397"/>
         <source>Error parsing UserList XML data (line %1 column %2): %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="418"/>
+        <location filename="webrequest.cpp" line="421"/>
         <source>Error parsing HostList XML data (line %1 column %2): %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="442"/>
+        <location filename="webrequest.cpp" line="445"/>
         <source>Error parsing CustomerList XML data (line %1 column %2): %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="493"/>
+        <location filename="webrequest.cpp" line="538"/>
         <source>Error parsing OrderList XML data (line %1 column %2): %3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="webrequest.cpp" line="494"/>
+        <source>Error parsing ShippingList XML data (line %1 column %2): %3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpecialHost</name>
@@ -2185,265 +2700,345 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>TransactionNames::</name>
     <message>
-        <location filename="../www/machine.php" line="17"/>
+        <location filename="../www/machine.php" line="19"/>
         <source>serverinfo</source>
         <translation>basic server information (implicitly granted)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="18"/>
+        <location filename="../www/machine.php" line="21"/>
         <source>startsession</source>
         <translation>start a session (implicitly granted)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="18"/>
+        <location filename="../www/machine.php" line="21"/>
         <source>sessionauth</source>
         <translation>authenticate to the server (implicitly granted)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="18"/>
+        <location filename="../www/machine.php" line="21"/>
         <source>closesession</source>
         <translation>end my own session</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="20"/>
+        <location filename="../www/machine.php" line="25"/>
         <source>getmyroles</source>
         <translation>retrieve the roles/privileges I have</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>getusers</source>
         <translation>get a list of all (system) users existing at the system</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>setuserdescription</source>
         <translation>get description of a user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>getuseracl</source>
         <translation>get the roles/privileges of any user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>setuseracl</source>
         <translation>set the roles/privileges of any user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="29"/>
         <source>getuserhosts</source>
         <translation>get the hosts a user may connect from</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>setuserhosts</source>
         <translation>set the hosts a user may connect from</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>adduser</source>
         <translation>add a new user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>deleteuser</source>
         <translation>delete a user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>setmypasswd</source>
         <translation>set my own password</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
+        <location filename="../www/machine.php" line="30"/>
         <source>setpasswd</source>
         <translation>set the password of any user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>gethosts</source>
         <translation>get all hosts that are known to the system</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>sethost</source>
         <translation>change a host</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>addhost</source>
         <translation>add a new host to the system</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
+        <location filename="../www/machine.php" line="32"/>
         <source>deletehost</source>
         <translation>delete a host</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>geteventlist</source>
         <translation>get a list of events (overview)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>geteventdata</source>
         <translation>get detailed event data</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>seteventdata</source>
         <translation>change/create an event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>eventsummary</source>
         <translation>get summary data for a specific event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
+        <location filename="../www/machine.php" line="34"/>
         <source>cancelevent</source>
         <translation>cancel an event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
+        <location filename="../www/machine.php" line="36"/>
         <source>getroomdata</source>
         <translation>get detailed data about a room</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
+        <location filename="../www/machine.php" line="36"/>
         <source>setroomdata</source>
         <translation>change/create a room</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>getcustomerlist</source>
         <translation>get a list of customers</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>getcustomer</source>
         <translation>get detailed information about a customer</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>setcustomer</source>
         <translation>change/create a customer</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="26"/>
+        <location filename="../www/machine.php" line="38"/>
         <source>deletecustomer</source>
         <translation>delete a customer</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>checkorder</source>
         <translation>check whether an order would succeed in ordering or selling</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>createorder</source>
         <translation>create an order (as pre-ordered, unpaid items)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>createsale</source>
         <translation>create an order as sold and paid items</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="40"/>
         <source>getorderlist</source>
         <translation>get a list of orders (overview)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>getorder</source>
         <translation>get details about an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>orderpay</source>
         <translation>pay for an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>orderrefund</source>
         <translation>refund money from a cancelled or overpaid order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>ordershipped</source>
         <translation>mark an order as being shipped</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="41"/>
         <source>cancelorder</source>
         <translation>cancel an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="42"/>
         <source>orderbyticket</source>
         <translation>find an order by one of the tickets it contains</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="42"/>
         <source>getordersbyevents</source>
         <translation>get a list of all orders that contain tickets for an event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="27"/>
+        <location filename="../www/machine.php" line="42"/>
         <source>setordercomment</source>
         <translation>change the comment of an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>getticket</source>
         <translation>get details about a ticket</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>useticket</source>
         <translation>mark a ticket as used</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>changeticketprice</source>
         <translation>change the price of a specific ticket (automatically changes price of the order)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="28"/>
+        <location filename="../www/machine.php" line="47"/>
         <source>ticketreturn</source>
         <translation>return a ticket unused</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
+        <location filename="../www/machine.php" line="51"/>
         <source>gettemplatelist</source>
         <translation>get a list of templates stored at the server (necessary for printing)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
+        <location filename="../www/machine.php" line="51"/>
         <source>gettemplate</source>
         <translation>get a specific template (necessary for printing)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
+        <location filename="../www/machine.php" line="51"/>
         <source>settemplate</source>
         <translation>store a new template at the server</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="33"/>
+        <location filename="../www/machine.php" line="56"/>
         <source>_admin</source>
         <translation>administrator, implies all other privileges</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
+        <location filename="../www/machine.php" line="57"/>
         <source>_anyshipping</source>
         <translation>user has the right to use any shipping method</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
+        <location filename="../www/machine.php" line="58"/>
         <source>_repriceshipping</source>
         <translation>user has the right to change the shipping price of an order regardless of shipping type</translation>
     </message>
+    <message>
+        <location filename="../www/machine.php" line="40"/>
+        <source>createreservedorder</source>
+        <translation>create an order as reservation (tickets blocked, but not usable until really ordered)</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="42"/>
+        <source>orderchangeshipping</source>
+        <translation>change the shipping method of an order</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="43"/>
+        <source>reservationtoorder</source>
+        <translation>change a reservation into a normal order</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="43"/>
+        <source>reservationtosale</source>
+        <translation>change a reservation into a sale (order that is already paid)</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="45"/>
+        <source>getshipping</source>
+        <translation>get shipping methods</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="45"/>
+        <source>setshipping</source>
+        <translation>create/change shipping methods</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="45"/>
+        <source>deleteshipping</source>
+        <translation>delete a shipping method</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>getvoucherprices</source>
+        <translation>get the allowed voucher prices</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>cancelvoucher</source>
+        <translation>cancel (give back) a voucher (price and value go to zero)</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>emptyvoucher</source>
+        <translation>make a voucher invalid (remaining value goes to zero, price remains)</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>usevoucher</source>
+        <translation>use a voucher to pay for an order</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="49"/>
+        <source>getvoucher</source>
+        <translation>get details about a voucher</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="51"/>
+        <source>settemplatedescription</source>
+        <translation>set a new description for a template</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="53"/>
+        <source>deletetemplate</source>
+        <translation>delete a template (variant)</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="59"/>
+        <source>_anyvoucher</source>
+        <translation>user may create vouchers with any value/price</translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="61"/>
+        <source>_anypricevoucher</source>
+        <translation>user may create vouchers for which price and value differ</translation>
+    </message>
 </context>
 <context>
     <name>initkey</name>
@@ -2516,6 +3111,27 @@ At least %1 Bits of random are required.</source>
     </message>
 </context>
 <context>
+    <name>misc</name>
+    <message>
+        <location filename="misc.cpp" line="35"/>
+        <source>%1.%2</source>
+        <comment>price with decimal dot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="misc.cpp" line="41"/>
+        <source>.</source>
+        <comment>decimal dot in price</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="misc.cpp" line="48"/>
+        <source>[0-9]+\.[0-9]{2}</source>
+        <comment>regexp for price</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>php::</name>
     <message>
         <location filename="../www/inc/classes/customer.php" line="259"/>
@@ -2573,77 +3189,77 @@ At least %1 Bits of random are required.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="526"/>
+        <location filename="../www/inc/classes/order.php" line="795"/>
         <source>Cannot place order, sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="537"/>
+        <location filename="../www/inc/classes/order.php" line="785"/>
         <source>Cannot place sale, sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="542"/>
+        <location filename="../www/inc/classes/order.php" line="800"/>
         <source>Internal Error: unknown action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="600"/>
+        <location filename="../www/inc/classes/order.php" line="868"/>
         <source>No such orderID in database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="611"/>
+        <location filename="../www/inc/classes/order.php" line="879"/>
         <source>Expected 2 arguments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="617"/>
+        <location filename="../www/inc/classes/order.php" line="885"/>
         <source>Invalid Order ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="623"/>
+        <location filename="../www/inc/classes/order.php" line="891"/>
         <source>Expected positive amount.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="632"/>
+        <location filename="../www/inc/classes/order.php" line="900"/>
         <source>Order does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="638"/>
+        <location filename="../www/inc/classes/order.php" line="906"/>
         <source>Order cannot be changed, it is closed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="680"/>
+        <location filename="../www/inc/classes/order.php" line="953"/>
         <source>Order ID must be numeric.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="690"/>
+        <location filename="../www/inc/classes/order.php" line="963"/>
         <source>Order ID is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="671"/>
+        <location filename="../www/inc/classes/order.php" line="944"/>
         <source>Wrong state, cannot set order to shipped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="696"/>
+        <location filename="../www/inc/classes/order.php" line="969"/>
         <source>Wrong state, cannot set order to cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="707"/>
+        <location filename="../www/inc/classes/order.php" line="980"/>
         <source>Ticket not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="711"/>
+        <location filename="../www/inc/classes/order.php" line="984"/>
         <source>Ticket has no order.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2778,44 +3394,116 @@ At least %1 Bits of random are required.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="36"/>
+        <location filename="../www/inc/machine/template.php" line="42"/>
         <source>Template File not found in database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="47"/>
+        <location filename="../www/inc/machine/template.php" line="83"/>
         <source>Unable to find file name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="55"/>
+        <location filename="../www/inc/machine/template.php" line="91"/>
         <source>Illegal File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
+        <location filename="../www/machine.php" line="68"/>
         <source>Invalid Request, please use the MagicSmoke Client with this page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="94"/>
+        <location filename="../www/machine.php" line="122"/>
         <source>Invalid or missing sessionid, or session timed out.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="106"/>
+        <location filename="../www/machine.php" line="134"/>
         <source>Session not yet authenticated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="118"/>
+        <location filename="../www/machine.php" line="146"/>
         <source>You do not have the right to execute this transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="367"/>
+        <location filename="../www/machine.php" line="467"/>
         <source>Internal Error: unknown command, hiccup in code structure.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="406"/>
+        <source>invalidvalue</source>
+        <comment>voucher state</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="412"/>
+        <source>invalidprice</source>
+        <comment>voucher state</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="433"/>
+        <source>Shipping type not available to user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="450"/>
+        <source>Illegal shipping type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="911"/>
+        <source>Order cannot be paid for, it is only a reservation. Order or sell it first!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1051"/>
+        <source>Unable to update order comment.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1195"/>
+        <source>Invalid Order.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1091"/>
+        <source>Invalid Shipping Method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1157"/>
+        <source>Unable to create new shipping method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1166"/>
+        <source>Unable to change shipping method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1179"/>
+        <source>Expected a numeric shipping ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1184"/>
+        <source>Unable to delete shipping method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/classes/order.php" line="1202"/>
+        <source>Cannot change order from reservation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/template.php" line="98"/>
+        <source>Template file does not exist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
-- 
1.7.2.5