From cda43787ec2c0c8b9104746c65ec1a42f0529028 Mon Sep 17 00:00:00 2001
From: konrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Date: Mon, 24 May 2010 18:17:31 +0000
Subject: [PATCH] update of server side translations for machine iface

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@471 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
---
 www/translations/Makefile     |    7 +-
 www/translations/server_de.ts | 2774 ++++++++++++++++++++++-------------------
 www/translations/server_en.ts | 1452 +++++++++++++++-------
 www/translations/unify.xsl    |    9 +-
 4 files changed, 2475 insertions(+), 1767 deletions(-)

diff --git a/www/translations/Makefile b/www/translations/Makefile
index 0d820ac..187a932 100644
--- a/www/translations/Makefile
+++ b/www/translations/Makefile
@@ -1,7 +1,6 @@
 LUP=lupdate
 LRL=lrelease
-#XPT=xmlpatterns
-XPT=xsltproc
+XPT=xmlpatterns
 
 all:
 	@echo Please chose a target: lupdate lrelease
@@ -10,12 +9,10 @@ lupdate:
 	$(LUP) -extensions php .. -ts server_*.ts
 
 lrelease:
-	echo 'TRANSLATIONS=\' >server.pro
 	for i in server_*.ts ; do \
 		$(XPT) unify.xsl $$i > _$$i ; \
-		echo _$$i '\' >>server.pro ; \
+		$(LRL) _$$i ; \
 	done
-	$(LRL) server.pro
 
 clean:
 	rm -f server.pro _server_*
diff --git a/www/translations/server_de.ts b/www/translations/server_de.ts
index 92e0fc1..ca1260e 100644
--- a/www/translations/server_de.ts
+++ b/www/translations/server_de.ts
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="de">
+<!DOCTYPE TS>
+<TS version="2.0" language="de">
 <context>
     <name></name>
     <message>
-        <location filename="../inc/wob/wo_Voucher.php" line="71"/>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="142"/>
         <source>Sold</source>
         <translation type="obsolete">Verkauft</translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="89"/>
         <source>Reserved</source>
         <translation type="obsolete">Reserviert</translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="91"/>
         <source>Used</source>
         <translation type="obsolete">Benutzt</translation>
     </message>
@@ -26,47 +23,38 @@
 <context>
     <name>MBackupDialog</name>
     <message>
-        <location filename="overview.cpp" line="1591"/>
         <source>Backup Settings</source>
         <translation type="obsolete">Einstellungen Sicherungskopie</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1596"/>
         <source>Backup File:</source>
         <translation type="obsolete">Sicherungskopie Datei:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1598"/>
         <source>...</source>
         <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1601"/>
         <source>Generations to keep:</source>
         <translation type="obsolete">Anzahl Generationen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1606"/>
         <source>Automatic Backup:</source>
         <translation type="obsolete">Automatische Sicherung:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1610"/>
         <source>Interval in days:</source>
         <translation type="obsolete">Intervall in Tagen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1618"/>
         <source>&amp;OK</source>
         <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1621"/>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1627"/>
         <source>Backup File</source>
         <translation type="obsolete">Sicherungsdatei</translation>
     </message>
@@ -74,12 +62,10 @@
 <context>
     <name>MCentDialog</name>
     <message>
-        <location filename="centbox.cpp" line="105"/>
         <source>OK</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="centbox.cpp" line="108"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
@@ -87,12 +73,10 @@
 <context>
     <name>MCheckDialog</name>
     <message>
-        <location filename="checkdlg.cpp" line="33"/>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="checkdlg.cpp" line="35"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
@@ -100,47 +84,38 @@
 <context>
     <name>MCustomerDialog</name>
     <message>
-        <location filename="customer.cpp" line="374"/>
         <source>Customer %1</source>
         <translation type="obsolete">Kunde %1</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="376"/>
         <source>New Customer</source>
         <translation type="obsolete">Neuer Kunde</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="382"/>
         <source>Name:</source>
         <translation type="obsolete">Name:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="384"/>
         <source>Address:</source>
         <translation type="obsolete">Rechnungsadresse:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="387"/>
         <source>Contact Information:</source>
         <translation type="obsolete">Kontaktinformationen:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="391"/>
         <source>Web-Login/eMail:</source>
         <translation type="obsolete">Web-Login/eMail:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="394"/>
         <source>Comment:</source>
         <translation type="obsolete">Kommentar:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="402"/>
         <source>Save</source>
         <translation type="obsolete">Speichern</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="405"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
@@ -148,82 +123,66 @@
 <context>
     <name>MCustomerListDialog</name>
     <message>
-        <location filename="customer.cpp" line="201"/>
         <source>Select a Customer</source>
         <translation type="obsolete">Kunde auswählen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="203"/>
         <source>Customers</source>
         <translation type="obsolete">Kunden</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="224"/>
         <source>Details...</source>
         <translation type="obsolete">Details...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="226"/>
         <source>Create new...</source>
         <translation type="obsolete">Neu...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="229"/>
         <source>Delete...</source>
         <translation type="obsolete">Löschen...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="237"/>
         <source>Select</source>
         <translation type="obsolete">Auswählen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="240"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="243"/>
         <source>Close</source>
         <translation type="obsolete">Schließen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="324"/>
         <source>Delete Customer</source>
         <translation type="obsolete">Kunden Löschen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="327"/>
         <source>Really delete this customer (%1)?</source>
         <translation type="obsolete">Diesen Kunden (%1) wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="330"/>
         <source>merge with other entry:</source>
         <translation type="obsolete">mit anderem Eintrag vereinen:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="342"/>
         <source>&amp;Yes</source>
         <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="344"/>
         <source>&amp;No</source>
         <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="360"/>
         <source>Error</source>
         <translation type="obsolete">Fehler</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="356"/>
         <source>Failed to delete customer.</source>
         <translation type="obsolete">Kann Kunden nicht löschen.</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="360"/>
         <source>Failed to delete customer: %1</source>
         <translation type="obsolete">Kann Kunden nicht löschen: %1</translation>
     </message>
@@ -231,30 +190,25 @@
 <context>
     <name>MEvent</name>
     <message>
-        <location filename="event.cpp" line="186"/>
         <source>Event is not complete, cannot save.</source>
         <translation type="obsolete">Veranstaltung ist nicht komplett. Kann nicht speichern.</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="231"/>
         <source>[0-9]+\.[0-9]{2}</source>
         <comment>price validator regexp</comment>
         <translation type="obsolete">[0-9]+,[0-9]{2}</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="254"/>
         <source>.</source>
         <comment>price decimal dot</comment>
         <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="273"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
         <translation type="obsolete">ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="268"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation type="obsolete">d.M.yyyy</translation>
@@ -263,115 +217,93 @@
 <context>
     <name>MEventEditor</name>
     <message>
-        <location filename="eventedit.cpp" line="40"/>
         <source>Event Editor</source>
         <translation type="obsolete">Veranstaltungseditor</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="58"/>
         <source>Title:</source>
         <translation type="obsolete">Titel:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="63"/>
         <source>Artist:</source>
         <translation type="obsolete">Künstler:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="68"/>
         <source>Description:</source>
         <translation type="obsolete">Beschreibung:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="73"/>
         <source>Start Time:</source>
         <translation type="obsolete">Startzeit:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="84"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
         <translation type="obsolete">ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="81"/>
         <source>End Time:</source>
         <translation type="obsolete">Endzeit:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="89"/>
         <source>Room/Place:</source>
         <translation type="obsolete">Raum/Ort:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="98"/>
         <source>Capacity:</source>
         <translation type="obsolete">Sitzplätze:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="104"/>
         <source>Default Price:</source>
         <translation type="obsolete">Kartenpreis:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="110"/>
         <source>Event Cancelled:</source>
         <translation type="obsolete">Veranstaltung absagen:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="122"/>
         <source>Save</source>
         <translation type="obsolete">Speichern</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="170"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="145"/>
         <source>Warning</source>
         <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="34"/>
         <source>Unable to load event from server.</source>
         <translation type="obsolete">Veranstaltung kann nicht vom Server geladen werden.</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="145"/>
         <source>Problem while uploading event: %s</source>
         <translation type="obsolete">Problem beim anlegen der Veranstaltung: %s</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="154"/>
         <source>Select a Room</source>
         <translation type="obsolete">Raum auswählen</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="165"/>
         <source>New...</source>
         <comment>new room</comment>
         <translation type="obsolete">Neu...</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="168"/>
         <source>Select</source>
         <comment>select room</comment>
         <translation type="obsolete">Auswählen</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="181"/>
         <source>New Room</source>
         <translation type="obsolete">Neuer Raum</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="181"/>
         <source>Name of new room:</source>
         <translation type="obsolete">Name des Raumes:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="53"/>
         <source>ID:</source>
         <translation type="obsolete">ID:</translation>
     </message>
@@ -379,139 +311,112 @@
 <context>
     <name>MEventSummary</name>
     <message>
-        <location filename="eventsummary.cpp" line="38"/>
         <source>Summary for Event %1</source>
         <translation type="obsolete">Übersicht zu Veranstaltung %1</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="48"/>
         <source>Title:</source>
         <translation type="obsolete">Titel:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="50"/>
         <source>Artist:</source>
         <translation type="obsolete">Künstler:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="52"/>
         <source>Start:</source>
         <translation type="obsolete">Beginn:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>Date+Time format for displaying event start time</comment>
         <translation type="obsolete">ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="54"/>
         <source>Capacity:</source>
         <translation type="obsolete">Sitzplätze:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="56"/>
         <source>Tickets currently reserved:</source>
         <translation type="obsolete">Momentan reservierte Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="58"/>
         <source>Tickets currently cancelled:</source>
         <translation type="obsolete">Momentan abgesagte Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="60"/>
         <source>Tickets currently usable:</source>
         <translation type="obsolete">Momentan nutzbare Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="62"/>
         <source>Total Income:</source>
         <translation type="obsolete">erwarteter Umsatz:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="72"/>
         <source>Price</source>
         <translation type="obsolete">Preis</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="72"/>
         <source>Bought</source>
         <translation type="obsolete">Gekauft</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="72"/>
         <source>Used</source>
         <translation type="obsolete">Benutzt</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="72"/>
         <source>Unused</source>
         <translation type="obsolete">Unbenutzt</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="101"/>
         <source>Print</source>
         <translation type="obsolete">Drucken</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="103"/>
         <source>Save as...</source>
         <translation type="obsolete">Speichern unter...</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="106"/>
         <source>Close</source>
         <translation type="obsolete">Schließen</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="186"/>
         <source>Warning</source>
         <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (eventsummary.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="44"/>
         <source>Summary</source>
         <translation type="obsolete">Zusammenfassung</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="67"/>
         <source>Tickets</source>
         <translation type="obsolete">Karten</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="83"/>
         <source>Comments</source>
         <translation type="obsolete">Kommentare</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="89"/>
         <source>Order: </source>
         <translation type="obsolete">Bestellung:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="91"/>
         <source>Customer: </source>
         <translation type="obsolete">Kunde:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="186"/>
         <source>Unable to get template file (eventsummary). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (eventsummary) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="193"/>
         <source>Open Document File (*.%1)</source>
         <translation type="obsolete">ODF Datei (*.%1)</translation>
     </message>
@@ -519,7 +424,6 @@
 <context>
     <name>MKeyGen</name>
     <message numerus="yes">
-        <location filename="keygen.cpp" line="88"/>
         <source>Current random buffer: %n Bits</source>
         <translation type="obsolete">
             <numerusform>Aktueller Zufallspuffer: %n Bit</numerusform>
@@ -527,24 +431,20 @@
         </translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="42"/>
         <source>Magic Smoke Key Generator</source>
         <translation type="obsolete">Magic Smoke Schlüsselgenerator</translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="53"/>
         <source>&lt;html&gt;&lt;h1&gt;Key Generation&lt;/h1&gt;
 I am currently collecting random bits in order to generate a host key for this installation. Please use mouse and keyboard to generate more random. Alternatively you can load a key from an external medium.&lt;p&gt;
 At least %1 Bits of random are required.</source>
         <translation type="obsolete">&lt;html&gt;&lt;h1&gt;Schlüsselgenerierung&lt;/h1&gt;Das Programm sammelt gerade Zufallsbits für diese Installation. Bitte benutzen Sie Maus und Tastatur, um mehr Zufall zu generieren. Alternativ können Sie auch einen fertigen Schlüssel von einem externen Medium laden.&lt;p&gt;Mindestens %1 Zufallsbits werden gebraucht.</translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="69"/>
         <source>&amp;OK</source>
         <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="71"/>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Abbrechen</translation>
     </message>
@@ -552,68 +452,55 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MLabelDialog</name>
     <message>
-        <location filename="labeldlg.cpp" line="40"/>
         <source>Label Printing Setup</source>
         <translation type="obsolete">Etikettendruck einrichten</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="49"/>
         <source>mm</source>
         <comment>defaultmetric: mm, in, cm</comment>
         <translation type="obsolete">mm</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="75"/>
         <source>Label offset:</source>
         <translation type="obsolete">Seitenrand:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="81"/>
         <source>Label size:</source>
         <translation type="obsolete">Etikettengröße:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="87"/>
         <source>Unit:</source>
         <translation type="obsolete">Einheit:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="89"/>
         <source>Millimeter</source>
         <translation type="obsolete">Millimeter</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="90"/>
         <source>Centimeter</source>
         <translation type="obsolete">Zentimeter</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="91"/>
         <source>Inch</source>
         <translation type="obsolete">Zoll</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="99"/>
         <source>Page usage:</source>
         <translation type="obsolete">Seitennutzung:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="102"/>
         <source>Page %1</source>
         <translation type="obsolete">Seite %1</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="146"/>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="150"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="303"/>
         <source>Warning: the label may not fit on the page!</source>
         <translation type="obsolete">Warnung: der Aufkleber könnte größer als die eingestellte Seite sein!</translation>
     </message>
@@ -621,187 +508,150 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MMainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="66"/>
         <source>Profile:</source>
         <translation type="obsolete">Profil:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="70"/>
         <source>Alternate Hostname:</source>
         <translation type="obsolete">ALternativer Hostname:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="73"/>
         <source>Server URL:</source>
         <translation type="obsolete">Server-URL:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="76"/>
         <source>Proxy:</source>
         <translation type="obsolete">Proxy:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="97"/>
         <source>Username:</source>
         <translation type="obsolete">Benutzername:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="100"/>
         <source>Password:</source>
         <translation type="obsolete">Passwort:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="191"/>
         <source>New Profile</source>
         <translation type="obsolete">Neues Profil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="191"/>
         <source>Please enter a profile name. It must be non-empty and must not be used yet:</source>
         <translation type="obsolete">Bitte geben Sie einen Profilnamen ein (mind. 1 Zeichen):</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="85"/>
         <source>Proxy Username:</source>
         <translation type="obsolete">Nutzername Proxy:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="88"/>
         <source>Proxy Password:</source>
         <translation type="obsolete">Passwort Proxy:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="322"/>
         <source>Warning</source>
         <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="216"/>
         <source>Unable to log in. Error: %1</source>
         <translation type="obsolete">Login fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="45"/>
         <source>&amp;File</source>
         <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="46"/>
         <source>&amp;New Profile...</source>
         <translation type="obsolete">&amp;Neues Profil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="47"/>
         <source>&amp;Save Profile</source>
         <translation type="obsolete">Profil &amp;speichern</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="49"/>
         <source>&amp;Close Window</source>
         <translation type="obsolete">&amp;Fenster schließen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="50"/>
         <source>&amp;Configure</source>
         <translation type="obsolete">&amp;Konfigurieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="109"/>
         <source>new Profile</source>
         <translation type="obsolete">Neues Profil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="111"/>
         <source>save Profile</source>
         <translation type="obsolete">Profil speichern</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="114"/>
         <source>Login</source>
         <translation type="obsolete">Login</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="51"/>
         <source>&amp;Language...</source>
         <translation type="obsolete">&amp;Sprache</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="53"/>
         <source>&amp;Export Host Key...</source>
         <translation type="obsolete">Hostkey &amp;exportieren...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="54"/>
         <source>&amp;Import Host Key...</source>
         <translation type="obsolete">Hostkey &amp;importieren...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="55"/>
         <source>&amp;Generate Host Key...</source>
         <translation type="obsolete">Hostkey &amp;generieren...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="263"/>
         <source>Export Key to File</source>
         <translation type="obsolete">Key als Datei speichern</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation type="obsolete">Datei %1 kann zum Schreiben nicht geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="283"/>
         <source>Importing a key overwrites the host key that is currently used by this program. This may disable your accounts. Do you still want to continue?</source>
         <translation type="obsolete">Der Import eines Keys überschreibt den aktuellen Key des Programms. Dies könnte Ihre Accounts unbenutzbar machen. Trotzdem fortfahren?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="286"/>
         <source>Import Key from File</source>
         <translation type="obsolete">Key aus Datei importieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="295"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation type="obsolete">Datei %1 kann zum Lesen nicht geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="307"/>
         <source>This is not a host key file.</source>
         <translation type="obsolete">Dies ist keine Hostkeydatei.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="317"/>
         <source>This host key file does not contain a valid key.</source>
         <translation type="obsolete">Diese Datei enthält keinen gültigen Hostkey.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="322"/>
         <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
         <translation type="obsolete">Die Checksumme dieser Datei ist fehlgeschlagen. Bitte besorgen Sie eine neue Kopie der Datei.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="248"/>
         <source>New Host Name</source>
         <translation type="obsolete">Neuer Hostname</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="248"/>
         <source>Please enter a name for the new host:</source>
         <translation type="obsolete">Bitte geben Sie einen Hostnamen ein:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="251"/>
         <source>The host name must only consist of letters, digits and underscore. It must start with a letter.</source>
         <translation type="obsolete">Der Hostname darf nur aus Buchstaben, Ziffern und Unterstrich bestehen.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="312"/>
         <source>This host key file does not contain a valid host name.</source>
         <translation type="obsolete">Die Hostkeydatei enthält keinen gültigen Hostnamen.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="57"/>
         <source>&amp;OpenOffice.org Settings...</source>
         <translation type="obsolete">OpenOffice Einstellungen...</translation>
     </message>
@@ -809,12 +659,10 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MMoneyLog</name>
     <message>
-        <location filename="moneylog.cpp" line="27"/>
         <source>Money Log of %1 %2</source>
         <translation type="obsolete">Geldtransfers von %1 %2</translation>
     </message>
     <message>
-        <location filename="moneylog.cpp" line="40"/>
         <source>Close</source>
         <translation type="obsolete">Schließen</translation>
     </message>
@@ -822,78 +670,63 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOfficeConfig</name>
     <message>
-        <location filename="office.cpp" line="102"/>
         <source>Configure OpenOffice.org Access</source>
         <translation type="obsolete">Zugriff auf OpenOffice Konfigurieren</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="112"/>
         <source>OpenOffice.org</source>
         <translation type="obsolete">OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="114"/>
         <source>Path to Executable:</source>
         <translation type="obsolete">Pfad zum Programm:</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="116"/>
         <source>...</source>
         <comment>select OpenOffice path button</comment>
         <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="119"/>
         <source>Printing ODF</source>
         <translation type="obsolete">ODF Drucken</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="122"/>
         <source>Printer:</source>
         <translation type="obsolete">Drucker:</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="125"/>
         <source>(Default Printer)</source>
         <translation type="obsolete">(Standarddrucker)</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="135"/>
         <source>Always confirm printer when printing ODF</source>
         <translation type="obsolete">Drucker bestägen, wenn ODF gedruckt wird.</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="137"/>
         <source>Save printed files</source>
         <translation type="obsolete">Gedruckte Dateien auch speichern</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="140"/>
         <source>Opening ODF</source>
         <translation type="obsolete">ODF Öffnen</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="142"/>
         <source>Always open as Read-Only</source>
         <translation type="obsolete">Immer im Nur-Lese-Modus öffnen</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="144"/>
         <source>Automatically open all newly created files</source>
         <translation type="obsolete">Alle neuen Dateien automatisch öffnen</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="150"/>
         <source>OK</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="153"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="173"/>
         <source>Select OpenOffice.org executable</source>
         <translation type="obsolete">OpenOffice.org Programm wählen</translation>
     </message>
@@ -901,115 +734,95 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrder</name>
     <message>
-        <location filename="order.cpp" line="122"/>
         <source>placed</source>
         <comment>state</comment>
         <translation type="obsolete">bestellt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="123"/>
         <source>sent</source>
         <comment>state</comment>
         <translation type="obsolete">versandt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="124"/>
         <source>cancelled</source>
         <comment>state</comment>
         <translation type="obsolete">storniert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="125"/>
         <source>closed</source>
         <comment>state</comment>
         <translation type="obsolete">geschlossen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="127"/>
         <source>check: ok</source>
         <comment>state</comment>
         <translation type="obsolete">Prüfung: ok</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="128"/>
         <source>check: sale only</source>
         <comment>state</comment>
         <translation type="obsolete">Prüfung: nur verkaufen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="129"/>
         <source>check: order only</source>
         <comment>state</comment>
         <translation type="obsolete">Prüfung: nur bestellen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="130"/>
         <source>check: failed</source>
         <comment>state</comment>
         <translation type="obsolete">Prüfung: nicht möglich</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="131"/>
         <source>invalid</source>
         <comment>state</comment>
         <translation type="obsolete">ungültig</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="377"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
         <translation type="obsolete">ddd, dd.MM.yyyy hh:mm &apos;Uhr&apos;</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="390"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation type="obsolete">d.M.yyyy</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="445"/>
         <source>This ticket is not part of this order.</source>
         <translation type="obsolete">Dieses Ticket ist in keiner Bestellung enthalten.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="531"/>
         <source>Error</source>
         <translation type="obsolete">Fehler</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="527"/>
         <source>The request failed.</source>
         <translation type="obsolete">Anfrage ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="531"/>
         <source>A problem occurred during the order: %1</source>
         <translation type="obsolete">Die Bestellung ist fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="126"/>
         <source>reserved</source>
         <comment>state</comment>
         <translation type="obsolete">reserviert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="454"/>
         <source>Cannot query DB, don&apos;t know it.</source>
         <translation type="obsolete">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 type="obsolete">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 type="obsolete">Dieser Gutschein ist nicht Teil der Bestellung.</translation>
     </message>
@@ -1017,17 +830,14 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrderItemView</name>
     <message>
-        <location filename="orderwin.cpp" line="981"/>
         <source>Preview Tickets</source>
         <translation type="obsolete">Karten-Vorschau</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="990"/>
         <source>Ticket: </source>
         <translation type="obsolete">Eintrittskarte:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="992"/>
         <source>Voucher: </source>
         <translation type="obsolete">Gutschein:</translation>
     </message>
@@ -1035,487 +845,390 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrderWindow</name>
     <message>
-        <location filename="orderwin.cpp" line="50"/>
         <source>Order Details</source>
         <translation type="obsolete">Bestelldetails</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="55"/>
         <source>&amp;Order</source>
         <translation type="obsolete">&amp;Bestellung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="56"/>
         <source>&amp;Order...</source>
         <translation type="obsolete">&amp;Bestellung...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="59"/>
         <source>&amp;Sell...</source>
         <translation type="obsolete">&amp;Verkauf...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="67"/>
         <source>C&amp;ancel Order...</source>
         <translation type="obsolete">Bestellung &amp;Stornieren...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="86"/>
         <source>&amp;Close</source>
         <translation type="obsolete">S&amp;chließen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="88"/>
         <source>&amp;Payment</source>
         <translation type="obsolete">&amp;Bezahlung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="90"/>
         <source>Receive &amp;Payment...</source>
         <translation type="obsolete">&amp;bezahlen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="92"/>
         <source>&amp;Refund...</source>
         <translation type="obsolete">&amp;zurückgeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="97"/>
         <source>P&amp;rinting</source>
         <translation type="obsolete">&amp;Druck</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="99"/>
         <source>Print &amp;Bill...</source>
         <translation type="obsolete">&amp;Rechnung drucken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="100"/>
         <source>Save Bill &amp;as file...</source>
         <translation type="obsolete">Rechnung &amp;speichern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="102"/>
         <source>Print &amp;Tickets...</source>
         <translation type="obsolete">&amp;Eintrittskarten drucken...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Print &amp;Current Ticket...</source>
         <translation type="obsolete">markierte Eintrittskarte drucken</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;View Tickets...</source>
         <translation type="obsolete">Eintrittskarten &amp;ansehen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="116"/>
         <source>Order ID:</source>
         <translation type="obsolete">Bestell-Nr.:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="118"/>
         <source>Order Date:</source>
         <translation type="obsolete">Bestelldatum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="120"/>
         <source>Shipping Date:</source>
         <translation type="obsolete">Versandtdatum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="122"/>
         <source>Customer:</source>
         <translation type="obsolete">Kunde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="127"/>
         <source>Sold by:</source>
         <translation type="obsolete">Verkauft durch:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="129"/>
         <source>Total Price:</source>
         <translation type="obsolete">Gesamtpreis:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="131"/>
         <source>Already Paid:</source>
         <translation type="obsolete">bereits bezahlt:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="133"/>
         <source>Order State:</source>
         <translation type="obsolete">Bestellstatus:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ticket ID</source>
         <translation type="obsolete">Karten-Nr.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Event</source>
         <translation type="obsolete">Veranstaltung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Start Time</source>
         <translation type="obsolete">Anfangszeit</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Status</source>
         <translation type="obsolete">Status</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Price</source>
         <translation type="obsolete">Preis</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="69"/>
         <source>&amp;Mark Order as Shipped...</source>
         <translation type="obsolete">Bestellung als versandt markieren...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ch&amp;ange Ticket-Price...</source>
         <translation type="obsolete">Kartenpreis ändern...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Return Ticket...</source>
         <translation type="obsolete">Karte zurückgeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="972"/>
         <source>Warning</source>
         <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="275"/>
         <source>Unable to get template file (ticket.xtt). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (ticket.xtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (bill.odtt). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (bill.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="878"/>
         <source>Mark as shipped?</source>
         <translation type="obsolete">Als versandt markieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="878"/>
         <source>Mark this order as shipped now?</source>
         <translation type="obsolete">Diese Bestellung jetzt als versandt markieren?</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (eventsummary.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="649"/>
         <source>Enter Payment</source>
         <translation type="obsolete">Zahlbetrag eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="649"/>
         <source>Please enter the amount that has been paid:</source>
         <translation type="obsolete">Bitte geben Sie den Betrag ein, der bezahlt wurde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="682"/>
         <source>Unable to submit payment request.</source>
         <translation type="obsolete">Kann Bestellung nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="686"/>
         <source>Error while trying to pay: %1</source>
         <translation type="obsolete">Fehler während der Bezahlung: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="704"/>
         <source>Enter Refund</source>
         <translation type="obsolete">Rückgabe eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="704"/>
         <source>Please enter the amount that will be refunded:</source>
         <translation type="obsolete">Bitte geben Sie den Betrag ein, der zurückgegeben wird:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="710"/>
         <source>Unable to submit refund request.</source>
         <translation type="obsolete">Kann Rückgabe nicht übermitteln.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="714"/>
         <source>Error whily trying to refund: %1</source>
         <translation type="obsolete">Fehler während der Rückgabe: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="774"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation type="obsolete">Diese Karte kann nicht zurückgegeben werden: sie wurde bereits verwendet.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="778"/>
         <source>Return Ticket</source>
         <translation type="obsolete">Karte zurückgeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="778"/>
         <source>Do you really want to return this ticket?</source>
         <translation type="obsolete">Wollen Sie diese Karte wirklich zurückgeben?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="811"/>
         <source>Cancel Order?</source>
         <translation type="obsolete">Bestellung stornieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="811"/>
         <source>Cancel this order now?</source>
         <translation type="obsolete">Diese Bestellung jetzt stornieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="813"/>
         <source>Cannot cancel this order: it is in the wrong state.</source>
         <translation type="obsolete">Diese Bestellung kann nicht: sie ist im falschen Zustand.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="817"/>
         <source>Failed to cancel this order.</source>
         <translation type="obsolete">Kann diese Bestellung nicht stornieren. Schade.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="124"/>
         <source>Delivery Address:</source>
         <translation type="obsolete">Lieferadresse:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="139"/>
         <source>Order Comment:</source>
         <translation type="obsolete">Bestellkommentar:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="76"/>
         <source>Change Commen&amp;t...</source>
         <translation type="obsolete">Kommen&amp;tar ändern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="912"/>
         <source>Set comment: order %1</source>
         <translation type="obsolete">Kommentar ändern: Bestellung %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="923"/>
         <source>&amp;Save</source>
         <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="925"/>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="64"/>
         <source>&amp;Prune and recheck...</source>
         <translation type="obsolete">Ungültige Einträge entfernen und erneut checken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="62"/>
         <source>Ma&amp;ke Reservation...</source>
         <translation type="obsolete">Reservierung durchführen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="72"/>
         <source>Ch&amp;ange Item-Price...</source>
         <translation type="obsolete">Artikelpreis ändern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="74"/>
         <source>&amp;Return Item...</source>
         <translation type="obsolete">Artikel zurückgeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="78"/>
         <source>Change Sh&amp;ipping Method...</source>
         <translation type="obsolete">Versandoption ändern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="103"/>
         <source>Print V&amp;ouchers...</source>
         <translation type="obsolete">Gutscheine drucken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="104"/>
         <source>Print &amp;Current Item...</source>
         <translation type="obsolete">Aktuellen Artikel drucken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="105"/>
         <source>&amp;View Items...</source>
         <translation type="obsolete">Artikel ansehen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="135"/>
         <source>Shipping Method:</source>
         <translation type="obsolete">Versandoption:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="137"/>
         <source>Shipping Costs:</source>
         <translation type="obsolete">Versandkosten:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Item ID</source>
         <translation type="obsolete">Artikelnummer:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Description</source>
         <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="194"/>
         <source>Voucher (current value: %1)</source>
         <translation type="obsolete">Gutschein (aktueller Wert: %1)</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="269"/>
         <source>There are no tickets left to print.</source>
         <translation type="obsolete">Es gibt keine Eintrittskarten zu drucken.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="310"/>
         <source>There are no vouchers left to print.</source>
         <translation type="obsolete">Es gibt keine Gutscheine zu drucken.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="316"/>
         <source>Unable to get template file (voucher.xtt). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (voucher) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="414"/>
         <source>Unable to get template file (bill). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (bill) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (eventsummary). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (eventsummary) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="422"/>
         <source>Open Document File (*.%1)</source>
         <translation type="obsolete">ODF Datei (*.%1)</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="741"/>
         <source>Enter Price</source>
         <translation type="obsolete">Bitte Preis eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="741"/>
         <source>Please enter the new price for the ticket:</source>
         <translation type="obsolete">Bitte neuen Preis für die Eintrittskarte eingeben:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="747"/>
         <source>Cannot change this item type.</source>
         <translation type="obsolete">Diese Artikelart kann nicht geändert werden.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="795"/>
         <source>This voucher cannot be returned, it has already been used.</source>
         <translation type="obsolete">Diese Karte kann nicht zurückgegeben werden: sie wurde bereits verwendet.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="799"/>
         <source>Return Voucher</source>
         <translation type="obsolete">Gutschein zurückgeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="799"/>
         <source>Do you really want to return this voucher?</source>
         <translation type="obsolete">Wollen Sie diesen Gutschein wirklich zurückgeben?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="806"/>
         <source>Cannot return this item type.</source>
         <translation type="obsolete">Diese Artikelart kann nicht zurückgegeben werden.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="882"/>
         <source>Set shipping time</source>
         <translation type="obsolete">Versandzeit setzen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="888"/>
         <source>Enter the shipping time:</source>
         <translation type="obsolete">Bitte geben Sie die Versandzeit ein:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="894"/>
         <source>OK</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="896"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="81"/>
         <source>MoneyLog for Order...</source>
         <translation type="obsolete">Geldtransfers von Bestellung...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="83"/>
         <source>MoneyLog for selected Voucher...</source>
         <translation type="obsolete">Geldtransfers des selektierten Gutscheins...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="671"/>
         <source>Enter Voucher</source>
         <translation type="obsolete">Gutschein eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="671"/>
         <source>Please enter the ID of the voucher you want to use:</source>
         <translation type="obsolete">Bitte geben Sie die Nummer des Gutscheins ein, den Sie verwenden wollen:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="676"/>
         <source>This voucher is not valid.</source>
         <translation type="obsolete">Dieser Gutschein ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="695"/>
         <source>Voucher Info</source>
         <translation type="obsolete">Gutscheininformation</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="695"/>
         <source>Remaining value of this voucher: %1</source>
         <translation type="obsolete">Verbleibender Wert auf dem Gutschein: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="972"/>
         <source>This is not a voucher, cannot show the money log.</source>
         <translation type="obsolete">Dies ist kein Gutschein, kann keine Geldtransfers anzeigen.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="94"/>
         <source>Pay with &amp;Voucher...</source>
         <translation type="obsolete">Mit Gutschein bezahlen...</translation>
     </message>
@@ -1523,328 +1236,263 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOverview</name>
     <message>
-        <location filename="overview.cpp" line="80"/>
         <source>&amp;Session</source>
         <translation type="obsolete">&amp;Session</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="81"/>
         <source>&amp;Re-Login</source>
         <translation type="obsolete">&amp;Login wiederholen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="88"/>
         <source>&amp;Close Session</source>
         <translation type="obsolete">Session &amp;schließen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="90"/>
         <source>&amp;Event</source>
         <translation type="obsolete">&amp;Veranstaltung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="100"/>
         <source>&amp;Customer</source>
         <translation type="obsolete">&amp;Kunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="137"/>
         <source>Events</source>
         <translation type="obsolete">Veranstaltungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1545"/>
         <source>Warning</source>
         <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="411"/>
         <source>I was unable to renew the login at the server, the error was: %1</source>
         <translation type="obsolete">Der erneute Login ist fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="82"/>
         <source>&amp;Offline mode</source>
         <translation type="obsolete">&amp;Offlinemodus</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="93"/>
         <source>&amp;New Event...</source>
         <translation type="obsolete">&amp;Neue Veranstaltung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="101"/>
         <source>&amp;Show all customers</source>
         <translation type="obsolete">&amp;Alle Kunden anzeigen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="103"/>
         <source>C&amp;art</source>
         <translation type="obsolete">&amp;Einkaufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="104"/>
         <source>Add &amp;Ticket</source>
         <translation type="obsolete">Eintrittskarte &amp;hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="105"/>
         <source>Add &amp;Voucher</source>
         <translation type="obsolete">&amp;Gutschein hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="106"/>
         <source>&amp;Remove Item</source>
         <translation type="obsolete">&amp;Entfernen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="107"/>
         <source>&amp;Abort Shopping</source>
         <translation type="obsolete">&amp;Einkauf abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="147"/>
         <source>New Event...</source>
         <translation type="obsolete">Neue Veranstaltung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="239"/>
         <source>Details...</source>
         <translation type="obsolete">Details...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="154"/>
         <source>Order Ticket...</source>
         <translation type="obsolete">Bestellen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="168"/>
         <source>Shopping Cart</source>
         <translation type="obsolete">Einkaufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="180"/>
         <source>Add Ticket</source>
         <translation type="obsolete">Eintrittskarte hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="182"/>
         <source>Add Voucher</source>
         <translation type="obsolete">Gutschein hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="184"/>
         <source>Remove Item</source>
         <translation type="obsolete">Entfernen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="190"/>
         <source>Customer:</source>
         <translation type="obsolete">Kunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="199"/>
         <source>Delivery Address:</source>
         <translation type="obsolete">Lieferadresse:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="202"/>
         <source>Comments:</source>
         <translation type="obsolete">Kommentare:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="212"/>
         <source>Clear</source>
         <translation type="obsolete">Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="780"/>
         <source>Start Time</source>
         <translation type="obsolete">Anfangszeit</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="780"/>
         <source>Title</source>
         <translation type="obsolete">Titel</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="380"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
         <translation type="obsolete">ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="91"/>
         <source>&amp;Update Event List</source>
         <translation type="obsolete">&amp;Veranstaltungsliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="92"/>
         <source>&amp;Show/Edit details...</source>
         <translation type="obsolete">&amp;Details anzeigen/editieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="270"/>
         <source>Users</source>
         <translation type="obsolete">Nutzer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="278"/>
         <source>New User...</source>
         <translation type="obsolete">Neuer Nutzer...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="281"/>
         <source>Delete User...</source>
         <translation type="obsolete">Nutzer löschen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="285"/>
         <source>Description...</source>
         <translation type="obsolete">Beschreibung.,.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="288"/>
         <source>Hosts...</source>
         <translation type="obsolete">Hosts...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="291"/>
         <source>Roles...</source>
         <translation type="obsolete">Rechte...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="300"/>
         <source>Hosts</source>
         <translation type="obsolete">Hosts</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="482"/>
         <source>Login Name</source>
         <translation type="obsolete">Loginname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="482"/>
         <source>Description</source>
         <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="496"/>
         <source>New User</source>
         <translation type="obsolete">Neuer Nutzer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="496"/>
         <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
         <translation type="obsolete">Neuen Nutzernamen eingeben (Kleinbuchstaben, Ziffern, Unterstrich, Minus):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1008"/>
         <source>Error</source>
         <translation type="obsolete">Fehler</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="546"/>
         <source>Edit Description</source>
         <translation type="obsolete">Beschreibung ändern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="546"/>
         <source>Descriptionof user %1:</source>
         <translation type="obsolete">Beschreibung von Nutzer %1:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="83"/>
         <source>Change my &amp;Password</source>
         <translation type="obsolete">Mein &amp;Passwort ändern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="294"/>
         <source>Set Password...</source>
         <translation type="obsolete">Passwort setzen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="308"/>
         <source>New Host...</source>
         <translation type="obsolete">Neuer Host...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="311"/>
         <source>Add This Host...</source>
         <translation type="obsolete">Diesen Host hinzufügen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="314"/>
         <source>Delete Host...</source>
         <translation type="obsolete">Host löschen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="318"/>
         <source>Generate New Key...</source>
         <translation type="obsolete">Neuen Schlüssel anlegen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="321"/>
         <source>Import...</source>
         <translation type="obsolete">Importieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="324"/>
         <source>Export...</source>
         <translation type="obsolete">Exportieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="505"/>
         <source>Password</source>
         <translation type="obsolete">Passwort</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="505"/>
         <source>Please enter an initial password for the user:</source>
         <translation type="obsolete">Bitte geben Sie ein intiales Passwort ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="520"/>
         <source>Delete User?</source>
         <translation type="obsolete">Nutzer löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="520"/>
         <source>Really delete user &apos;%1&apos;?</source>
         <translation type="obsolete">Nutzer &apos;%1&apos; wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="589"/>
         <source>Error setting password: %1</source>
         <translation type="obsolete">Passwort kann nicht gesetzt werden: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="604"/>
         <source>The password must be non-empty and both lines must match</source>
         <translation type="obsolete">Das Passwort darf nicht leer sein und beide Zeilen müssen übereinstimmen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="620"/>
         <source>Host Name</source>
         <translation type="obsolete">Hostname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="620"/>
         <source>Host Key</source>
         <translation type="obsolete">Hostkey</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="637"/>
         <source>Create New Host</source>
         <translation type="obsolete">Neuen Host anlegen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="637"/>
         <source>Please enter a host name:</source>
         <translation type="obsolete">Bitte geben Sie einen neuen Hostnamen ein:</translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="645"/>
         <source>The key of this new host could only be generated with %n bits entropy. Store anyway?</source>
         <translation type="obsolete">
             <numerusform>Der Key dieses Hosts konnte nur mit %n Bit Entropie angelegt werden. Trotzdem speichern?</numerusform>
@@ -1852,27 +1500,22 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="668"/>
         <source>Delete this Host?</source>
         <translation type="obsolete">Diesen Host löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="668"/>
         <source>Really delete host &apos;%1&apos;?</source>
         <translation type="obsolete">Den Host &apos;%1&apos; wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="682"/>
         <source>Change Host Key?</source>
         <translation type="obsolete">Hostkey ändern?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="682"/>
         <source>Really change the key of host &apos;%1&apos;?</source>
         <translation type="obsolete">Den Key von Host &apos;%1&apos; wirklich ändern?</translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="687"/>
         <source>The new key of this host could only be generated with %n bits entropy. Store anyway?</source>
         <translation type="obsolete">
             <numerusform>Der Key dieses Hosts konnte nur mit %n Bit Entropie angelegt werden. Trotzdem speichern?</numerusform>
@@ -1880,726 +1523,582 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="698"/>
         <source>Import Key from File</source>
         <translation type="obsolete">Key aus Datei importieren</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="707"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation type="obsolete">Datei %1 kann nicht zum Lesen geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="719"/>
         <source>This is not a host key file.</source>
         <translation type="obsolete">Dies ist keine Hostkeydatei.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="724"/>
         <source>This host key file does not contain a valid host name.</source>
         <translation type="obsolete">Die Hostkeydatei enthält keinen gültigen Hostnamen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="729"/>
         <source>This host key file does not contain a valid key.</source>
         <translation type="obsolete">Diese Datei enthält keinen gültigen Hostkey.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="734"/>
         <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
         <translation type="obsolete">Die Checksumme dieser Datei ist fehlgeschlagen. Bitte besorgen Sie eine neue Kopie der Datei.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="752"/>
         <source>This host cannot be exported.</source>
         <translation type="obsolete">Dieser Host kann nicht exportiert werden.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="757"/>
         <source>Export Key to File</source>
         <translation type="obsolete">Hostkey als Datei speichern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="766"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation type="obsolete">Datei %1 kann nicht zum Schreiben geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="209"/>
         <source>Check Order</source>
         <translation type="obsolete">Bestellung prüfen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="216"/>
         <source>Order List</source>
         <translation type="obsolete">Bestellungsliste</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="220"/>
         <source>-select mode-</source>
         <translation type="obsolete">-Modus auswählen-</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="221"/>
         <source>All Orders</source>
         <translation type="obsolete">Alle Bestellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="222"/>
         <source>Open Orders</source>
         <translation type="obsolete">Offene Bestellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="224"/>
         <source>Outstanding Payments</source>
         <translation type="obsolete">Noch nicht bezahlt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="225"/>
         <source>Outstanding Refunds</source>
         <translation type="obsolete">Offene Rückerstattungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="780"/>
         <source>Amount</source>
         <translation type="obsolete">Anzahl</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="811"/>
         <source>Select Event to order Ticket</source>
         <translation type="obsolete">Bitte wählen Sie eine Verstaltung aus, um zu bestellen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="824"/>
         <source>Select</source>
         <translation type="obsolete">Auswählen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1378"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="942"/>
         <source>There is nothing in the order. Ignoring it.</source>
         <translation type="obsolete">Bestellung ist leer. Vorgang abgebrochen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="946"/>
         <source>Please chose a customer first!</source>
         <translation type="obsolete">Bitte wählen Sie zunächst einen Kunden aus!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1004"/>
         <source>The request failed.</source>
         <translation type="obsolete">Anfrage ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1008"/>
         <source>A problem occurred during the order: %1</source>
         <translation type="obsolete">Die Bestellung ist fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="258"/>
         <source>Entrance</source>
         <translation type="obsolete">Einlasskontrolle</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="158"/>
         <source>Event Summary...</source>
         <translation type="obsolete">Veranstaltungsübersicht...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="226"/>
         <source>Undelivered Orders</source>
         <translation type="obsolete">Nicht ausgelieferte Bestellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="236"/>
         <source>Update</source>
         <translation type="obsolete">Auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Status</source>
         <translation type="obsolete">Status</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Total</source>
         <translation type="obsolete">Gesamt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Paid</source>
         <translation type="obsolete">bezahlt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Customer</source>
         <translation type="obsolete">Kunde</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Upload Template...</source>
         <translation type="obsolete">Vorlage &amp;hochladen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="111"/>
         <source>&amp;Misc</source>
         <translation type="obsolete">&amp;Verschiedenes</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Return ticket...</source>
         <translation type="obsolete">&amp;Karte zurückgeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="162"/>
         <source>Cancel Event...</source>
         <translation type="obsolete">Veranstaltung absagen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="243"/>
         <source>Find by Ticket...</source>
         <translation type="obsolete">Mit Kartennummer suchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="458"/>
         <source>Cancel Event</source>
         <translation type="obsolete">Veranstaltung absagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="458"/>
         <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
         <translation type="obsolete">Bitte geben Sie einen Grund für die Absage der Veranstaltung &quot;%1&quot; ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="461"/>
         <source>Event Cancelled</source>
         <translation type="obsolete">Veranstaltung abgesagt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="461"/>
         <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
         <translation type="obsolete">Die Veranstaltung &quot;%1&quot; wurde abgesagt. Bitte informieren Sie alle Kunden.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="463"/>
         <source>Unable to cancel event &quot;%1&quot;.</source>
         <translation type="obsolete">Kann Veranstaltung &quot;%1&quot; nicht absagen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1082"/>
         <source>Ticket &quot;%1&quot; Not Valid</source>
         <translation type="obsolete">Karte &quot;%1&quot; ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1090"/>
         <source>Ticket &quot;%1&quot; has already been used</source>
         <translation type="obsolete">Karte &quot;%1&quot; wurde bereits verwendet.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1094"/>
         <source>Ticket &quot;%1&quot; has not been bought.</source>
         <translation type="obsolete">Karte &quot;%1&quot; wurde nicht gekauft.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1098"/>
         <source>Ticket &quot;%1&quot; Ok</source>
         <translation type="obsolete">Karte &quot;%1&quot; Okay.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1103"/>
         <source>Ticket &quot;%1&quot; Ok; the Order has a refund</source>
         <translation type="obsolete">Karte &quot;%1&quot; Okay.
 Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1108"/>
         <source>Ticket &quot;%1&quot; is not paid for!</source>
         <translation type="obsolete">Karte &quot;%1&quot; ist nicht bezahlt!!!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1111"/>
         <source>Ticket &quot;%1&quot; cannot be accepted, please check the order!</source>
         <translation type="obsolete">Karte &quot;%1&quot; kann nicht akzeptiert werden, bitte prüfen Sie die Bestellung.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1178"/>
         <source>Enter Ticket</source>
         <translation type="obsolete">Bitte Ticket eingeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1178"/>
         <source>Please enter the ID of one of the tickets of the order you seek:</source>
         <translation type="obsolete">Bitte geben Sie die Nr. einer Karte aus der gesuchten Bestellung ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1182"/>
         <source>Unable to query server.</source>
         <translation type="obsolete">Kann Server nicht abfragen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1191"/>
         <source>Server returned an invalid order ID.</source>
         <translation type="obsolete">Server hat eine ungültige Bestellnummer geliefert.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Please select a template file.</source>
         <translation type="obsolete">Bitte wählen Sie eine Vorlage aus.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Enter Template Name</source>
         <translation type="obsolete">Vorlagenname eingeben</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Please enter a name for the template file, it should contain only letters, digits, underscores and dots:</source>
         <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="" line="0"/>
         <source>The template name must only contain letters, digits, underscores and dots.</source>
         <translation type="obsolete">Der Vorlagenname darf nur Buchstaben, Ziffern, Unterstriche und Punkte enthalten.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Success</source>
         <translation type="obsolete">Erfolg</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Successfully uploaded the template.</source>
         <translation type="obsolete">Vorlage wurde erfolgreich hochgeladen.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to upload the template.</source>
         <translation type="obsolete">Kann Vorlage nicht hochladen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1317"/>
         <source>Return Ticket</source>
         <translation type="obsolete">Karte zurückgeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1317"/>
         <source>Please enter the ticket ID to return:</source>
         <translation type="obsolete">Bitte geben Sie die Karte ein, die zurückgegeben wird:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1321"/>
         <source>This is not a valid ticket.</source>
         <translation type="obsolete">Dies ist keine gültige Karte.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1326"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation type="obsolete">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="126"/>
         <source>&amp;Admin</source>
         <translation type="obsolete">&amp;Administration</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Schedule Backup...</source>
         <translation type="obsolete">&amp;Backupzeit festlegen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="129"/>
         <source>&amp;Backup now...</source>
         <translation type="obsolete">&amp;Jetzt Backup machen...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Restore...</source>
         <translation type="obsolete">Backup &amp;wiederherstellen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="228"/>
         <source>-search result-</source>
         <translation type="obsolete">-Suchresultat-</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="246"/>
         <source>Find by Event...</source>
         <translation type="obsolete">Nach Veranstaltung suchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="249"/>
         <source>Find by Customer...</source>
         <translation type="obsolete">Nach Kunde suchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="501"/>
         <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
         <translation type="obsolete">Nutzernamen dürfen nur Kleinbuchstaben, Ziffern, Punkte, Bindestriche und Unterstriche enthalten und müssen mindestens ein Zeichen lang sein!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1204"/>
         <source>Select Event</source>
         <translation type="obsolete">Veranstaltung auswählen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1216"/>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="373"/>
         <source>Capacity</source>
         <translation type="obsolete">Sitzplätze:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="373"/>
         <source>Sold</source>
         <translation type="obsolete">Verkauft</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="373"/>
         <source>Reserved</source>
         <translation type="obsolete">Reserviert</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="373"/>
         <source>Free</source>
         <translation type="obsolete">Frei</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="524"/>
         <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="obsolete">(Niemand)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="527"/>
         <source>Delete User</source>
         <translation type="obsolete">Nutzer Löschen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="527"/>
         <source>Select which user will inherit this users database objects:</source>
         <translation type="obsolete">Bitte wählen Sie einen Nutzer, der die Datenbankobjekte des gelöschten Nutzers erbt:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="532"/>
         <source>Cannot delete user: %1</source>
         <translation type="obsolete">Kann Nutzer nicht löschen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="95"/>
         <source>Show &amp;old Events</source>
         <translation type="obsolete">vergangene Veranstaltungen anzeigen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="122"/>
         <source>C&amp;onfigure</source>
         <translation type="obsolete">Konfigurieren</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="123"/>
         <source>&amp;Auto-Refresh settings...</source>
         <translation type="obsolete">Auto-Auffrisch-Einstellungen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1419"/>
         <source>Refresh Settings</source>
         <translation type="obsolete">Auffrischeinstellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1424"/>
         <source>Refresh Rate (minutes):</source>
         <translation type="obsolete">Auffrischrate (Minuten):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1430"/>
         <source>refresh &amp;event list</source>
         <translation type="obsolete">Veranstaltungsliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1432"/>
         <source>refresh &amp;user list</source>
         <translation type="obsolete">Nutzerliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1434"/>
         <source>refresh &amp;host list</source>
         <translation type="obsolete">Rechnerliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1494"/>
         <source>&amp;OK</source>
         <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1496"/>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="85"/>
         <source>&amp;Edit Templates...</source>
         <translation type="obsolete">Vorlagen ändern...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="86"/>
         <source>&amp;Update Templates Now</source>
         <translation type="obsolete">Vorlagen jetzt auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="109"/>
         <source>&amp;Update Shipping Options</source>
         <translation type="obsolete">Versandoptionen auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="112"/>
         <source>Return &amp;ticket...</source>
         <translation type="obsolete">Karte zurückgeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="113"/>
         <source>Return &amp;voucher...</source>
         <translation type="obsolete">Gutschein zurückgeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="115"/>
         <source>Edit &amp;Shipping Options...</source>
         <translation type="obsolete">Versandoptionen editieren</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="196"/>
         <source>Shipping Method:</source>
         <translation type="obsolete">Versandoption:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="223"/>
         <source>Open Reservations</source>
         <translation type="obsolete">Reservierungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="470"/>
         <source>(No Shipping)</source>
         <translation type="obsolete">(Kein Versand)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="874"/>
         <source>Select Voucher</source>
         <translation type="obsolete">Gutschein wählen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="885"/>
         <source>Select voucher price and value:</source>
         <translation type="obsolete">Bitte Gutschein-Preis und -Wert wählen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="886"/>
         <source>Price:</source>
         <translation type="obsolete">Preis:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="892"/>
         <source>Value:</source>
         <translation type="obsolete">Wert:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="924"/>
         <source>Voucher (price: %1, value %2)</source>
         <translation type="obsolete">Gutschein (Preis: %1, Wert: %2)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1338"/>
         <source>Return Voucher</source>
         <translation type="obsolete">Gutschein zurückgeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1338"/>
         <source>Please enter the voucher ID to return:</source>
         <translation type="obsolete">Bitte geben Sie den Gutschein ein, der zurückgegeben wird:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1342"/>
         <source>This is not a valid voucher.</source>
         <translation type="obsolete">Dies ist kein gültiger Gutschein.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1347"/>
         <source>This voucher cannot be returned, it has already been used.</source>
         <translation type="obsolete">Dieser Gutschein kann nicht zurückgegeben werden, er wurde bereits benutzt.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1436"/>
         <source>refresh &amp;shipping list</source>
         <translation type="obsolete">Versandoptionen auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="252"/>
         <source>Find by Order ID...</source>
         <translation type="obsolete">Nach Bestellnummer suchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1301"/>
         <source>Enter Order ID</source>
         <translation type="obsolete">Bestellnummer eingeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1301"/>
         <source>Please enter the ID of the order you want to display:</source>
         <translation type="obsolete">Bitte geben Sie die Bestellnummer der Bestellung ein, die Sie ansehen wollen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1306"/>
         <source>This order does not exist.</source>
         <translation type="obsolete">Diese Bestellung existiert nicht.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="117"/>
         <source>&amp;Deduct from voucher...</source>
         <translation type="obsolete">Geld von Gutschein abziehen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="119"/>
         <source>&amp;Money Log for voucher...</source>
         <translation type="obsolete">Geldtransfers von Gutschein...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="120"/>
         <source>Money Log for &amp;user...</source>
         <translation type="obsolete">Geldtransfers von Nutzer...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="124"/>
         <source>&amp;Server Access settings...</source>
         <translation type="obsolete">Serverzugriffseinstellungen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="127"/>
         <source>Backup &amp;Settings...</source>
         <translation type="obsolete">Einstellungen Sicherungskopie...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="263"/>
         <source>Enter or scan Ticket-ID:</source>
         <translation type="obsolete">Kartennummer eingeben oder scannen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1086"/>
         <source>Ticket &quot;%1&quot; is not for this event.</source>
         <translation type="obsolete">Karte &quot;%1&quot; ist nicht für diese Veranstaltung.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1359"/>
         <source>Deduct from Voucher</source>
         <translation type="obsolete">Von Gutschein abziehen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1362"/>
         <source>Using a voucher to pay outside the system.</source>
         <translation type="obsolete">Einen Gutschein nutzen um außerhalb des Systems zu bezahlen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1366"/>
         <source>Amount to deduct:</source>
         <translation type="obsolete">Abzuziehender Betrag:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1368"/>
         <source>Voucher ID:</source>
         <translation type="obsolete">Gutscheinnummer:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1376"/>
         <source>OK</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1389"/>
         <source>Request failed.</source>
         <translation type="obsolete">Anfrage ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1396"/>
         <source>Deducted from Voucher</source>
         <translation type="obsolete">Von Gutschein abziehen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1396"/>
         <source>Value taken from voucher: %1
 Value remaining on voucher: %2</source>
         <translation type="obsolete">Vom Gutschein abgezogener Betrag: %1
 Verbleibender Betrag: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1470"/>
         <source>Server Access Settings</source>
         <translation type="obsolete">Serverzugriffseinstellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1474"/>
         <source>Request Timeout (seconds):</source>
         <translation type="obsolete">max. Anfragezeit (Sekunden):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1480"/>
         <source>Log Level:</source>
         <translation type="obsolete">Logstufe:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1482"/>
         <source>Minimal Logging</source>
         <translation type="obsolete">Minimales Log</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1483"/>
         <source>Log Details on Error</source>
         <translation type="obsolete">Bei Fehlern Details</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1484"/>
         <source>Always Log Details</source>
         <translation type="obsolete">Immer Details</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1524"/>
         <source>Backup failed with error: %1</source>
         <translation type="obsolete">Sicherung ist fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1541"/>
         <source>Backup</source>
         <translation type="obsolete">Sicherung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1541"/>
         <source>The backup was successful.</source>
         <translation type="obsolete">Die Sicherung war erfolgreich.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1545"/>
         <source>Cannot create backup file.</source>
         <translation type="obsolete">Kann Sicherungsdatei nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1567"/>
         <source>Voucher ID</source>
         <translation type="obsolete">Gutscheinnummer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1567"/>
         <source>Please enter voucher ID to show log:</source>
         <translation type="obsolete">Bitte geben Sie die Gutscheinnummer ein um die Transaktionen zu zeigen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1574"/>
         <source>User</source>
         <translation type="obsolete">Nutzer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1574"/>
         <source>Please enter login name of user to show log:</source>
         <translation type="obsolete">Bitte den Login-Namen des Nutzers eingeben um die Transaktionen anzuzeigen:</translation>
     </message>
@@ -2607,37 +2106,30 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MPasswordChange</name>
     <message>
-        <location filename="overview.cpp" line="1646"/>
         <source>Change my password</source>
         <translation type="obsolete">Mein Passwort ändern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1652"/>
         <source>Old Password:</source>
         <translation type="obsolete">Altes Passwort:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1656"/>
         <source>New Password:</source>
         <translation type="obsolete">Neues Passwort:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1659"/>
         <source>Repeat Password:</source>
         <translation type="obsolete">Paswort wiederholen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1667"/>
         <source>Set Password</source>
         <translation type="obsolete">Passwort setzen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1669"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1648"/>
         <source>Reset password of user &quot;%1&quot;</source>
         <translation type="obsolete">Passwort des Nutzers &quot;%1&quot; zurücksetzen</translation>
     </message>
@@ -2645,7 +2137,6 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MShipping</name>
     <message>
-        <location filename="" line="0"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="obsolete">,</translation>
@@ -2654,32 +2145,26 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MShippingChange</name>
     <message>
-        <location filename="orderwin.cpp" line="1035"/>
         <source>Change Shipping Method</source>
         <translation type="obsolete">Versandoption ändern</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1042"/>
         <source>Method:</source>
         <translation type="obsolete">Option:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1044"/>
         <source>Price:</source>
         <translation type="obsolete">Preis:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1052"/>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1054"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1061"/>
         <source>(None)</source>
         <comment>shipping method</comment>
         <translation type="obsolete">(Keine)</translation>
@@ -2688,157 +2173,126 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MShippingEditor</name>
     <message>
-        <location filename="shipping.cpp" line="132"/>
         <source>Edit Shipping Options</source>
         <translation type="obsolete">Versandoptionen editieren</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="144"/>
         <source>Change Description</source>
         <translation type="obsolete">Beschreibung ändern</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="146"/>
         <source>Change Price</source>
         <translation type="obsolete">Preis ändern</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="148"/>
         <source>Change Availability</source>
         <translation type="obsolete">Verfügbarkeit ändern</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="151"/>
         <source>Add Option</source>
         <translation type="obsolete">Option hinzufügen</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="153"/>
         <source>Delete Option</source>
         <translation type="obsolete">Option löschen</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="160"/>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="170"/>
         <source>ID</source>
         <translation type="obsolete">ID</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="170"/>
         <source>Description</source>
         <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="170"/>
         <source>Price</source>
         <translation type="obsolete">Preis</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="170"/>
         <source>Web</source>
         <translation type="obsolete">Web</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="256"/>
         <source>Any User</source>
         <translation type="obsolete">Jeder Nutzer</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="176"/>
         <source>Yes</source>
         <translation type="obsolete">Ja</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="176"/>
         <source>No</source>
         <translation type="obsolete">Nein</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="250"/>
         <source>Shipping Option Description</source>
         <translation type="obsolete">Versandoptionsbeschreibung</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="190"/>
         <source>Please select a new description for this shipping option:</source>
         <translation type="obsolete">Bitte geben Sie eine Beschreibung für diese Versandoption ein:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="288"/>
         <source>Warning</source>
         <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="240"/>
         <source>Could not store the changes.</source>
         <translation type="obsolete">Konnte Änderungen nicht speichern.</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="253"/>
         <source>Shipping Option Price</source>
         <translation type="obsolete">Versandoptionspreis</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="211"/>
         <source>Please select a new price for this shipping option:</source>
         <translation type="obsolete">Bitte geben Sie einen Preis für diese Versandoption ein:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="256"/>
         <source>None</source>
         <translation type="obsolete">Nur privilegierte Nutzer</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="256"/>
         <source>Web Interface</source>
         <translation type="obsolete">Privilegierte Nutzer und Web-Kunden</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="256"/>
         <source>Any User + Web Interface</source>
         <translation type="obsolete">Jeder</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="257"/>
         <source>Shipping Option Availability</source>
         <translation type="obsolete">Versandoptionsverfügbarkeit</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="234"/>
         <source>Please select a new availability for this shipping option:</source>
         <translation type="obsolete">Bitte wählen Sie eine Verfügbarkeit für diese Versandoption:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="250"/>
         <source>Please select a new description for this new shipping option:</source>
         <translation type="obsolete">Bitte geben Sie eine Beschreibung für diese Versandoption ein:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="253"/>
         <source>Please select a new price for this new shipping option:</source>
         <translation type="obsolete">Bitte geben Sie einen Preis für diese Versandoption ein:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="257"/>
         <source>Please select a new availability for this new shipping option:</source>
         <translation type="obsolete">Bitte wählen Sie eine Verfügbarkeit für diese Versandoption:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="268"/>
         <source>Could not create the new option.</source>
         <translation type="obsolete">Konnte die neue Versandoption nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="288"/>
         <source>Unable to delete this option.</source>
         <translation type="obsolete">Kann diese Option nicht löschen.</translation>
     </message>
@@ -2846,23 +2300,19 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MTemplateChoice</name>
     <message>
-        <location filename="templatedlg.cpp" line="29"/>
         <source>Chose Template</source>
         <translation type="obsolete">Vorlage auswählen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="32"/>
         <source>Please chose a variant of template %1:</source>
         <translation type="obsolete">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 type="obsolete">(Standard)</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="50"/>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
@@ -2870,72 +2320,58 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MTemplateEditor</name>
     <message>
-        <location filename="templatedlg.cpp" line="72"/>
         <source>Edit Template Directory</source>
         <translation type="obsolete">Vorlagenverzeichnis editieren</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="84"/>
         <source>Update Now</source>
         <translation type="obsolete">Jetzt auffrischen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="86"/>
         <source>Add Variant</source>
         <translation type="obsolete">Variante hinzufügen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="88"/>
         <source>Delete Variant</source>
         <translation type="obsolete">Variante löschen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="95"/>
         <source>Close</source>
         <translation type="obsolete">Schließen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
         <source>Template/Variant</source>
         <translation type="obsolete">Vorlage/Variante</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
         <source>Description</source>
         <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
         <source>Checksum</source>
         <translation type="obsolete">Checksumme</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="221"/>
         <source>Warning</source>
         <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="167"/>
         <source>Unable to delete this template.</source>
         <translation type="obsolete">Kann diese Vorlage nicht löschen.</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="180"/>
         <source>Select Template File</source>
         <translation type="obsolete">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 type="obsolete">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 type="obsolete">Kann Datei nicht hochladen.</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="221"/>
         <source>Unable to send new description to server.</source>
         <translation type="obsolete">Kann die neue Beschreibung nicht speichern.</translation>
     </message>
@@ -2943,7 +2379,6 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MTemplateStore</name>
     <message>
-        <location filename="templates.cpp" line="107"/>
         <source>Retrieving templates from server.</source>
         <translation type="obsolete">Hole Vorlagen vom Server.</translation>
     </message>
@@ -2951,95 +2386,79 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MTicket</name>
     <message>
-        <location filename="order.cpp" line="727"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="762"/>
         <source>bought</source>
         <comment>ticket state</comment>
         <translation type="obsolete">gültig</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="763"/>
         <source>to refund</source>
         <comment>ticket state</comment>
         <translation type="obsolete">zurückgegeben</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="764"/>
         <source>used</source>
         <comment>ticket state</comment>
         <translation type="obsolete">benutzt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="765"/>
         <source>reserved</source>
         <comment>ticket state</comment>
         <translation type="obsolete">reserviert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="766"/>
         <source>ok</source>
         <comment>ticket state</comment>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="767"/>
         <source>sale only</source>
         <comment>ticket state</comment>
         <translation type="obsolete">nur zum Verkauf</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="768"/>
         <source>order only</source>
         <comment>ticket state</comment>
         <translation type="obsolete">nur zur Bestellung</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="769"/>
         <source>too late: event over</source>
         <comment>ticket state</comment>
         <translation type="obsolete">zu spät: Veranstaltung ist vorbei</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="770"/>
         <source>no more tickets</source>
         <comment>ticket state</comment>
         <translation type="obsolete">keine Karten mehr verfügbar</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="771"/>
         <source>event cancelled</source>
         <comment>ticket state</comment>
         <translation type="obsolete">Veranstaltung abgesagt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="772"/>
         <source>no such event</source>
         <comment>ticket state</comment>
         <translation type="obsolete">Veranstaltung unbekannt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="773"/>
         <source>invalid</source>
         <comment>ticket state</comment>
         <translation type="obsolete">ungültig</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="792"/>
         <source>Cannot execute request.</source>
         <translation type="obsolete">Kann Anfrage nicht ausführen.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="819"/>
         <source>Ticket is not stored, can&apos;t return it.</source>
         <translation type="obsolete">Karte ist nicht gespeichert, kann sie nicht zurückgeben.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="821"/>
         <source>Failed to execute request</source>
         <translation type="obsolete">Kann Anfrage nicht ausführen.</translation>
     </message>
@@ -3047,7 +2466,6 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MTicketView</name>
     <message>
-        <location filename="" line="0"/>
         <source>Preview Tickets</source>
         <translation type="obsolete">Karten-Vorschau</translation>
     </message>
@@ -3055,7 +2473,6 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MUser</name>
     <message>
-        <location filename="user.cpp" line="106"/>
         <source>User not valid: cannot delete.</source>
         <translation type="obsolete">Ungültiger Nutzer: kann nicht gelöscht werden.</translation>
     </message>
@@ -3063,37 +2480,30 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MVoucher</name>
     <message>
-        <location filename="order.cpp" line="919"/>
         <source>invalid</source>
         <translation type="obsolete">ungültig</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="921"/>
         <source>cancelled</source>
         <translation type="obsolete">storniert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="922"/>
         <source>empty</source>
         <translation type="obsolete">leer</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="923"/>
         <source>used</source>
         <translation type="obsolete">benutzt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="924"/>
         <source>unused</source>
         <translation type="obsolete">unbenutzt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="941"/>
         <source>Voucher is not stored, can&apos;t return it.</source>
         <translation type="obsolete">Gutschein ist nicht gespeichert, kann ihn nicht zurückgeben.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="943"/>
         <source>Failed to execute request</source>
         <translation type="obsolete">Kann Anfrage nicht ausführen.</translation>
     </message>
@@ -3101,1118 +2511,2026 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MWebRequest</name>
     <message>
-        <location filename="webrequest.cpp" line="223"/>
         <source>Unable to get server info.</source>
         <translation type="obsolete">Serverdaten können nicht gelesen werden.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="230"/>
         <source>Error while parsing server info (line %1 col %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Serverdaten (Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="235"/>
         <source>Error in server info: missing authentication algorithm info.</source>
         <translation type="obsolete">Fehler in Serverdaten: Authentifikationsalgorithmus fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="240"/>
         <source>The server requested an unsupported hash algorithm: %1.</source>
         <translation type="obsolete">Der Server verlangt einen nicht unterstützten Algorithmus (%1). Kann nicht fortsetzen.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="246"/>
         <source>Unable to get authentication challenge.</source>
         <translation type="obsolete">Authentifikation fehlgeschlagen (es wurde kein Challenge angeboten).</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="250"/>
         <source>Error while parsing session challenge (line %1 col %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Authentifikationsdaten (Challenge; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="256"/>
         <source>Error in session challenge: missing session ID.</source>
         <translation type="obsolete">Fehler in Authentifikationsdaten (Challenge): Session-ID fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="262"/>
         <source>Error in session challenge: missing host challenge.</source>
         <translation type="obsolete">Fehler in Authentifikationsdaten (Challenge): Host-Challenge fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="268"/>
         <source>Error in session challenge: missing user challenge.</source>
         <translation type="obsolete">Fehler in Authentifikationsdaten (Challenge): Nutzer-Challenge fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="294"/>
         <source>Failed to log in: user/password mismatch, non-allowed host key, or challenge timed out.</source>
         <translation type="obsolete">Authentifikation fehlgeschlagen: Passwort ist falsch, Host ist nicht zugelassen oder Challenge-Timeout.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="298"/>
         <source>Unable to authenticate.</source>
         <translation type="obsolete">Authentifikation fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="390"/>
         <source>Error parsing EventList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der XML-Daten (Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="341"/>
         <source>Cannot change password, old password does not match!</source>
         <translation type="obsolete">Passwort kann nicht geändert werden: altes Passwort ist falsch.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="414"/>
         <source>Error parsing RoomList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Daten (RoomList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="438"/>
         <source>Error parsing UserList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Daten (UserList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="462"/>
         <source>Error parsing HostList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Daten (HostList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="486"/>
         <source>Error parsing CustomerList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Daten (CustomerList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="579"/>
         <source>Error parsing OrderList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Parsen der XML-Daten (Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="535"/>
         <source>Error parsing ShippingList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Daten (ShippingList; Zeile %1, Spalte %2): %3</translation>
     </message>
 </context>
 <context>
-    <name>Order</name>
-    <message>
-        <location filename="../www/inc/classes/order.php" line="256"/>
-        <source>create order</source>
-        <translation type="obsolete">Bestellung anlegen</translation>
-    </message>
-    <message>
-        <location filename="../www/inc/classes/order.php" line="407"/>
-        <source>invalidvalue</source>
-        <comment>voucher state</comment>
-        <translation type="obsolete">Gutscheinwert nicht zulässig</translation>
-    </message>
-    <message>
-        <location filename="../www/inc/classes/order.php" line="413"/>
-        <source>invalidprice</source>
-        <comment>voucher state</comment>
-        <translation type="obsolete">Gutscheinpreis nicht zulässig</translation>
-    </message>
-    <message>
-        <location filename="../www/inc/classes/order.php" line="434"/>
-        <source>Shipping type not available to user.</source>
-        <translation type="obsolete">Diese Versandoption ist privilegierten Nutzern vorbehalten.</translation>
-    </message>
-    <message>
-        <location filename="../www/inc/classes/order.php" line="451"/>
-        <source>Illegal shipping type.</source>
-        <translation type="obsolete">Ungültige Versandoption.</translation>
-    </message>
+    <name>MachineUser</name>
     <message>
-        <location filename="../www/inc/classes/order.php" line="669"/>
-        <source>order cancelled</source>
-        <translation type="obsolete">Bestellung storniert</translation>
+        <location filename="../inc/machine/muser.php" line="25"/>
+        <source>User already exists.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="707"/>
-        <source>reservation to order</source>
-        <translation type="obsolete">Reservierung zu Bestellung gewandelt</translation>
+        <location filename="../inc/machine/muser.php" line="30"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Session</name>
     <message>
-        <location filename="../www/inc/machine/session.php" line="217"/>
-        <source>unable to parse XML data</source>
-        <translation type="obsolete">Kann XML Daten nicht parsen</translation>
+        <location filename="../inc/machine/muser.php" line="50"/>
+        <location filename="../inc/machine/muser.php" line="82"/>
+        <location filename="../inc/machine/muser.php" line="96"/>
+        <location filename="../inc/machine/muser.php" line="109"/>
+        <location filename="../inc/machine/muser.php" line="129"/>
+        <location filename="../inc/machine/muser.php" line="159"/>
+        <location filename="../inc/machine/muser.php" line="178"/>
+        <location filename="../inc/machine/muser.php" line="244"/>
+        <source>User does not exist.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="139"/>
-        <source>missing some authentication data</source>
-        <translation type="obsolete">Authentifikationsdaten sind unvollständig</translation>
+        <location filename="../inc/machine/muser.php" line="59"/>
+        <source>Merge target user does not exist!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="211"/>
-        <source>Not authenticated. Can&apos;t change password.</source>
-        <translation type="obsolete">Nicht authentifiziert, Passwort kann nicht geändert werden.</translation>
+        <location filename="../inc/machine/muser.php" line="65"/>
+        <source>User and merge target user are identical.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="222"/>
-        <source>expected exactly one passwd element</source>
-        <translation type="obsolete">Nur 1 &quot;passwd&quot; Element erwartet.</translation>
+        <location filename="../inc/machine/muser.php" line="141"/>
+        <source>Trying to assign non-existent role.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="230"/>
-        <source>cannot set an empty password</source>
-        <translation type="obsolete">Leeres Passwort kann nicht gesetzt werden</translation>
+        <location filename="../inc/machine/muser.php" line="190"/>
+        <source>Trying to assign non-existent host.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="237"/>
-        <source>Ooops. Unable to find user. You have been deleted.</source>
-        <translation type="obsolete">Ups. Sie wurden gelöscht.</translation>
+        <location filename="../inc/machine/muser.php" line="219"/>
+        <location filename="../inc/machine/muser.php" line="267"/>
+        <location filename="../inc/machine/muser.php" line="304"/>
+        <location filename="../inc/machine/muser.php" line="337"/>
+        <source>Role does not exist.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="242"/>
-        <source>Wrong password. Session hijacked, terminating it.</source>
-        <translation type="obsolete">Falsches Passwort. Session wird beendet.</translation>
+        <location filename="../inc/machine/muser.php" line="228"/>
+        <location filename="../inc/machine/muser.php" line="253"/>
+        <source>Trying to assign non-existent flag.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SpecialHost</name>
     <message>
-        <location filename="../inc/wob/schema.php" line="38"/>
-        <source>_any</source>
-        <translation>beliebiger (auch unregistrierter) Host</translation>
+        <location filename="../inc/machine/muser.php" line="281"/>
+        <source>Illegal role name.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="42"/>
-        <source>_anon</source>
-        <translation type="obsolete">Anonym - beliebiger registrierter Host</translation>
+        <location filename="../inc/machine/muser.php" line="287"/>
+        <source>Role already exists.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="43"/>
-        <source>_online</source>
-        <translation type="obsolete">Web-Präsenz</translation>
+        <location filename="../inc/machine/muser.php" line="313"/>
+        <source>Trying to set an illegal right.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Ticket</name>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="203"/>
-        <source>The ticket is not valid.</source>
-        <translation type="obsolete">Die Karte ist nicht gültig.</translation>
+        <location filename="../inc/machine/muser.php" line="331"/>
+        <source>Cannot delete special roles.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="207"/>
-        <source>The ticket has already been used.</source>
-        <translation type="obsolete">Die Karte wurde bereits benutzt.</translation>
+        <location filename="../inc/machine/muser.php" line="354"/>
+        <source>Cannot set/create special hosts.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="211"/>
-        <source>The ticket has not been bought or is cancelled.</source>
-        <translation type="obsolete">Die Karte wurde nicht gekauft oder ist zurückgegeben.</translation>
+        <location filename="../inc/machine/muser.php" line="358"/>
+        <source>Illegal host name.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="216"/>
-        <source>The ticket has not been paid.</source>
-        <translation type="obsolete">Die Karte ist nicht bezahlt.</translation>
+        <location filename="../inc/machine/muser.php" line="378"/>
+        <source>Cannot delete special hosts.</source>
+        <translation type="unfinished">Spezialhosts können nicht gelöscht werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="220"/>
-        <source>The tickets order is in an invalid state or does not exist.</source>
-        <translation type="obsolete">Die Bestellung dieser Karte ist in einem ungültigen Zustand oder existiert nicht.</translation>
+        <location filename="../inc/machine/muser.php" line="384"/>
+        <source>Host does not exist.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TransactionNames</name>
-    <message>
-        <location filename="../inc/wob/transaction.php" line="51"/>
-        <source>Backup</source>
-        <translation type="unfinished">Sicherung</translation>
-    </message>
+    <name>Order</name>
     <message>
-        <location filename="../inc/wob/transaction.php" line="52"/>
-        <source>GetLanguage</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/order.php" line="256"/>
+        <source>create order</source>
+        <translation type="unfinished">Bestellung anlegen</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="53"/>
-        <source>ServerInfo</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/order.php" line="407"/>
+        <source>invalidvalue</source>
+        <comment>voucher state</comment>
+        <translation type="unfinished">Gutscheinwert nicht zulässig</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="54"/>
-        <source>Login</source>
-        <translation type="unfinished">Login</translation>
+        <location filename="../inc/classes/order.php" line="413"/>
+        <source>invalidprice</source>
+        <comment>voucher state</comment>
+        <translation type="unfinished">Gutscheinpreis nicht zulässig</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="55"/>
-        <source>Logout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/order.php" line="434"/>
+        <source>Shipping type not available to user.</source>
+        <translation type="unfinished">Diese Versandoption ist privilegierten Nutzern vorbehalten.</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="56"/>
-        <source>GetMyRoles</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/order.php" line="451"/>
+        <source>Illegal shipping type.</source>
+        <translation type="unfinished">Ungültige Versandoption.</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="57"/>
-        <source>GetMyRights</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/order.php" line="669"/>
+        <source>order cancelled</source>
+        <translation type="unfinished">Bestellung storniert</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="58"/>
-        <source>ChangeMyPassword</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/order.php" line="707"/>
+        <source>reservation to order</source>
+        <translation type="unfinished">Reservierung zu Bestellung gewandelt</translation>
     </message>
+</context>
+<context>
+    <name>Session</name>
     <message>
-        <location filename="../inc/wob/transaction.php" line="59"/>
-        <source>GetAllUsers</source>
-        <translation type="unfinished"></translation>
+        <source>unable to parse XML data</source>
+        <translation type="obsolete">Kann XML Daten nicht parsen</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="60"/>
-        <source>CreateUser</source>
-        <translation type="unfinished"></translation>
+        <source>missing some authentication data</source>
+        <translation type="obsolete">Authentifikationsdaten sind unvollständig</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="61"/>
-        <source>ChangePassword</source>
-        <translation type="unfinished"></translation>
+        <source>Not authenticated. Can&apos;t change password.</source>
+        <translation type="obsolete">Nicht authentifiziert, Passwort kann nicht geändert werden.</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="62"/>
-        <source>DeleteUser</source>
-        <translation type="unfinished"></translation>
+        <source>expected exactly one passwd element</source>
+        <translation type="obsolete">Nur 1 &quot;passwd&quot; Element erwartet.</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="63"/>
-        <source>SetUserDescription</source>
+        <location filename="../inc/machine/session.php" line="122"/>
+        <source>Unknown Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="64"/>
-        <source>GetUserRoles</source>
+        <location filename="../inc/machine/session.php" line="129"/>
+        <source>Host/User combination not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="65"/>
-        <source>SetUserRoles</source>
+        <location filename="../inc/machine/session.php" line="135"/>
+        <location filename="../inc/machine/session.php" line="139"/>
+        <source>Host authentication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="66"/>
-        <source>GetAllHostNames</source>
+        <location filename="../inc/machine/session.php" line="145"/>
+        <location filename="../inc/machine/session.php" line="150"/>
+        <location filename="../inc/machine/session.php" line="154"/>
+        <source>User Authentication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="67"/>
-        <source>GetAllHosts</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/machine/session.php" line="210"/>
+        <source>cannot set an empty password</source>
+        <translation type="unfinished">Leeres Passwort kann nicht gesetzt werden</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="68"/>
-        <source>SetHost</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/machine/session.php" line="215"/>
+        <source>Ooops. Unable to find user. You have been deleted.</source>
+        <translation type="unfinished">Ups. Sie wurden gelöscht.</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="69"/>
-        <source>DeleteHost</source>
+        <location filename="../inc/machine/session.php" line="218"/>
+        <source>Ooops. Internal storage error - cannot verify old password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="70"/>
-        <source>GetUserHosts</source>
+        <location filename="../inc/machine/session.php" line="221"/>
+        <source>Wrong password. Request denied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="71"/>
-        <source>SetUserHosts</source>
-        <translation type="unfinished"></translation>
+        <source>Wrong password. Session hijacked, terminating it.</source>
+        <translation type="obsolete">Falsches Passwort. Session wird beendet.</translation>
     </message>
+</context>
+<context>
+    <name>SpecialHost</name>
     <message>
-        <location filename="../inc/wob/transaction.php" line="72"/>
-        <source>GetCustomer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/wob/schema.php" line="29"/>
+        <source>_any</source>
+        <translation>beliebiger (auch unregistrierter) Host</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="73"/>
-        <source>GetAllCustomerNames</source>
-        <translation type="unfinished"></translation>
+        <source>_anon</source>
+        <translation type="obsolete">Anonym - beliebiger registrierter Host</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="74"/>
-        <source>GetEvent</source>
-        <translation type="unfinished"></translation>
+        <source>_online</source>
+        <translation type="obsolete">Web-Präsenz</translation>
     </message>
+</context>
+<context>
+    <name>Ticket</name>
     <message>
-        <location filename="../inc/wob/transaction.php" line="75"/>
-        <source>GetAllEvents</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/ticket.php" line="203"/>
+        <source>The ticket is not valid.</source>
+        <translation type="unfinished">Die Karte ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="76"/>
-        <source>CancelEvent</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/ticket.php" line="207"/>
+        <source>The ticket has already been used.</source>
+        <translation type="unfinished">Die Karte wurde bereits benutzt.</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="77"/>
-        <source>GetAllRooms</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/ticket.php" line="211"/>
+        <source>The ticket has not been bought or is cancelled.</source>
+        <translation type="unfinished">Die Karte wurde nicht gekauft oder ist zurückgegeben.</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="78"/>
-        <source>GetTicket</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/ticket.php" line="216"/>
+        <source>The ticket has not been paid.</source>
+        <translation type="unfinished">Die Karte ist nicht bezahlt.</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="79"/>
-        <source>GetVoucher</source>
-        <translation type="unfinished"></translation>
+        <location filename="../inc/classes/ticket.php" line="220"/>
+        <source>The tickets order is in an invalid state or does not exist.</source>
+        <translation type="unfinished">Die Bestellung dieser Karte ist in einem ungültigen Zustand oder existiert nicht.</translation>
     </message>
+</context>
+<context>
+    <name>TransactionNames</name>
     <message>
-        <location filename="../inc/wob/transaction.php" line="80"/>
-        <source>GetOrder</source>
-        <translation type="unfinished"></translation>
+        <source>Backup</source>
+        <translation type="obsolete">Sicherung</translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="81"/>
-        <source>GetAllShipping</source>
-        <translation type="unfinished"></translation>
+        <source>Login</source>
+        <translation type="obsolete">Login</translation>
     </message>
 </context>
 <context>
     <name>TransactionNames::</name>
     <message>
-        <location filename="../www/machine.php" line="19"/>
         <source>serverinfo</source>
         <translation type="obsolete">Serverinformationen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>startsession</source>
         <translation type="obsolete">Session beginnen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>sessionauth</source>
         <translation type="obsolete">Session authentifizieren</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>closesession</source>
         <translation type="obsolete">Sessen beenden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
         <source>getmyroles</source>
         <translation type="obsolete">meine Rollen herausfinden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getusers</source>
         <translation type="obsolete">Nutzer abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>setuserdescription</source>
         <translation type="obsolete">Nutzerkommentar setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getuseracl</source>
         <translation type="obsolete">Nutzerrechte abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>setuseracl</source>
         <translation type="obsolete">Nutzerrechte setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getuserhosts</source>
         <translation type="obsolete">erlaubte Hosts eines Nutzers abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setuserhosts</source>
         <translation type="obsolete">erlaubte Hosts eines Nutzers setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>adduser</source>
         <translation type="obsolete">neue Nutzer anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>deleteuser</source>
         <translation type="obsolete">Nutzer löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setmypasswd</source>
         <translation type="obsolete">eigenes Passwort ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setpasswd</source>
         <translation type="obsolete">Passwort eines anderen Nutzers ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>gethosts</source>
         <translation type="obsolete">Hosts abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>sethost</source>
         <translation type="obsolete">Hosts anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>addhost</source>
         <translation type="obsolete">Neue Hosts anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>deletehost</source>
         <translation type="obsolete">Hosts löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>geteventlist</source>
         <translation type="obsolete">Liste der Veranstaltungen abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>geteventdata</source>
         <translation type="obsolete">Veranstaltungsdetails abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>seteventdata</source>
         <translation type="obsolete">Veranstaltungsdetails ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>eventsummary</source>
         <translation type="obsolete">Veranstaltungübersicht</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>cancelevent</source>
         <translation type="obsolete">Veranstaltung abbrechen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
         <source>getroomdata</source>
         <translation type="obsolete">Raumdaten abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
         <source>setroomdata</source>
         <translation type="obsolete">Raumdaten setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>getcustomerlist</source>
         <translation type="obsolete">Kundenliste abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>getcustomer</source>
         <translation type="obsolete">Kunde abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>setcustomer</source>
         <translation type="obsolete">Kunde anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>deletecustomer</source>
         <translation type="obsolete">Kunden löschen/ersetzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>checkorder</source>
         <translation type="obsolete">Bestellung testen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createorder</source>
         <translation type="obsolete">Bestellung anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createsale</source>
         <translation type="obsolete">Verkaufen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>getorderlist</source>
         <translation type="obsolete">Liste der Bestellungen abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>getorder</source>
         <translation type="obsolete">Bestellung: Details abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>orderpay</source>
         <translation type="obsolete">Bestellung bezahlen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>orderrefund</source>
         <translation type="obsolete">Bestellung: Geld zurück geben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>ordershipped</source>
         <translation type="obsolete">Bestellung als verschickt markieren</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>cancelorder</source>
         <translation type="obsolete">Bestellung stornieren</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>orderbyticket</source>
         <translation type="obsolete">Bestellung mit Ticket finden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>getordersbyevents</source>
         <translation type="obsolete">Bestellungen finden, die Veranstaltung enthalten</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>setordercomment</source>
         <translation type="obsolete">Bestellkommentar (in angelegter Bestellung) ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>getticket</source>
         <translation type="obsolete">Ticket abrufen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>useticket</source>
         <translation type="obsolete">Ticket entwerten</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>changeticketprice</source>
         <translation type="obsolete">Ticketpreis ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>ticketreturn</source>
         <translation type="obsolete">Ticket zurückgeben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>gettemplatelist</source>
         <translation type="obsolete">Vorlagenliste abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>gettemplate</source>
         <translation type="obsolete">Vorlage abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>settemplate</source>
         <translation type="obsolete">Vorlage erstellen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="60"/>
         <source>_admin</source>
         <translation type="obsolete">Alle Rechte, Administrator</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="61"/>
         <source>_anyshipping</source>
         <translation type="obsolete">Nutzer darf beliebige (auch privilegierte) Versandmethode benutzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="62"/>
         <source>_repriceshipping</source>
         <translation type="obsolete">Beliebigen Versandpreis festlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createreservedorder</source>
         <translation type="obsolete">Reservierung anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>orderchangeshipping</source>
         <translation type="obsolete">Versandoption einer Bestellung ändern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
         <source>reservationtoorder</source>
         <translation type="obsolete">Reservierung in Bestellung wandeln</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
         <source>reservationtosale</source>
         <translation type="obsolete">Reservierung in Verkauf wandeln</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>getshipping</source>
         <translation type="obsolete">Versandoptionen holen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>setshipping</source>
         <translation type="obsolete">Versandoptionen ändern/anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>deleteshipping</source>
         <translation type="obsolete">Versandoptionen löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>getvoucherprices</source>
         <translation type="obsolete">Gutscheinpreise abfragen (zB. für Bestellformular)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>cancelvoucher</source>
         <translation type="obsolete">Gutschein zurückgeben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>emptyvoucher</source>
         <translation type="obsolete">Gutschein ungültig machen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>usevoucher</source>
         <translation type="obsolete">Gutschein benutzen (damit bezahlen)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>getvoucher</source>
         <translation type="obsolete">Gutschein abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>settemplatedescription</source>
         <translation type="obsolete">Vorlagenbeschreibung ändern/setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="52"/>
-        <source>deletetemplate</source>
-        <translation type="obsolete">Vorlage löschen</translation>
+        <source>deletetemplate</source>
+        <translation type="obsolete">Vorlage löschen</translation>
+    </message>
+    <message>
+        <source>_anyvoucher</source>
+        <translation type="obsolete">Gutscheine mit beliebigem Wert anlegen</translation>
+    </message>
+    <message>
+        <source>_anypricevoucher</source>
+        <translation type="obsolete">Gutscheine anlegen bei denen Preis und Wert unterschiedlich sind</translation>
+    </message>
+    <message>
+        <source>_explicitshipdate</source>
+        <translation type="obsolete">eine beliebige Zeit/Datum setzen, wenn Bestellungen versandt werden (statt aktueller Zeit/Datum)</translation>
+    </message>
+    <message>
+        <source>usevoucheroutside</source>
+        <translation type="obsolete">Gutschein außerhalb des Systems nutzen (Geld ohne Bestellung abziehen)</translation>
+    </message>
+    <message>
+        <source>backup</source>
+        <translation type="obsolete">Sicherungskopie anlegen</translation>
+    </message>
+    <message>
+        <source>moneylog</source>
+        <translation type="obsolete">Geldtransfers anzeigen</translation>
+    </message>
+</context>
+<context>
+    <name>Translation</name>
+    <message>
+        <location filename="../inc/machine/translation.php" line="21"/>
+        <source>Format must be either &apos;ts&apos; or &apos;qm&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/machine/translation.php" line="24"/>
+        <source>Language invalid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/machine/translation.php" line="33"/>
+        <source>Language unknown.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Voucher</name>
+    <message>
+        <location filename="../inc/classes/voucher.php" line="120"/>
+        <source>cancel voucher</source>
+        <translation type="unfinished">Gutschein zurückgegeben</translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/voucher.php" line="134"/>
+        <source>empty voucher</source>
+        <translation type="unfinished">Gutschein entleert</translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/voucher.php" line="157"/>
+        <source>create voucher</source>
+        <translation type="unfinished">Gutschein angelegt</translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/voucher.php" line="221"/>
+        <source>pay with voucher</source>
+        <translation type="unfinished">mit Gutschein bezahlt</translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/voucher.php" line="257"/>
+        <source>pay with voucher outside system</source>
+        <translation type="unfinished">mit Gutschein außerhalb des Systems bezahlt</translation>
+    </message>
+</context>
+<context>
+    <name>WOAddress</name>
+    <message>
+        <location filename="../inc/wob/wo_Address.php" line="238"/>
+        <source>Unable to deserialize object of type WOAddress: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOArtistAbstract</name>
+    <message>
+        <location filename="../inc/wext/artist.php" line="21"/>
+        <source>Artist name must not be empty!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/artist.php" line="28"/>
+        <source>An artist with this name already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Artist.php" line="153"/>
+        <source>Unable to deserialize object of type WOArtist: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOCartItem</name>
+    <message>
+        <location filename="../inc/wob/wo_CartItem.php" line="24"/>
+        <source>Unable to deserialize object of type WOCartItem: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOCartOrder</name>
+    <message>
+        <source>Ok</source>
+        <translation type="obsolete">Ok</translation>
+    </message>
+</context>
+<context>
+    <name>WOCartOrderAbstract</name>
+    <message>
+        <location filename="../inc/wext/cart.php" line="25"/>
+        <source>Not a valid cart object.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/cart.php" line="47"/>
+        <source>Lacking privileges to create a sale.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/cart.php" line="52"/>
+        <source>Lacking privileges to create an order.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/cart.php" line="64"/>
+        <source>CreateOrder called from an unknown transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/cart.php" line="75"/>
+        <source>Reservations must not contain anything but tickets.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/cart.php" line="304"/>
+        <source>DB error while inserting order.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartOrder.php" line="51"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartOrder.php" line="52"/>
+        <source>Invalid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartOrder.php" line="235"/>
+        <source>Unable to deserialize object of type WOCartOrder: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOCartTicket</name>
+    <message>
+        <location filename="../inc/wob/wo_CartTicket.php" line="201"/>
+        <source>Unable to deserialize object of type WOCartTicket: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartTicket.php" line="105"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartTicket.php" line="106"/>
+        <source>EventOver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartTicket.php" line="107"/>
+        <source>TooLate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartTicket.php" line="108"/>
+        <source>Exhausted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartTicket.php" line="109"/>
+        <source>Invalid</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOCartVoucher</name>
+    <message>
+        <location filename="../inc/wob/wo_CartVoucher.php" line="147"/>
+        <source>Unable to deserialize object of type WOCartVoucher: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartVoucher.php" line="85"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartVoucher.php" line="86"/>
+        <source>InvalidValue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_CartVoucher.php" line="87"/>
+        <source>InvalidPrice</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOContact</name>
+    <message>
+        <location filename="../inc/wob/wo_Contact.php" line="123"/>
+        <source>Unable to deserialize object of type WOContact: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOContactType</name>
+    <message>
+        <location filename="../inc/wob/wo_ContactType.php" line="88"/>
+        <source>Unable to deserialize object of type WOContactType: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOCountry</name>
+    <message>
+        <location filename="../inc/wob/wo_Country.php" line="70"/>
+        <source>Unable to deserialize object of type WOCountry: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOCustomerAbstract</name>
+    <message>
+        <location filename="../inc/wext/customer.php" line="22"/>
+        <location filename="../inc/wext/customer.php" line="64"/>
+        <source>Not a valid customer object.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/customer.php" line="69"/>
+        <source>Customer does not exist in the database.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/customer.php" line="147"/>
+        <source>Not a valid customer, cannot delete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/customer.php" line="162"/>
+        <source>This customer has orders in the system, cannot delete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/customer.php" line="175"/>
+        <source>Cannot merge a customer with itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/customer.php" line="205"/>
+        <source>Country ID and name must contain values!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/customer.php" line="212"/>
+        <source>Country ID exists!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/customer.php" line="217"/>
+        <source>Country name exists!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/customer.php" line="235"/>
+        <source>Contact Type names must not be empty!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/customer.php" line="240"/>
+        <source>Contact Type already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Customer.php" line="186"/>
+        <source>Unable to deserialize object of type WOCustomer: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOCustomerInfo</name>
+    <message>
+        <location filename="../inc/wob/wo_CustomerInfo.php" line="104"/>
+        <source>Unable to deserialize object of type WOCustomerInfo: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOEventAbstract</name>
+    <message>
+        <location filename="../inc/wext/event.php" line="78"/>
+        <source>The event to be created must be a valid event object!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/event.php" line="103"/>
+        <source>The event to be changed must be a valid event object!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/event.php" line="108"/>
+        <source>The event is not valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/event.php" line="120"/>
+        <source>You do not have the privilege to cancel events.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/event.php" line="177"/>
+        <source>This is not a valid event.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/event.php" line="205"/>
+        <source>The event ID is not valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Event.php" line="384"/>
+        <source>Unable to deserialize object of type WOEvent: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOEventPriceAbstract</name>
+    <message>
+        <location filename="../inc/wob/wo_EventPrice.php" line="206"/>
+        <source>Unable to deserialize object of type WOEventPrice: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOFlagAbstract</name>
+    <message>
+        <location filename="../inc/wob/wo_Flag.php" line="50"/>
+        <source>Unable to deserialize object of type WOFlag: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOHost</name>
+    <message>
+        <location filename="../inc/wob/wo_Host.php" line="70"/>
+        <source>Unable to deserialize object of type WOHost: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOItemInfo</name>
+    <message>
+        <location filename="../inc/wob/wo_ItemInfo.php" line="142"/>
+        <source>Unable to deserialize object of type WOItemInfo: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOOrder</name>
+    <message>
+        <source>Sold</source>
+        <translation type="obsolete">Verkauft</translation>
+    </message>
+    <message>
+        <source>Reserved</source>
+        <translation type="obsolete">Reserviert</translation>
+    </message>
+</context>
+<context>
+    <name>WOOrderAbstract</name>
+    <message>
+        <location filename="../inc/wext/order.php" line="173"/>
+        <source>Invalid shipping ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="203"/>
+        <location filename="../inc/wext/order.php" line="236"/>
+        <location filename="../inc/wext/order.php" line="259"/>
+        <location filename="../inc/wext/order.php" line="275"/>
+        <location filename="../inc/wext/order.php" line="307"/>
+        <location filename="../inc/wext/order.php" line="358"/>
+        <source>Order ID is not valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="207"/>
+        <source>Order has already been shipped.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="211"/>
+        <source>Order is in the wrong state.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="281"/>
+        <location filename="../inc/wext/order.php" line="328"/>
+        <location filename="../inc/wext/order.php" line="626"/>
+        <source>Amount to be paid must be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="313"/>
+        <location filename="../inc/wext/order.php" line="318"/>
+        <location filename="../inc/wext/order.php" line="632"/>
+        <location filename="../inc/wext/order.php" line="637"/>
+        <location filename="../inc/wext/order.php" line="671"/>
+        <location filename="../inc/wext/order.php" line="676"/>
+        <source>Voucher is not valid!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="322"/>
+        <location filename="../inc/wext/order.php" line="641"/>
+        <location filename="../inc/wext/order.php" line="680"/>
+        <source>Voucher cannot be used: it has not been paid for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="364"/>
+        <source>Amount to be refunded must be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="391"/>
+        <source>Invalid Order ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="396"/>
+        <source>This order is not a reservation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="420"/>
+        <source>This ticket cannot be returned!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="425"/>
+        <location filename="../inc/wext/order.php" line="497"/>
+        <location filename="../inc/wext/order.php" line="556"/>
+        <source>Internal error: ticket for unknown event.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="429"/>
+        <source>This ticket is for a past event and you do not have the privilege to return it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="441"/>
+        <source>This voucher has already been used, cannot return it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="450"/>
+        <source>Ticket or voucher not found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="466"/>
+        <source>Invalid order ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="479"/>
+        <source>The order is in the wrong status or you do not have the privilege to cancel it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="491"/>
+        <source>This order contains a ticket that cannot be returned.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="501"/>
+        <source>This order contains a ticket that is for a past event and you do not have the privilege to cancel it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="510"/>
+        <source>This order contains a voucher that has already been used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="541"/>
+        <location filename="../inc/wext/order.php" line="587"/>
+        <source>Invalid ticket ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="547"/>
+        <source>The ticket cannot be changed anymore or you do not have the privilege.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="560"/>
+        <source>The ticket is for an event in the past and you do not have the privilege to change it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="598"/>
+        <source>Invalid price category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="603"/>
+        <source>Category is not valid for this event.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="609"/>
+        <source>You do not have access to this category on this event.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/order.php" line="647"/>
+        <source>Internal error: negative voucher.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Order.php" line="216"/>
+        <source>Placed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Order.php" line="217"/>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Order.php" line="218"/>
+        <source>Sold</source>
+        <translation type="unfinished">Verkauft</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Order.php" line="219"/>
+        <source>Cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Order.php" line="220"/>
+        <source>Reserved</source>
+        <translation type="unfinished">Reserviert</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Order.php" line="221"/>
+        <source>Closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Order.php" line="501"/>
+        <source>Unable to deserialize object of type WOOrder: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOOrderInfoAbstract</name>
+    <message>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="124"/>
+        <source>Placed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="125"/>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="126"/>
+        <source>Sold</source>
+        <translation type="unfinished">Verkauft</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="127"/>
+        <source>Cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="128"/>
+        <source>Reserved</source>
+        <translation type="unfinished">Reserviert</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="129"/>
+        <source>Closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="344"/>
+        <source>Unable to deserialize object of type WOOrderInfo: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOPriceCategoryAbstract</name>
+    <message>
+        <location filename="../inc/wext/price.php" line="21"/>
+        <source>New Category must be a valid object.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/price.php" line="38"/>
+        <source>Category must be a valid object.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/price.php" line="45"/>
+        <source>Category does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_PriceCategory.php" line="153"/>
+        <source>Unable to deserialize object of type WOPriceCategory: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WORoleAbstract</name>
+    <message>
+        <location filename="../inc/wob/wo_Role.php" line="107"/>
+        <source>Unable to deserialize object of type WORole: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WORoomAbstract</name>
+    <message>
+        <location filename="../inc/wext/room.php" line="22"/>
+        <source>Room already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Room.php" line="88"/>
+        <source>Unable to deserialize object of type WORoom: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOShippingAbstract</name>
+    <message>
+        <location filename="../inc/wext/shipping.php" line="28"/>
+        <source>Shipping type not found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/shipping.php" line="35"/>
+        <source>Error while updating shipping information.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Shipping.php" line="123"/>
+        <source>Unable to deserialize object of type WOShipping: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOTemplateAbstract</name>
+    <message>
+        <location filename="../inc/wext/template.php" line="54"/>
+        <location filename="../inc/wext/template.php" line="67"/>
+        <source>No such template.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Template.php" line="155"/>
+        <source>Unable to deserialize object of type WOTemplate: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOTemplateInfo</name>
+    <message>
+        <location filename="../inc/wob/wo_TemplateInfo.php" line="103"/>
+        <source>Unable to deserialize object of type WOTemplateInfo: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOTicket</name>
+    <message>
+        <source>Reserved</source>
+        <translation type="obsolete">Reserviert</translation>
+    </message>
+    <message>
+        <source>Used</source>
+        <translation type="obsolete">Benutzt</translation>
+    </message>
+</context>
+<context>
+    <name>WOTicketAbstract</name>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="94"/>
+        <source>Reserved</source>
+        <translation type="unfinished">Reserviert</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="95"/>
+        <source>Ordered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="96"/>
+        <source>Used</source>
+        <translation type="unfinished">Benutzt</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="97"/>
+        <source>Cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="98"/>
+        <source>Refund</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="99"/>
+        <source>MaskBlock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="100"/>
+        <source>MaskPay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="101"/>
+        <source>MaskUsable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="102"/>
+        <source>MaskReturnable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="103"/>
+        <source>MaskChangeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Ticket.php" line="291"/>
+        <source>Unable to deserialize object of type WOTicket: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOTicketUse</name>
+    <message>
+        <location filename="../inc/wob/wo_TicketUse.php" line="61"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_TicketUse.php" line="62"/>
+        <source>NotFound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_TicketUse.php" line="63"/>
+        <source>WrongEvent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_TicketUse.php" line="64"/>
+        <source>AlreadyUsed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_TicketUse.php" line="65"/>
+        <source>NotUsable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_TicketUse.php" line="66"/>
+        <source>Unpaid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_TicketUse.php" line="67"/>
+        <source>InvalidEvent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_TicketUse.php" line="209"/>
+        <source>Unable to deserialize object of type WOTicketUse: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOUser</name>
+    <message>
+        <location filename="../inc/wob/wo_User.php" line="86"/>
+        <source>Unable to deserialize object of type WOUser: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOVoucher</name>
+    <message>
+        <location filename="../inc/wob/wo_Voucher.php" line="191"/>
+        <source>Unable to deserialize object of type WOVoucher: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Voucher.php" line="72"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Voucher.php" line="73"/>
+        <source>InvalidValue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/wo_Voucher.php" line="74"/>
+        <source>InvalidPrice</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>_PrivilegeNames</name>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="211"/>
+        <source>ChangeEvent:CancelEvent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="212"/>
+        <source>CreateOrder:AnyVoucherValue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="213"/>
+        <source>CreateOrder:DiffVoucherValuePrice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="214"/>
+        <source>CreateOrder:LateSale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="215"/>
+        <source>CreateOrder:AfterTheFactSale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="216"/>
+        <source>CreateOrder:CanOrder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="217"/>
+        <source>CreateOrder:CanSell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="218"/>
+        <source>CreateReservation:LateReserve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="219"/>
+        <source>CancelOrder:CancelSentOrder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="220"/>
+        <source>CancelOrder:CancelPastTickets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="221"/>
+        <source>OrderChangeShipping:ChangePrice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="222"/>
+        <source>OrderMarkShipped:SetTime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="223"/>
+        <source>ReturnTicketVoucher:ReturnPastTicket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="224"/>
+        <source>ChangeTicketPrice:ChangeUsedTicket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="225"/>
+        <source>ChangeTicketPrice:ChangePastTicket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="226"/>
+        <source>ChangeTicketPriceCategory:ChangeUsedTicket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="227"/>
+        <source>ChangeTicketPriceCategory:ChangePastTicket</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>_TransactionNames</name>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="115"/>
+        <source>Backup</source>
+        <translation type="unfinished">Sicherung</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="116"/>
+        <source>GetLanguage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="117"/>
+        <source>GetValidFlags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="118"/>
+        <source>SetFlag</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="119"/>
+        <source>DeleteFlag</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="120"/>
+        <source>ServerInfo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="121"/>
+        <source>Login</source>
+        <translation type="unfinished">Login</translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="122"/>
+        <source>Logout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="123"/>
+        <source>GetMyRoles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="124"/>
+        <source>GetMyRights</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="125"/>
+        <source>ChangeMyPassword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="126"/>
+        <source>GetAllUsers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="127"/>
+        <source>GetUser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="128"/>
+        <source>CreateUser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="129"/>
+        <source>ChangePassword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="130"/>
+        <source>DeleteUser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="131"/>
+        <source>SetUserDescription</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="132"/>
+        <source>GetUserRoles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="133"/>
+        <source>SetUserRoles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="134"/>
+        <source>GetUserHosts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="135"/>
+        <source>SetUserHosts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="136"/>
+        <source>SetUserFlags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="137"/>
+        <source>GetAllRoles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="138"/>
+        <source>GetRole</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="139"/>
+        <source>CreateRole</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="140"/>
+        <source>SetRoleDescription</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="141"/>
+        <source>SetRoleRights</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="142"/>
+        <source>DeleteRole</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="143"/>
+        <source>SetRoleFlags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="144"/>
+        <source>GetAllRightNames</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="63"/>
-        <source>_anyvoucher</source>
-        <translation type="obsolete">Gutscheine mit beliebigem Wert anlegen</translation>
+        <location filename="../inc/wob/transaction.php" line="145"/>
+        <source>GetAllHostNames</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="64"/>
-        <source>_anypricevoucher</source>
-        <translation type="obsolete">Gutscheine anlegen bei denen Preis und Wert unterschiedlich sind</translation>
+        <location filename="../inc/wob/transaction.php" line="146"/>
+        <source>GetAllHosts</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="65"/>
-        <source>_explicitshipdate</source>
-        <translation type="obsolete">eine beliebige Zeit/Datum setzen, wenn Bestellungen versandt werden (statt aktueller Zeit/Datum)</translation>
+        <location filename="../inc/wob/transaction.php" line="147"/>
+        <source>SetHost</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
-        <source>usevoucheroutside</source>
-        <translation type="obsolete">Gutschein außerhalb des Systems nutzen (Geld ohne Bestellung abziehen)</translation>
+        <location filename="../inc/wob/transaction.php" line="148"/>
+        <source>DeleteHost</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="54"/>
-        <source>backup</source>
-        <translation type="obsolete">Sicherungskopie anlegen</translation>
+        <location filename="../inc/wob/transaction.php" line="149"/>
+        <source>GetAllContactTypes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="56"/>
-        <source>moneylog</source>
-        <translation type="obsolete">Geldtransfers anzeigen</translation>
+        <location filename="../inc/wob/transaction.php" line="150"/>
+        <source>CreateContactType</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Translation</name>
     <message>
-        <location filename="../inc/machine/translation.php" line="21"/>
-        <source>Format must be either &apos;ts&apos; or &apos;qm&apos;.</source>
+        <location filename="../inc/wob/transaction.php" line="151"/>
+        <source>GetCustomer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/translation.php" line="24"/>
-        <source>Language invalid.</source>
+        <location filename="../inc/wob/transaction.php" line="152"/>
+        <source>GetAllCustomerNames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/translation.php" line="31"/>
-        <source>Language unknown.</source>
+        <location filename="../inc/wob/transaction.php" line="153"/>
+        <source>CreateCustomer</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Voucher</name>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="120"/>
-        <source>cancel voucher</source>
-        <translation type="obsolete">Gutschein zurückgegeben</translation>
+        <location filename="../inc/wob/transaction.php" line="154"/>
+        <source>ChangeCustomer</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="134"/>
-        <source>empty voucher</source>
-        <translation type="obsolete">Gutschein entleert</translation>
+        <location filename="../inc/wob/transaction.php" line="155"/>
+        <source>DeleteCustomer</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="157"/>
-        <source>create voucher</source>
-        <translation type="obsolete">Gutschein angelegt</translation>
+        <location filename="../inc/wob/transaction.php" line="156"/>
+        <source>GetAddress</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="221"/>
-        <source>pay with voucher</source>
-        <translation type="obsolete">mit Gutschein bezahlt</translation>
+        <location filename="../inc/wob/transaction.php" line="157"/>
+        <source>GetAllCountries</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="257"/>
-        <source>pay with voucher outside system</source>
-        <translation type="obsolete">mit Gutschein außerhalb des Systems bezahlt</translation>
+        <location filename="../inc/wob/transaction.php" line="158"/>
+        <source>CreateCountry</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOAddress</name>
     <message>
-        <location filename="../inc/wob/wo_Address.php" line="188"/>
-        <source>Unable to deserialize object of type WOAddress: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="159"/>
+        <source>GetAllArtists</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOArtist</name>
     <message>
-        <location filename="../inc/wob/wo_Artist.php" line="78"/>
-        <source>Unable to deserialize object of type WOArtist: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="160"/>
+        <source>CreateArtist</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOCartOrder</name>
     <message>
-        <location filename="../inc/wob/wo_CartOrder.php" line="162"/>
-        <source>Unable to deserialize object of type WOCartOrder: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="161"/>
+        <source>GetAllPriceCategories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartOrder.php" line="39"/>
-        <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <location filename="../inc/wob/transaction.php" line="162"/>
+        <source>CreatePriceCategory</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartOrder.php" line="40"/>
-        <source>SaleOnly</source>
+        <location filename="../inc/wob/transaction.php" line="163"/>
+        <source>ChangePriceCategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartOrder.php" line="41"/>
-        <source>OrderOnly</source>
+        <location filename="../inc/wob/transaction.php" line="164"/>
+        <source>GetEvent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartOrder.php" line="42"/>
-        <source>Invalid</source>
+        <location filename="../inc/wob/transaction.php" line="165"/>
+        <source>GetAllEvents</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOCartTicket</name>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="171"/>
-        <source>Unable to deserialize object of type WOCartTicket: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="166"/>
+        <source>GetEventList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="79"/>
-        <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <location filename="../inc/wob/transaction.php" line="167"/>
+        <source>CreateEvent</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="80"/>
-        <source>TooLate</source>
+        <location filename="../inc/wob/transaction.php" line="168"/>
+        <source>ChangeEvent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="81"/>
-        <source>Exhausted</source>
+        <location filename="../inc/wob/transaction.php" line="169"/>
+        <source>CancelEvent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="82"/>
-        <source>SaleOnly</source>
+        <location filename="../inc/wob/transaction.php" line="170"/>
+        <source>GetAllRooms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="83"/>
-        <source>OrderOnly</source>
+        <location filename="../inc/wob/transaction.php" line="171"/>
+        <source>CreateRoom</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOCartVoucher</name>
     <message>
-        <location filename="../inc/wob/wo_CartVoucher.php" line="117"/>
-        <source>Unable to deserialize object of type WOCartVoucher: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="172"/>
+        <source>GetEventSummary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartVoucher.php" line="59"/>
-        <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <location filename="../inc/wob/transaction.php" line="173"/>
+        <source>GetTicket</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartVoucher.php" line="60"/>
-        <source>InvalidValue</source>
+        <location filename="../inc/wob/transaction.php" line="174"/>
+        <source>GetVoucher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartVoucher.php" line="61"/>
-        <source>InvalidPrice</source>
+        <location filename="../inc/wob/transaction.php" line="175"/>
+        <source>GetOrder</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOContact</name>
     <message>
-        <location filename="../inc/wob/wo_Contact.php" line="96"/>
-        <source>Unable to deserialize object of type WOContact: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="176"/>
+        <source>GetOrderList</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOContactType</name>
     <message>
-        <location filename="../inc/wob/wo_ContactType.php" line="65"/>
-        <source>Unable to deserialize object of type WOContactType: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="177"/>
+        <source>GetOrdersByEvents</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOCountry</name>
     <message>
-        <location filename="../inc/wob/wo_Country.php" line="50"/>
-        <source>Unable to deserialize object of type WOCountry: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="178"/>
+        <source>GetOrdersByCustomer</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOCustomer</name>
     <message>
-        <location filename="../inc/wob/wo_Customer.php" line="139"/>
-        <source>Unable to deserialize object of type WOCustomer: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="179"/>
+        <source>GetOrderByBarcode</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOCustomerShort</name>
     <message>
-        <location filename="../inc/wob/wo_CustomerShort.php" line="52"/>
-        <source>Unable to deserialize object of type WOCustomerShort: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="180"/>
+        <source>CreateOrder</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOEvent</name>
     <message>
-        <location filename="../inc/wob/wo_Event.php" line="258"/>
-        <source>Unable to deserialize object of type WOEvent: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="181"/>
+        <source>CreateReservation</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOHost</name>
     <message>
-        <location filename="../inc/wob/wo_Host.php" line="50"/>
-        <source>Unable to deserialize object of type WOHost: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="182"/>
+        <source>ReservationToOrder</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOOrder</name>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="289"/>
-        <source>Unable to deserialize object of type WOOrder: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="183"/>
+        <source>CancelOrder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="140"/>
-        <source>Placed</source>
+        <location filename="../inc/wob/transaction.php" line="184"/>
+        <source>OrderPay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="141"/>
-        <source>Sent</source>
+        <location filename="../inc/wob/transaction.php" line="185"/>
+        <source>OrderRefund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="142"/>
-        <source>Sold</source>
-        <translation type="unfinished">Verkauft</translation>
+        <location filename="../inc/wob/transaction.php" line="186"/>
+        <source>UseVoucher</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="143"/>
-        <source>Cancelled</source>
+        <location filename="../inc/wob/transaction.php" line="187"/>
+        <source>DeductVoucher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="144"/>
-        <source>Reserved</source>
-        <translation type="unfinished">Reserviert</translation>
+        <location filename="../inc/wob/transaction.php" line="188"/>
+        <source>EmptyVoucher</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="145"/>
-        <source>Closed</source>
+        <location filename="../inc/wob/transaction.php" line="189"/>
+        <source>OrderChangeShipping</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOPrice</name>
     <message>
-        <location filename="../inc/wob/wo_Price.php" line="97"/>
-        <source>Unable to deserialize object of type WOPrice: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="190"/>
+        <source>OrderMarkShipped</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WORoom</name>
     <message>
-        <location filename="../inc/wob/wo_Room.php" line="65"/>
-        <source>Unable to deserialize object of type WORoom: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="191"/>
+        <source>OrderAddComment</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOShipping</name>
     <message>
-        <location filename="../inc/wob/wo_Shipping.php" line="114"/>
-        <source>Unable to deserialize object of type WOShipping: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="192"/>
+        <source>OrderChangeComments</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOTicket</name>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="232"/>
-        <source>Unable to deserialize object of type WOTicket: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="193"/>
+        <source>ReturnTicketVoucher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="89"/>
-        <source>Reserved</source>
-        <translation type="unfinished">Reserviert</translation>
+        <location filename="../inc/wob/transaction.php" line="194"/>
+        <source>ChangeTicketPrice</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="90"/>
-        <source>Ordered</source>
+        <location filename="../inc/wob/transaction.php" line="195"/>
+        <source>ChangeTicketPriceCategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="91"/>
-        <source>Used</source>
-        <translation type="unfinished">Benutzt</translation>
+        <location filename="../inc/wob/transaction.php" line="196"/>
+        <source>GetAllShipping</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="92"/>
-        <source>Cancelled</source>
+        <location filename="../inc/wob/transaction.php" line="197"/>
+        <source>ChangeShipping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="93"/>
-        <source>Refund</source>
+        <location filename="../inc/wob/transaction.php" line="198"/>
+        <source>CreateShipping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="94"/>
-        <source>MaskBlock</source>
+        <location filename="../inc/wob/transaction.php" line="199"/>
+        <source>DeleteShipping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="95"/>
-        <source>MaskPay</source>
+        <location filename="../inc/wob/transaction.php" line="200"/>
+        <source>GetValidVoucherPrices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="96"/>
-        <source>MaskUsable</source>
+        <location filename="../inc/wob/transaction.php" line="201"/>
+        <source>UseTicket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="97"/>
-        <source>MaskReturnable</source>
+        <location filename="../inc/wob/transaction.php" line="202"/>
+        <source>GetEntranceEvents</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOUser</name>
     <message>
-        <location filename="../inc/wob/wo_User.php" line="50"/>
-        <source>Unable to deserialize object of type WOUser: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="203"/>
+        <source>GetTemplateList</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOVoucher</name>
     <message>
-        <location filename="../inc/wob/wo_Voucher.php" line="146"/>
-        <source>Unable to deserialize object of type WOVoucher: invalid XML.</source>
+        <location filename="../inc/wob/transaction.php" line="204"/>
+        <source>GetTemplate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Voucher.php" line="71"/>
-        <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <location filename="../inc/wob/transaction.php" line="205"/>
+        <source>SetTemplate</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Voucher.php" line="72"/>
-        <source>InvalidValue</source>
+        <location filename="../inc/wob/transaction.php" line="206"/>
+        <source>SetTemplateDescription</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Voucher.php" line="73"/>
-        <source>InvalidPrice</source>
+        <location filename="../inc/wob/transaction.php" line="207"/>
+        <source>DeleteTemplate</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>initkey</name>
     <message>
-        <location filename="main.cpp" line="145"/>
         <source>Warning</source>
         <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="133"/>
         <source>Magic Smoke needs a host key. You have to generate one before you can use the program.</source>
         <translation type="obsolete">MagicSmoke braucht einen Hostkey. Sie müssen einen Hostkey generieren bevor das Programm benutzt werden kann.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="139"/>
         <source>Enter Host Name</source>
         <translation type="obsolete">Bitte Hostnamen eingeben</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="140"/>
         <source>Host name:</source>
         <translation type="obsolete">Hostname:</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="145"/>
         <source>Magic Smoke needs a host name. You have to configure one before you can use the program.</source>
         <translation type="obsolete">MagicSmoke braucht einen Hostnamen. Sie müssen einen Hostnamen eingeben bevor das Programm benutzt werden kann.</translation>
     </message>
@@ -4220,18 +4538,15 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>initprofile</name>
     <message>
-        <location filename="main.cpp" line="154"/>
         <source>default</source>
         <comment>initial profile</comment>
         <translation type="obsolete">Standardprofil</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="155"/>
         <source>Create Initial Profile</source>
         <translation type="obsolete">Initiales Profil anlegen</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="155"/>
         <source>You need a profile to work with Magic Smoke. Magic Smoke will now create one for you. Please enter the name you wish to give this profile.</source>
         <translation type="obsolete">MagicSmoke braucht mindestens ein Profil um benutzt zu werden. Es wird nun eines generieren. Bitte geben Sie einen Namen für das Profil ein:</translation>
     </message>
@@ -4239,22 +4554,18 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>lang</name>
     <message>
-        <location filename="main.cpp" line="63"/>
         <source>Information</source>
         <translation type="obsolete">Information</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="63"/>
         <source>The changed language setting will only be active after restarting the application.</source>
         <translation type="obsolete">Die Änderung der Sprachkonfiguration wird es nach dem nächsten Neustart des Programms wirksam.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="58"/>
         <source>Chose Language</source>
         <translation type="obsolete">Sprache auswählen</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="58"/>
         <source>Language:</source>
         <translation type="obsolete">Sprache:</translation>
     </message>
@@ -4262,37 +4573,31 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>misc</name>
     <message>
-        <location filename="misc.cpp" line="52"/>
         <source>%1.%2</source>
         <comment>price with decimal dot</comment>
         <translation type="obsolete">%1,%2</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="60"/>
         <source>.</source>
         <comment>decimal dot in price</comment>
         <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="86"/>
         <source>[0-9]+\.[0-9]{2}</source>
         <comment>regexp for price</comment>
         <translation type="obsolete">[0-9]+,[0-9]{2}</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="94"/>
         <source>yyyy-MM-dd</source>
         <comment>localized date format</comment>
         <translation type="obsolete">d.M.yyyy</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="102"/>
         <source>hh:mm</source>
         <comment>localized time format</comment>
         <translation type="obsolete">hh:mm</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="110"/>
         <source>yyyy-MM-dd hh:mm</source>
         <comment>localized date + time format</comment>
         <translation type="obsolete">ddd, dd.MM.yyyy hh:mm &apos;Uhr&apos;</translation>
@@ -4301,27 +4606,22 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>office</name>
     <message>
-        <location filename="office.cpp" line="47"/>
         <source>Chose Printer</source>
         <translation type="obsolete">Drucker auswählen</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="50"/>
         <source>Please chose a printer:</source>
         <translation type="obsolete">Bitte wählen Sie einen Drucker:</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="54"/>
         <source>(Default Printer)</source>
         <translation type="obsolete">(Standarddrucker)</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="70"/>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="92"/>
         <source>Save current document as...</source>
         <translation type="obsolete">Aktuelles Dokuement speichern unter...</translation>
     </message>
@@ -4329,516 +4629,390 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>php::</name>
     <message>
-        <location filename="../inc/classes/customer.php" line="259"/>
         <source>Unknown Customer</source>
-        <translation>Unbekannter Kunde</translation>
+        <translation type="obsolete">Unbekannter Kunde</translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="271"/>
         <source>Unable to parse XML.</source>
-        <translation>Kann XML Daten nicht parsen.</translation>
+        <translation type="obsolete">Kann XML Daten nicht parsen.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="316"/>
         <source>Cannot find customer ID to delete.</source>
-        <translation>Kann zu löschende Kundennummer nicht finden.</translation>
+        <translation type="obsolete">Kann zu löschende Kundennummer nicht finden.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="322"/>
         <source>Invalid Customer ID, cannot delete.</source>
-        <translation>Ungültige Kundennummer kann nicht gelöscht werden.</translation>
+        <translation type="obsolete">Ungültige Kundennummer kann nicht gelöscht werden.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="330"/>
         <source>Invalid Customer ID, cannot merge.</source>
-        <translation>Ungültige Kundennummer kann nicht vereint werden.</translation>
+        <translation type="obsolete">Ungültige Kundennummer kann nicht vereint werden.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="348"/>
         <source>Cannot find Customer ID, cannot delete.</source>
-        <translation>Kann zu löschende Kundennummer nicht finden.</translation>
+        <translation type="obsolete">Kann zu löschende Kundennummer nicht finden.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="369"/>
         <source>Cannot merge customers.</source>
-        <translation>Kann Kunden-Einträge nicht vereinen.</translation>
+        <translation type="obsolete">Kann Kunden-Einträge nicht vereinen.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="379"/>
         <source>Cannot delete customer.</source>
-        <translation>Kann Kunde nicht löschen.</translation>
+        <translation type="obsolete">Kann Kunde nicht löschen.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="257"/>
         <source>Malformed request.</source>
-        <translation>Fehlerhaftes Anfrageformat.</translation>
+        <translation type="obsolete">Fehlerhaftes Anfrageformat.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/event.php" line="431"/>
         <source>The event id must be numeric.</source>
-        <translation>Die Veranstaltungsnummer muss numerisch sein.</translation>
+        <translation type="obsolete">Die Veranstaltungsnummer muss numerisch sein.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/event.php" line="445"/>
         <source>Invalid event id.</source>
-        <translation>Ungültige Veranstaltungsnummer.</translation>
+        <translation type="obsolete">Ungültige Veranstaltungsnummer.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="800"/>
         <source>Cannot place order, sorry.</source>
-        <translation>Kann Bestellung nicht anlegen.</translation>
+        <translation type="obsolete">Kann Bestellung nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="790"/>
         <source>Cannot place sale, sorry.</source>
-        <translation>Kann Verkauf nicht anlegen.</translation>
+        <translation type="obsolete">Kann Verkauf nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="805"/>
         <source>Internal Error: unknown action.</source>
-        <translation>Interner Fehler: unbekannte Aktion.</translation>
+        <translation type="obsolete">Interner Fehler: unbekannte Aktion.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="873"/>
         <source>No such orderID in database.</source>
-        <translation>Diese Bestellnummer existiert nicht in der Datenbank.</translation>
+        <translation type="obsolete">Diese Bestellnummer existiert nicht in der Datenbank.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="884"/>
         <source>Expected 2 arguments.</source>
-        <translation>2 Argumente erwartet.</translation>
+        <translation type="obsolete">2 Argumente erwartet.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="890"/>
         <source>Invalid Order ID</source>
-        <translation>Ungültige Bestellnummer.</translation>
+        <translation type="obsolete">Ungültige Bestellnummer.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="896"/>
         <source>Expected positive amount.</source>
-        <translation>Die Anzahl muss eine positive Zahl sein.</translation>
+        <translation type="obsolete">Die Anzahl muss eine positive Zahl sein.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="905"/>
         <source>Order does not exist.</source>
-        <translation>Bestellung existiert nicht.</translation>
+        <translation type="obsolete">Bestellung existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="911"/>
         <source>Order cannot be changed, it is closed.</source>
-        <translation>Die Bestellung kann nicht geändert werden, da sie bereits geschlossen ist.</translation>
+        <translation type="obsolete">Die Bestellung kann nicht geändert werden, da sie bereits geschlossen ist.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="970"/>
         <source>Order ID must be numeric.</source>
-        <translation>Bestellnummer muss numerisch sein.</translation>
+        <translation type="obsolete">Bestellnummer muss numerisch sein.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="980"/>
         <source>Order ID is invalid.</source>
-        <translation>Bestellnummer ist ungültig.</translation>
+        <translation type="obsolete">Bestellnummer ist ungültig.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="961"/>
         <source>Wrong state, cannot set order to shipped.</source>
-        <translation>Kann Bestellung nicht auf &quot;versandt&quot; setzen: sie ist im falschen Ausgangszustand.</translation>
+        <translation type="obsolete">Kann Bestellung nicht auf &quot;versandt&quot; setzen: sie ist im falschen Ausgangszustand.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="986"/>
         <source>Wrong state, cannot set order to cancelled.</source>
-        <translation>Kann Bestellung nicht auf &quot;abgebrochen&quot; setzen: sie ist im falschen Ausgangszustand.</translation>
+        <translation type="obsolete">Kann Bestellung nicht auf &quot;abgebrochen&quot; setzen: sie ist im falschen Ausgangszustand.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ticket not found.</source>
         <translation type="obsolete">Karte nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ticket has no order.</source>
         <translation type="obsolete">Karte hat keine Bestellung.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="203"/>
         <source>The ticket is not valid.</source>
-        <translation type="unfinished">Die Karte ist nicht gültig.</translation>
+        <translation type="obsolete">Die Karte ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="207"/>
         <source>The ticket has already been used.</source>
-        <translation type="unfinished">Die Karte wurde bereits benutzt.</translation>
+        <translation type="obsolete">Die Karte wurde bereits benutzt.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="211"/>
         <source>The ticket has not been bought or is cancelled.</source>
-        <translation type="unfinished">Die Karte wurde nicht gekauft oder ist zurückgegeben.</translation>
+        <translation type="obsolete">Die Karte wurde nicht gekauft oder ist zurückgegeben.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="216"/>
         <source>The ticket has not been paid.</source>
-        <translation type="unfinished">Die Karte ist nicht bezahlt.</translation>
+        <translation type="obsolete">Die Karte ist nicht bezahlt.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="220"/>
         <source>The tickets order is in an invalid state or does not exist.</source>
-        <translation type="unfinished">Die Bestellung dieser Karte ist in einem ungültigen Zustand oder existiert nicht.</translation>
+        <translation type="obsolete">Die Bestellung dieser Karte ist in einem ungültigen Zustand oder existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="292"/>
         <source>Unable to find this ticket.</source>
-        <translation>Kann diese Karte nicht finden.</translation>
+        <translation type="obsolete">Kann diese Karte nicht finden.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="262"/>
         <source>Price must be a number.</source>
-        <translation>Der Preis muss eine Zahl sein.</translation>
+        <translation type="obsolete">Der Preis muss eine Zahl sein.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="267"/>
         <source>Price must be positive.</source>
-        <translation>Der Preis muss positiv sein.</translation>
+        <translation type="obsolete">Der Preis muss positiv sein.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="297"/>
         <source>Ticket cannot be returned.</source>
-        <translation>Karte kann nicht zurückgegeben werden.</translation>
+        <translation type="obsolete">Karte kann nicht zurückgegeben werden.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="523"/>
         <source>unable to parse XML data</source>
-        <translation>Kann XML Daten nicht parsen</translation>
+        <translation type="obsolete">Kann XML Daten nicht parsen</translation>
     </message>
     <message>
-        <location filename="../inc/machine/host.php" line="91"/>
         <source>Cannot delete special hosts.</source>
-        <translation>Spezialhosts können nicht gelöscht werden.</translation>
+        <translation type="obsolete">Spezialhosts können nicht gelöscht werden.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>missing some authentication data</source>
         <translation type="obsolete">Authentifikationsdaten sind unvollständig</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Not authenticated. Can&apos;t change password.</source>
         <translation type="obsolete">Nicht authentifiziert, Passwort kann nicht geändert werden.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="528"/>
         <source>expected exactly one passwd element</source>
-        <translation>Nur 1 &quot;passwd&quot; Element erwartet.</translation>
+        <translation type="obsolete">Nur 1 &quot;passwd&quot; Element erwartet.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="536"/>
         <source>cannot set an empty password</source>
-        <translation>Leeres Passwort kann nicht gesetzt werden</translation>
+        <translation type="obsolete">Leeres Passwort kann nicht gesetzt werden</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="184"/>
         <source>Ooops. Unable to find user. You have been deleted.</source>
-        <translation type="unfinished">Ups. Sie wurden gelöscht.</translation>
+        <translation type="obsolete">Ups. Sie wurden gelöscht.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Wrong password. Session hijacked, terminating it.</source>
         <translation type="obsolete">Falsches Passwort. Session wird beendet.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="322"/>
         <source>invalid user name</source>
-        <translation>Falscher Nutzername.</translation>
+        <translation type="obsolete">Falscher Nutzername.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="281"/>
         <source>expected exactly 1 ACL element</source>
-        <translation>Clientfehler: es wurde nur 1 ACL Element erwartet.</translation>
+        <translation type="obsolete">Clientfehler: es wurde nur 1 ACL Element erwartet.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="380"/>
         <source>unknown user name</source>
-        <translation>Unbekannter Nutzer.</translation>
+        <translation type="obsolete">Unbekannter Nutzer.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="364"/>
         <source>expected exactly 1 Hosts element</source>
-        <translation>Clientfehler: es wurde nur 1 Hosts Element erwartet.</translation>
+        <translation type="obsolete">Clientfehler: es wurde nur 1 Hosts Element erwartet.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="468"/>
         <source>Syntax Error</source>
-        <translation>Syntaxfehler</translation>
+        <translation type="obsolete">Syntaxfehler</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="486"/>
         <source>Cannot remove user: DB error while deleting ACL.</source>
-        <translation>Kann Nutzer nicht löschen: Datenbankfehler beim Löschen der Zugriffsrechte.</translation>
+        <translation type="obsolete">Kann Nutzer nicht löschen: Datenbankfehler beim Löschen der Zugriffsrechte.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="495"/>
         <source>Cannot remove user: unable to replace user.</source>
-        <translation>Kann Nutzer nicht löschen: kann Nutzer nicht ersetzen.</translation>
+        <translation type="obsolete">Kann Nutzer nicht löschen: kann Nutzer nicht ersetzen.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="509"/>
         <source>Cannot remove user: DB error while deleting user.</source>
-        <translation>Kann Nutzer nicht löschen: Datenbankfehler beim Löschen.</translation>
+        <translation type="obsolete">Kann Nutzer nicht löschen: Datenbankfehler beim Löschen.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="541"/>
         <source>Unable to change this password.</source>
-        <translation>Dieses Passwort kann nicht geändert werden.</translation>
+        <translation type="obsolete">Dieses Passwort kann nicht geändert werden.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/template.php" line="42"/>
         <source>Template File not found in database</source>
-        <translation>Vorlage kann nicht gefunden werden.</translation>
+        <translation type="obsolete">Vorlage kann nicht gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/template.php" line="83"/>
         <source>Unable to find file name</source>
-        <translation>Dateiname kann nicht gefunden werden.</translation>
+        <translation type="obsolete">Dateiname kann nicht gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/template.php" line="91"/>
         <source>Illegal File Name</source>
-        <translation>Illegaler Dateiname</translation>
+        <translation type="obsolete">Illegaler Dateiname</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="73"/>
         <source>Invalid Request, please use the MagicSmoke Client with this page.</source>
         <translation type="obsolete">Interner Fehler: Fehlerhafte Anfrage - bitte einen aktuellen MagicSmoke Client benutzen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="127"/>
         <source>Invalid or missing sessionid, or session timed out.</source>
         <translation type="obsolete">Die Session kann nicht benutzt werden. Bitte neu anmelden.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="139"/>
         <source>Session not yet authenticated.</source>
         <translation type="obsolete">Die Session ist noch nicht authentifiziert.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="151"/>
         <source>You do not have the right to execute this transaction.</source>
         <translation type="obsolete">Sie haben nicht das Recht diese Transaktin durchzuführen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="492"/>
         <source>Internal Error: unknown command, hiccup in code structure.</source>
         <translation type="obsolete">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="../inc/classes/order.php" line="407"/>
         <source>invalidvalue</source>
         <comment>voucher state</comment>
-        <translation type="unfinished">Gutscheinwert nicht zulässig</translation>
+        <translation type="obsolete">Gutscheinwert nicht zulässig</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="413"/>
         <source>invalidprice</source>
         <comment>voucher state</comment>
-        <translation type="unfinished">Gutscheinpreis nicht zulässig</translation>
+        <translation type="obsolete">Gutscheinpreis nicht zulässig</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="434"/>
         <source>Shipping type not available to user.</source>
-        <translation type="unfinished">Diese Versandoption ist privilegierten Nutzern vorbehalten.</translation>
+        <translation type="obsolete">Diese Versandoption ist privilegierten Nutzern vorbehalten.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="451"/>
         <source>Illegal shipping type.</source>
-        <translation type="unfinished">Ungültige Versandoption.</translation>
+        <translation type="obsolete">Ungültige Versandoption.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="916"/>
         <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>
+        <translation type="obsolete">Dies ist eine Reservierung: kann keine Bezahlung annehmen solange sie nicht bestellt wurde.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1072"/>
         <source>Unable to update order comment.</source>
-        <translation>Kann Bestellkommentar nicht ändern.</translation>
+        <translation type="obsolete">Kann Bestellkommentar nicht ändern.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1217"/>
         <source>Invalid Order.</source>
-        <translation>Ungültige Bestellung.</translation>
+        <translation type="obsolete">Ungültige Bestellung.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1112"/>
         <source>Invalid Shipping Method.</source>
-        <translation>Ungültige Versandoption.</translation>
+        <translation type="obsolete">Ungültige Versandoption.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1179"/>
         <source>Unable to create new shipping method.</source>
-        <translation>Kann neue Versandoption nicht anlegen.</translation>
+        <translation type="obsolete">Kann neue Versandoption nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1188"/>
         <source>Unable to change shipping method.</source>
-        <translation>Kann Versandoption nicht ändern.</translation>
+        <translation type="obsolete">Kann Versandoption nicht ändern.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1201"/>
         <source>Expected a numeric shipping ID.</source>
-        <translation>Erwarte numerische Versandoptionsnummer.</translation>
+        <translation type="obsolete">Erwarte numerische Versandoptionsnummer.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1206"/>
         <source>Unable to delete shipping method.</source>
-        <translation>Kann Versandoption nicht löschen.</translation>
+        <translation type="obsolete">Kann Versandoption nicht löschen.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1224"/>
         <source>Cannot change order from reservation.</source>
-        <translation>Kann Reservierung nicht wandeln.</translation>
+        <translation type="obsolete">Kann Reservierung nicht wandeln.</translation>
     </message>
     <message>
-        <location filename="../inc/machine/template.php" line="98"/>
         <source>Template file does not exist</source>
-        <translation>Vorlage existiert nicht.</translation>
+        <translation type="obsolete">Vorlage existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="295"/>
         <source>Unable to cancel voucher.</source>
-        <translation>Kann Gutschein nicht zurückgeben.</translation>
+        <translation type="obsolete">Kann Gutschein nicht zurückgeben.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="303"/>
         <source>Invalid voucher, cannot empty it.</source>
-        <translation>Ungültiger Gutschein, er kann nicht geleert werden.</translation>
+        <translation type="obsolete">Ungültiger Gutschein, er kann nicht geleert werden.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="316"/>
         <source>Expected two arguments: voucher id and order id.</source>
-        <translation>Es wurden zwei Argumente erwartet: Gutschein-ID und Bestell-ID.</translation>
+        <translation type="obsolete">Es wurden zwei Argumente erwartet: Gutschein-ID und Bestell-ID.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="350"/>
         <source>Invalid voucher id.</source>
-        <translation>Ungültige Gutschein-ID.</translation>
+        <translation type="obsolete">Ungültige Gutschein-ID.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="360"/>
         <source>Unable to process payment via voucher.</source>
-        <translation>Die Bezahlung per Gutschein kann nicht durchgeführt werden.</translation>
+        <translation type="obsolete">Die Bezahlung per Gutschein kann nicht durchgeführt werden.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="369"/>
         <source>Invalid voucher ID.</source>
-        <translation>Ungültige Gutschein-ID.</translation>
+        <translation type="obsolete">Ungültige Gutschein-ID.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="256"/>
         <source>create order</source>
-        <translation type="unfinished">Bestellung angelegt</translation>
+        <translation type="obsolete">Bestellung angelegt</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="669"/>
         <source>order cancelled</source>
-        <translation type="unfinished">Bestellung storniert</translation>
+        <translation type="obsolete">Bestellung storniert</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="707"/>
         <source>reservation to order</source>
-        <translation type="unfinished">Reservierung zu Bestellung gewandelt</translation>
+        <translation type="obsolete">Reservierung zu Bestellung gewandelt</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="921"/>
         <source>payment</source>
-        <translation>Bezahlung</translation>
+        <translation type="obsolete">Bezahlung</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="921"/>
         <source>refund</source>
-        <translation>Geldrückgabe</translation>
+        <translation type="obsolete">Geldrückgabe</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1000"/>
         <source>Ticket or Voucher not found.</source>
-        <translation>Karte oder Gutschein nicht gefunden.</translation>
+        <translation type="obsolete">Karte oder Gutschein nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1005"/>
         <source>Ticket/Voucher has no order.</source>
-        <translation>Karte/Gutschein hat keine Bestellung.</translation>
+        <translation type="obsolete">Karte/Gutschein hat keine Bestellung.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1124"/>
         <source>shipping changed</source>
-        <translation>Versand geändert</translation>
+        <translation type="obsolete">Versand geändert</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1244"/>
         <source>Expected 2 arguments: query type and ID.</source>
-        <translation>2 Argumente erwartet: Anfragetyp und ID.</translation>
+        <translation type="obsolete">2 Argumente erwartet: Anfragetyp und ID.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1263"/>
         <source>Invalid Query Type.</source>
-        <translation>Ungültige Anfrage.</translation>
+        <translation type="obsolete">Ungültige Anfrage.</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="120"/>
         <source>cancel voucher</source>
-        <translation type="unfinished">Gutschein zurückgegeben</translation>
+        <translation type="obsolete">Gutschein zurückgegeben</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="134"/>
         <source>empty voucher</source>
-        <translation type="unfinished">Gutschein entleert</translation>
+        <translation type="obsolete">Gutschein entleert</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="157"/>
         <source>create voucher</source>
-        <translation type="unfinished">Gutschein angelegt</translation>
+        <translation type="obsolete">Gutschein angelegt</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="221"/>
         <source>pay with voucher</source>
-        <translation type="unfinished">mit Gutschein bezahlt</translation>
+        <translation type="obsolete">mit Gutschein bezahlt</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="257"/>
         <source>pay with voucher outside system</source>
-        <translation type="unfinished">mit Gutschein außerhalb des Systems bezahlt</translation>
+        <translation type="obsolete">mit Gutschein außerhalb des Systems bezahlt</translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="344"/>
         <source>Expected two arguments: voucher id and amount to deduct.</source>
-        <translation>2 Argumente erwartet: Gutscheinnummer und Betrag.</translation>
-    </message>
-    <message>
-        <location filename="../inc/machine/session.php" line="82"/>
-        <source>Unknown Host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inc/machine/session.php" line="89"/>
-        <source>Host/User combination not allowed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inc/machine/session.php" line="99"/>
-        <source>Host authentication failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inc/machine/session.php" line="114"/>
-        <source>User Authentication failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inc/machine/session.php" line="187"/>
-        <source>Ooops. Internal storage error - cannot verify old password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inc/machine/session.php" line="190"/>
-        <source>Wrong password. Request denied.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">2 Argumente erwartet: Gutscheinnummer und Betrag.</translation>
     </message>
 </context>
 </TS>
diff --git a/www/translations/server_en.ts b/www/translations/server_en.ts
index dee7b98..f7ca432 100644
--- a/www/translations/server_en.ts
+++ b/www/translations/server_en.ts
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="en">
+<!DOCTYPE TS>
+<TS version="2.0" language="en">
 <context>
     <name>MKeyGen</name>
     <message numerus="yes">
-        <location filename="keygen.cpp" line="88"/>
         <source>Current random buffer: %n Bits</source>
         <translation type="obsolete">
             <numerusform>Current random buffer: %n Bit</numerusform>
@@ -14,7 +14,6 @@
 <context>
     <name>MOverview</name>
     <message numerus="yes">
-        <location filename="overview.cpp" line="645"/>
         <source>The key of this new host could only be generated with %n bits entropy. Store anyway?</source>
         <translation type="obsolete">
             <numerusform>The key of this new host could only be generated with %n bit of entropy. Store anyway?</numerusform>
@@ -22,7 +21,6 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="687"/>
         <source>The new key of this host could only be generated with %n bits entropy. Store anyway?</source>
         <translation type="obsolete">
             <numerusform>The key of this new host could only be generated with %n bit of entropy. Store anyway?</numerusform>
@@ -31,525 +29,509 @@
     </message>
 </context>
 <context>
-    <name>SpecialHost</name>
+    <name>MachineUser</name>
     <message>
-        <location filename="../inc/wob/schema.php" line="38"/>
-        <source>_any</source>
-        <translation>any host (even unregistered ones)</translation>
+        <location filename="../inc/machine/muser.php" line="25"/>
+        <source>User already exists.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="42"/>
-        <source>_anon</source>
-        <translation type="obsolete">any registered host</translation>
+        <location filename="../inc/machine/muser.php" line="30"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="43"/>
-        <source>_online</source>
-        <translation type="obsolete">web system</translation>
+        <location filename="../inc/machine/muser.php" line="50"/>
+        <location filename="../inc/machine/muser.php" line="82"/>
+        <location filename="../inc/machine/muser.php" line="96"/>
+        <location filename="../inc/machine/muser.php" line="109"/>
+        <location filename="../inc/machine/muser.php" line="129"/>
+        <location filename="../inc/machine/muser.php" line="159"/>
+        <location filename="../inc/machine/muser.php" line="178"/>
+        <location filename="../inc/machine/muser.php" line="244"/>
+        <source>User does not exist.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TransactionNames</name>
     <message>
-        <location filename="../inc/wob/transaction.php" line="51"/>
-        <source>Backup</source>
+        <location filename="../inc/machine/muser.php" line="59"/>
+        <source>Merge target user does not exist!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="52"/>
-        <source>GetLanguage</source>
+        <location filename="../inc/machine/muser.php" line="65"/>
+        <source>User and merge target user are identical.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="53"/>
-        <source>ServerInfo</source>
+        <location filename="../inc/machine/muser.php" line="141"/>
+        <source>Trying to assign non-existent role.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="54"/>
-        <source>Login</source>
+        <location filename="../inc/machine/muser.php" line="190"/>
+        <source>Trying to assign non-existent host.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="55"/>
-        <source>Logout</source>
+        <location filename="../inc/machine/muser.php" line="219"/>
+        <location filename="../inc/machine/muser.php" line="267"/>
+        <location filename="../inc/machine/muser.php" line="304"/>
+        <location filename="../inc/machine/muser.php" line="337"/>
+        <source>Role does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="56"/>
-        <source>GetMyRoles</source>
+        <location filename="../inc/machine/muser.php" line="228"/>
+        <location filename="../inc/machine/muser.php" line="253"/>
+        <source>Trying to assign non-existent flag.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="57"/>
-        <source>GetMyRights</source>
+        <location filename="../inc/machine/muser.php" line="281"/>
+        <source>Illegal role name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="58"/>
-        <source>ChangeMyPassword</source>
+        <location filename="../inc/machine/muser.php" line="287"/>
+        <source>Role already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="59"/>
-        <source>GetAllUsers</source>
+        <location filename="../inc/machine/muser.php" line="313"/>
+        <source>Trying to set an illegal right.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="60"/>
-        <source>CreateUser</source>
+        <location filename="../inc/machine/muser.php" line="331"/>
+        <source>Cannot delete special roles.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="61"/>
-        <source>ChangePassword</source>
+        <location filename="../inc/machine/muser.php" line="354"/>
+        <source>Cannot set/create special hosts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="62"/>
-        <source>DeleteUser</source>
+        <location filename="../inc/machine/muser.php" line="358"/>
+        <source>Illegal host name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="63"/>
-        <source>SetUserDescription</source>
+        <location filename="../inc/machine/muser.php" line="378"/>
+        <source>Cannot delete special hosts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="64"/>
-        <source>GetUserRoles</source>
+        <location filename="../inc/machine/muser.php" line="384"/>
+        <source>Host does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Order</name>
     <message>
-        <location filename="../inc/wob/transaction.php" line="65"/>
-        <source>SetUserRoles</source>
+        <location filename="../inc/classes/order.php" line="256"/>
+        <source>create order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="66"/>
-        <source>GetAllHostNames</source>
+        <location filename="../inc/classes/order.php" line="407"/>
+        <source>invalidvalue</source>
+        <comment>voucher state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="67"/>
-        <source>GetAllHosts</source>
+        <location filename="../inc/classes/order.php" line="413"/>
+        <source>invalidprice</source>
+        <comment>voucher state</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="68"/>
-        <source>SetHost</source>
+        <location filename="../inc/classes/order.php" line="434"/>
+        <source>Shipping type not available to user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="69"/>
-        <source>DeleteHost</source>
+        <location filename="../inc/classes/order.php" line="451"/>
+        <source>Illegal shipping type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="70"/>
-        <source>GetUserHosts</source>
+        <location filename="../inc/classes/order.php" line="669"/>
+        <source>order cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="71"/>
-        <source>SetUserHosts</source>
+        <location filename="../inc/classes/order.php" line="707"/>
+        <source>reservation to order</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Session</name>
     <message>
-        <location filename="../inc/wob/transaction.php" line="72"/>
-        <source>GetCustomer</source>
+        <location filename="../inc/machine/session.php" line="122"/>
+        <source>Unknown Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="73"/>
-        <source>GetAllCustomerNames</source>
+        <location filename="../inc/machine/session.php" line="129"/>
+        <source>Host/User combination not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="74"/>
-        <source>GetEvent</source>
+        <location filename="../inc/machine/session.php" line="135"/>
+        <location filename="../inc/machine/session.php" line="139"/>
+        <source>Host authentication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="75"/>
-        <source>GetAllEvents</source>
+        <location filename="../inc/machine/session.php" line="145"/>
+        <location filename="../inc/machine/session.php" line="150"/>
+        <location filename="../inc/machine/session.php" line="154"/>
+        <source>User Authentication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="76"/>
-        <source>CancelEvent</source>
+        <location filename="../inc/machine/session.php" line="210"/>
+        <source>cannot set an empty password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="77"/>
-        <source>GetAllRooms</source>
+        <location filename="../inc/machine/session.php" line="215"/>
+        <source>Ooops. Unable to find user. You have been deleted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="78"/>
-        <source>GetTicket</source>
+        <location filename="../inc/machine/session.php" line="218"/>
+        <source>Ooops. Internal storage error - cannot verify old password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="79"/>
-        <source>GetVoucher</source>
+        <location filename="../inc/machine/session.php" line="221"/>
+        <source>Wrong password. Request denied.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SpecialHost</name>
+    <message>
+        <location filename="../inc/wob/schema.php" line="29"/>
+        <source>_any</source>
+        <translation>any host (even unregistered ones)</translation>
+    </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="80"/>
-        <source>GetOrder</source>
+        <source>_anon</source>
+        <translation type="obsolete">any registered host</translation>
+    </message>
+    <message>
+        <source>_online</source>
+        <translation type="obsolete">web system</translation>
+    </message>
+</context>
+<context>
+    <name>Ticket</name>
+    <message>
+        <location filename="../inc/classes/ticket.php" line="203"/>
+        <source>The ticket is not valid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/transaction.php" line="81"/>
-        <source>GetAllShipping</source>
+        <location filename="../inc/classes/ticket.php" line="207"/>
+        <source>The ticket has already been used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/ticket.php" line="211"/>
+        <source>The ticket has not been bought or is cancelled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/ticket.php" line="216"/>
+        <source>The ticket has not been paid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/ticket.php" line="220"/>
+        <source>The tickets order is in an invalid state or does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TransactionNames::</name>
     <message>
-        <location filename="../www/machine.php" line="19"/>
         <source>serverinfo</source>
         <translation type="obsolete">basic server information (implicitly granted)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>startsession</source>
         <translation type="obsolete">start a session (implicitly granted)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>sessionauth</source>
         <translation type="obsolete">authenticate to the server (implicitly granted)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>closesession</source>
         <translation type="obsolete">end my own session</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
         <source>getmyroles</source>
         <translation type="obsolete">retrieve the roles/privileges I have</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getusers</source>
         <translation type="obsolete">get a list of all (system) users existing at the system</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>setuserdescription</source>
         <translation type="obsolete">get description of a user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getuseracl</source>
         <translation type="obsolete">get the roles/privileges of any user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>setuseracl</source>
         <translation type="obsolete">set the roles/privileges of any user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getuserhosts</source>
         <translation type="obsolete">get the hosts a user may connect from</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setuserhosts</source>
         <translation type="obsolete">set the hosts a user may connect from</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>adduser</source>
         <translation type="obsolete">add a new user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>deleteuser</source>
         <translation type="obsolete">delete a user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setmypasswd</source>
         <translation type="obsolete">set my own password</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setpasswd</source>
         <translation type="obsolete">set the password of any user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>gethosts</source>
         <translation type="obsolete">get all hosts that are known to the system</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>sethost</source>
         <translation type="obsolete">change a host</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>addhost</source>
         <translation type="obsolete">add a new host to the system</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>deletehost</source>
         <translation type="obsolete">delete a host</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>geteventlist</source>
         <translation type="obsolete">get a list of events (overview)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>geteventdata</source>
         <translation type="obsolete">get detailed event data</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>seteventdata</source>
         <translation type="obsolete">change/create an event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>eventsummary</source>
         <translation type="obsolete">get summary data for a specific event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>cancelevent</source>
         <translation type="obsolete">cancel an event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
         <source>getroomdata</source>
         <translation type="obsolete">get detailed data about a room</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
         <source>setroomdata</source>
         <translation type="obsolete">change/create a room</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>getcustomerlist</source>
         <translation type="obsolete">get a list of customers</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>getcustomer</source>
         <translation type="obsolete">get detailed information about a customer</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>setcustomer</source>
         <translation type="obsolete">change/create a customer</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>deletecustomer</source>
         <translation type="obsolete">delete a customer</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>checkorder</source>
         <translation type="obsolete">check whether an order would succeed in ordering or selling</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createorder</source>
         <translation type="obsolete">create an order (as pre-ordered, unpaid items)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createsale</source>
         <translation type="obsolete">create an order as sold and paid items</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>getorderlist</source>
         <translation type="obsolete">get a list of orders (overview)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>getorder</source>
         <translation type="obsolete">get details about an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>orderpay</source>
         <translation type="obsolete">pay for an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>orderrefund</source>
         <translation type="obsolete">refund money from a cancelled or overpaid order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>ordershipped</source>
         <translation type="obsolete">mark an order as being shipped</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>cancelorder</source>
         <translation type="obsolete">cancel an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>orderbyticket</source>
         <translation type="obsolete">find an order by one of the tickets it contains</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>getordersbyevents</source>
         <translation type="obsolete">get a list of all orders that contain tickets for an event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>setordercomment</source>
         <translation type="obsolete">change the comment of an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>getticket</source>
         <translation type="obsolete">get details about a ticket</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>useticket</source>
         <translation type="obsolete">mark a ticket as used</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>changeticketprice</source>
         <translation type="obsolete">change the price of a specific ticket (automatically changes price of the order)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>ticketreturn</source>
         <translation type="obsolete">return a ticket unused</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>gettemplatelist</source>
         <translation type="obsolete">get a list of templates stored at the server (necessary for printing)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>gettemplate</source>
         <translation type="obsolete">get a specific template (necessary for printing)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>settemplate</source>
         <translation type="obsolete">store a new template at the server</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="60"/>
         <source>_admin</source>
         <translation type="obsolete">administrator, implies all other privileges</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="61"/>
         <source>_anyshipping</source>
         <translation type="obsolete">user has the right to use any shipping method</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="62"/>
         <source>_repriceshipping</source>
         <translation type="obsolete">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 type="obsolete">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 type="obsolete">change the shipping method of an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
         <source>reservationtoorder</source>
         <translation type="obsolete">change a reservation into a normal order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
         <source>reservationtosale</source>
         <translation type="obsolete">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 type="obsolete">get shipping methods</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>setshipping</source>
         <translation type="obsolete">create/change shipping methods</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>deleteshipping</source>
         <translation type="obsolete">delete a shipping method</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>getvoucherprices</source>
         <translation type="obsolete">get the allowed voucher prices</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>cancelvoucher</source>
         <translation type="obsolete">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 type="obsolete">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 type="obsolete">use a voucher to pay for an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>getvoucher</source>
         <translation type="obsolete">get details about a voucher</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>settemplatedescription</source>
         <translation type="obsolete">set a new description for a template</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="52"/>
         <source>deletetemplate</source>
         <translation type="obsolete">delete a template (variant)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="63"/>
         <source>_anyvoucher</source>
         <translation type="obsolete">user may create vouchers with any value/price</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="64"/>
         <source>_anypricevoucher</source>
         <translation type="obsolete">user may create vouchers for which price and value differ</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="65"/>
         <source>_explicitshipdate</source>
         <translation type="obsolete">user may set an explicit shipping date/time when marking an order as shipped (default: current date/time)</translation>
     </message>
@@ -567,107 +549,173 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/translation.php" line="31"/>
+        <location filename="../inc/machine/translation.php" line="33"/>
         <source>Language unknown.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Voucher</name>
+    <message>
+        <location filename="../inc/classes/voucher.php" line="120"/>
+        <source>cancel voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/voucher.php" line="134"/>
+        <source>empty voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/voucher.php" line="157"/>
+        <source>create voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/voucher.php" line="221"/>
+        <source>pay with voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/classes/voucher.php" line="257"/>
+        <source>pay with voucher outside system</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WOAddress</name>
     <message>
-        <location filename="../inc/wob/wo_Address.php" line="188"/>
+        <location filename="../inc/wob/wo_Address.php" line="238"/>
         <source>Unable to deserialize object of type WOAddress: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WOArtist</name>
+    <name>WOArtistAbstract</name>
+    <message>
+        <location filename="../inc/wext/artist.php" line="21"/>
+        <source>Artist name must not be empty!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/artist.php" line="28"/>
+        <source>An artist with this name already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../inc/wob/wo_Artist.php" line="78"/>
+        <location filename="../inc/wob/wo_Artist.php" line="153"/>
         <source>Unable to deserialize object of type WOArtist: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WOCartOrder</name>
+    <name>WOCartItem</name>
     <message>
-        <location filename="../inc/wob/wo_CartOrder.php" line="162"/>
-        <source>Unable to deserialize object of type WOCartOrder: invalid XML.</source>
+        <location filename="../inc/wob/wo_CartItem.php" line="24"/>
+        <source>Unable to deserialize object of type WOCartItem: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WOCartOrderAbstract</name>
+    <message>
+        <location filename="../inc/wext/cart.php" line="25"/>
+        <source>Not a valid cart object.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartOrder.php" line="39"/>
-        <source>Ok</source>
+        <location filename="../inc/wext/cart.php" line="47"/>
+        <source>Lacking privileges to create a sale.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/cart.php" line="52"/>
+        <source>Lacking privileges to create an order.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/cart.php" line="64"/>
+        <source>CreateOrder called from an unknown transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wext/cart.php" line="75"/>
+        <source>Reservations must not contain anything but tickets.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartOrder.php" line="40"/>
-        <source>SaleOnly</source>
+        <location filename="../inc/wext/cart.php" line="304"/>
+        <source>DB error while inserting order.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartOrder.php" line="41"/>
-        <source>OrderOnly</source>
+        <location filename="../inc/wob/wo_CartOrder.php" line="51"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartOrder.php" line="42"/>
+        <location filename="../inc/wob/wo_CartOrder.php" line="52"/>
         <source>Invalid</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../inc/wob/wo_CartOrder.php" line="235"/>
+        <source>Unable to deserialize object of type WOCartOrder: invalid XML.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WOCartTicket</name>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="171"/>
+        <location filename="../inc/wob/wo_CartTicket.php" line="201"/>
         <source>Unable to deserialize object of type WOCartTicket: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="79"/>
+        <location filename="../inc/wob/wo_CartTicket.php" line="105"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="80"/>
-        <source>TooLate</source>
+        <location filename="../inc/wob/wo_CartTicket.php" line="106"/>
+        <source>EventOver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="81"/>
-        <source>Exhausted</source>
+        <location filename="../inc/wob/wo_CartTicket.php" line="107"/>
+        <source>TooLate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="82"/>
-        <source>SaleOnly</source>
+        <location filename="../inc/wob/wo_CartTicket.php" line="108"/>
+        <source>Exhausted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartTicket.php" line="83"/>
-        <source>OrderOnly</source>
+        <location filename="../inc/wob/wo_CartTicket.php" line="109"/>
+        <source>Invalid</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WOCartVoucher</name>
     <message>
-        <location filename="../inc/wob/wo_CartVoucher.php" line="117"/>
+        <location filename="../inc/wob/wo_CartVoucher.php" line="147"/>
         <source>Unable to deserialize object of type WOCartVoucher: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartVoucher.php" line="59"/>
+        <location filename="../inc/wob/wo_CartVoucher.php" line="85"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartVoucher.php" line="60"/>
+        <location filename="../inc/wob/wo_CartVoucher.php" line="86"/>
         <source>InvalidValue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_CartVoucher.php" line="61"/>
+        <location filename="../inc/wob/wo_CartVoucher.php" line="87"/>
         <source>InvalidPrice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -675,7 +723,7 @@
 <context>
     <name>WOContact</name>
     <message>
-        <location filename="../inc/wob/wo_Contact.php" line="96"/>
+        <location filename="../inc/wob/wo_Contact.php" line="123"/>
         <source>Unable to deserialize object of type WOContact: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -683,7 +731,7 @@
 <context>
     <name>WOContactType</name>
     <message>
-        <location filename="../inc/wob/wo_ContactType.php" line="65"/>
+        <location filename="../inc/wob/wo_ContactType.php" line="88"/>
         <source>Unable to deserialize object of type WOContactType: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -691,651 +739,1145 @@
 <context>
     <name>WOCountry</name>
     <message>
-        <location filename="../inc/wob/wo_Country.php" line="50"/>
+        <location filename="../inc/wob/wo_Country.php" line="70"/>
         <source>Unable to deserialize object of type WOCountry: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WOCustomer</name>
-    <message>
-        <location filename="../inc/wob/wo_Customer.php" line="139"/>
-        <source>Unable to deserialize object of type WOCustomer: invalid XML.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WOCustomerShort</name>
-    <message>
-        <location filename="../inc/wob/wo_CustomerShort.php" line="52"/>
-        <source>Unable to deserialize object of type WOCustomerShort: invalid XML.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WOEvent</name>
+    <name>WOCustomerAbstract</name>
     <message>
-        <location filename="../inc/wob/wo_Event.php" line="258"/>
-        <source>Unable to deserialize object of type WOEvent: invalid XML.</source>
+        <location filename="../inc/wext/customer.php" line="22"/>
+        <location filename="../inc/wext/customer.php" line="64"/>
+        <source>Not a valid customer object.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOHost</name>
     <message>
-        <location filename="../inc/wob/wo_Host.php" line="50"/>
-        <source>Unable to deserialize object of type WOHost: invalid XML.</source>
+        <location filename="../inc/wext/customer.php" line="69"/>
+        <source>Customer does not exist in the database.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOOrder</name>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="289"/>
-        <source>Unable to deserialize object of type WOOrder: invalid XML.</source>
+        <location filename="../inc/wext/customer.php" line="147"/>
+        <source>Not a valid customer, cannot delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="140"/>
-        <source>Placed</source>
+        <location filename="../inc/wext/customer.php" line="162"/>
+        <source>This customer has orders in the system, cannot delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="141"/>
-        <source>Sent</source>
+        <location filename="../inc/wext/customer.php" line="175"/>
+        <source>Cannot merge a customer with itself.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="142"/>
-        <source>Sold</source>
+        <location filename="../inc/wext/customer.php" line="205"/>
+        <source>Country ID and name must contain values!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="143"/>
-        <source>Cancelled</source>
+        <location filename="../inc/wext/customer.php" line="212"/>
+        <source>Country ID exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="144"/>
-        <source>Reserved</source>
+        <location filename="../inc/wext/customer.php" line="217"/>
+        <source>Country name exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Order.php" line="145"/>
-        <source>Closed</source>
+        <location filename="../inc/wext/customer.php" line="235"/>
+        <source>Contact Type names must not be empty!</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WOPrice</name>
     <message>
-        <location filename="../inc/wob/wo_Price.php" line="97"/>
-        <source>Unable to deserialize object of type WOPrice: invalid XML.</source>
+        <location filename="../inc/wext/customer.php" line="240"/>
+        <source>Contact Type already exists.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WORoom</name>
     <message>
-        <location filename="../inc/wob/wo_Room.php" line="65"/>
-        <source>Unable to deserialize object of type WORoom: invalid XML.</source>
+        <location filename="../inc/wob/wo_Customer.php" line="186"/>
+        <source>Unable to deserialize object of type WOCustomer: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WOShipping</name>
+    <name>WOCustomerInfo</name>
     <message>
-        <location filename="../inc/wob/wo_Shipping.php" line="114"/>
-        <source>Unable to deserialize object of type WOShipping: invalid XML.</source>
+        <location filename="../inc/wob/wo_CustomerInfo.php" line="104"/>
+        <source>Unable to deserialize object of type WOCustomerInfo: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WOTicket</name>
+    <name>WOEventAbstract</name>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="232"/>
-        <source>Unable to deserialize object of type WOTicket: invalid XML.</source>
+        <location filename="../inc/wext/event.php" line="78"/>
+        <source>The event to be created must be a valid event object!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="89"/>
-        <source>Reserved</source>
+        <location filename="../inc/wext/event.php" line="103"/>
+        <source>The event to be changed must be a valid event object!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="90"/>
-        <source>Ordered</source>
+        <location filename="../inc/wext/event.php" line="108"/>
+        <source>The event is not valid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="91"/>
-        <source>Used</source>
+        <location filename="../inc/wext/event.php" line="120"/>
+        <source>You do not have the privilege to cancel events.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="92"/>
-        <source>Cancelled</source>
+        <location filename="../inc/wext/event.php" line="177"/>
+        <source>This is not a valid event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="93"/>
-        <source>Refund</source>
+        <location filename="../inc/wext/event.php" line="205"/>
+        <source>The event ID is not valid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="94"/>
-        <source>MaskBlock</source>
+        <location filename="../inc/wob/wo_Event.php" line="384"/>
+        <source>Unable to deserialize object of type WOEvent: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOEventPriceAbstract</name>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="95"/>
-        <source>MaskPay</source>
+        <location filename="../inc/wob/wo_EventPrice.php" line="206"/>
+        <source>Unable to deserialize object of type WOEventPrice: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOFlagAbstract</name>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="96"/>
-        <source>MaskUsable</source>
+        <location filename="../inc/wob/wo_Flag.php" line="50"/>
+        <source>Unable to deserialize object of type WOFlag: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOHost</name>
     <message>
-        <location filename="../inc/wob/wo_Ticket.php" line="97"/>
-        <source>MaskReturnable</source>
+        <location filename="../inc/wob/wo_Host.php" line="70"/>
+        <source>Unable to deserialize object of type WOHost: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WOUser</name>
+    <name>WOItemInfo</name>
     <message>
-        <location filename="../inc/wob/wo_User.php" line="50"/>
-        <source>Unable to deserialize object of type WOUser: invalid XML.</source>
+        <location filename="../inc/wob/wo_ItemInfo.php" line="142"/>
+        <source>Unable to deserialize object of type WOItemInfo: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WOVoucher</name>
+    <name>WOOrderAbstract</name>
     <message>
-        <location filename="../inc/wob/wo_Voucher.php" line="146"/>
-        <source>Unable to deserialize object of type WOVoucher: invalid XML.</source>
+        <location filename="../inc/wext/order.php" line="173"/>
+        <source>Invalid shipping ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Voucher.php" line="71"/>
-        <source>Ok</source>
+        <location filename="../inc/wext/order.php" line="203"/>
+        <location filename="../inc/wext/order.php" line="236"/>
+        <location filename="../inc/wext/order.php" line="259"/>
+        <location filename="../inc/wext/order.php" line="275"/>
+        <location filename="../inc/wext/order.php" line="307"/>
+        <location filename="../inc/wext/order.php" line="358"/>
+        <source>Order ID is not valid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Voucher.php" line="72"/>
-        <source>InvalidValue</source>
+        <location filename="../inc/wext/order.php" line="207"/>
+        <source>Order has already been shipped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/wob/wo_Voucher.php" line="73"/>
-        <source>InvalidPrice</source>
+        <location filename="../inc/wext/order.php" line="211"/>
+        <source>Order is in the wrong state.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>php::</name>
     <message>
-        <location filename="../inc/classes/customer.php" line="259"/>
-        <source>Unknown Customer</source>
+        <location filename="../inc/wext/order.php" line="281"/>
+        <location filename="../inc/wext/order.php" line="328"/>
+        <location filename="../inc/wext/order.php" line="626"/>
+        <source>Amount to be paid must be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="271"/>
-        <source>Unable to parse XML.</source>
+        <location filename="../inc/wext/order.php" line="313"/>
+        <location filename="../inc/wext/order.php" line="318"/>
+        <location filename="../inc/wext/order.php" line="632"/>
+        <location filename="../inc/wext/order.php" line="637"/>
+        <location filename="../inc/wext/order.php" line="671"/>
+        <location filename="../inc/wext/order.php" line="676"/>
+        <source>Voucher is not valid!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="316"/>
-        <source>Cannot find customer ID to delete.</source>
+        <location filename="../inc/wext/order.php" line="322"/>
+        <location filename="../inc/wext/order.php" line="641"/>
+        <location filename="../inc/wext/order.php" line="680"/>
+        <source>Voucher cannot be used: it has not been paid for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="322"/>
-        <source>Invalid Customer ID, cannot delete.</source>
+        <location filename="../inc/wext/order.php" line="364"/>
+        <source>Amount to be refunded must be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="330"/>
-        <source>Invalid Customer ID, cannot merge.</source>
+        <location filename="../inc/wext/order.php" line="391"/>
+        <source>Invalid Order ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="348"/>
-        <source>Cannot find Customer ID, cannot delete.</source>
+        <location filename="../inc/wext/order.php" line="396"/>
+        <source>This order is not a reservation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="369"/>
-        <source>Cannot merge customers.</source>
+        <location filename="../inc/wext/order.php" line="420"/>
+        <source>This ticket cannot be returned!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/customer.php" line="379"/>
-        <source>Cannot delete customer.</source>
+        <location filename="../inc/wext/order.php" line="425"/>
+        <location filename="../inc/wext/order.php" line="497"/>
+        <location filename="../inc/wext/order.php" line="556"/>
+        <source>Internal error: ticket for unknown event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="257"/>
-        <source>Malformed request.</source>
+        <location filename="../inc/wext/order.php" line="429"/>
+        <source>This ticket is for a past event and you do not have the privilege to return it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/event.php" line="431"/>
-        <source>The event id must be numeric.</source>
+        <location filename="../inc/wext/order.php" line="441"/>
+        <source>This voucher has already been used, cannot return it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/event.php" line="445"/>
-        <source>Invalid event id.</source>
+        <location filename="../inc/wext/order.php" line="450"/>
+        <source>Ticket or voucher not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="800"/>
-        <source>Cannot place order, sorry.</source>
+        <location filename="../inc/wext/order.php" line="466"/>
+        <source>Invalid order ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="790"/>
-        <source>Cannot place sale, sorry.</source>
+        <location filename="../inc/wext/order.php" line="479"/>
+        <source>The order is in the wrong status or you do not have the privilege to cancel it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="805"/>
-        <source>Internal Error: unknown action.</source>
+        <location filename="../inc/wext/order.php" line="491"/>
+        <source>This order contains a ticket that cannot be returned.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="873"/>
-        <source>No such orderID in database.</source>
+        <location filename="../inc/wext/order.php" line="501"/>
+        <source>This order contains a ticket that is for a past event and you do not have the privilege to cancel it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="884"/>
-        <source>Expected 2 arguments.</source>
+        <location filename="../inc/wext/order.php" line="510"/>
+        <source>This order contains a voucher that has already been used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="890"/>
-        <source>Invalid Order ID</source>
+        <location filename="../inc/wext/order.php" line="541"/>
+        <location filename="../inc/wext/order.php" line="587"/>
+        <source>Invalid ticket ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="896"/>
-        <source>Expected positive amount.</source>
+        <location filename="../inc/wext/order.php" line="547"/>
+        <source>The ticket cannot be changed anymore or you do not have the privilege.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="905"/>
-        <source>Order does not exist.</source>
+        <location filename="../inc/wext/order.php" line="560"/>
+        <source>The ticket is for an event in the past and you do not have the privilege to change it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="911"/>
-        <source>Order cannot be changed, it is closed.</source>
+        <location filename="../inc/wext/order.php" line="598"/>
+        <source>Invalid price category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="970"/>
-        <source>Order ID must be numeric.</source>
+        <location filename="../inc/wext/order.php" line="603"/>
+        <source>Category is not valid for this event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="980"/>
-        <source>Order ID is invalid.</source>
+        <location filename="../inc/wext/order.php" line="609"/>
+        <source>You do not have access to this category on this event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="961"/>
-        <source>Wrong state, cannot set order to shipped.</source>
+        <location filename="../inc/wext/order.php" line="647"/>
+        <source>Internal error: negative voucher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="986"/>
-        <source>Wrong state, cannot set order to cancelled.</source>
+        <location filename="../inc/wob/wo_Order.php" line="216"/>
+        <source>Placed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="292"/>
-        <source>Unable to find this ticket.</source>
+        <location filename="../inc/wob/wo_Order.php" line="217"/>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="262"/>
-        <source>Price must be a number.</source>
+        <location filename="../inc/wob/wo_Order.php" line="218"/>
+        <source>Sold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="267"/>
-        <source>Price must be positive.</source>
+        <location filename="../inc/wob/wo_Order.php" line="219"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="297"/>
-        <source>Ticket cannot be returned.</source>
+        <location filename="../inc/wob/wo_Order.php" line="220"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="523"/>
-        <source>unable to parse XML data</source>
+        <location filename="../inc/wob/wo_Order.php" line="221"/>
+        <source>Closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/host.php" line="91"/>
-        <source>Cannot delete special hosts.</source>
+        <location filename="../inc/wob/wo_Order.php" line="501"/>
+        <source>Unable to deserialize object of type WOOrder: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOOrderInfoAbstract</name>
     <message>
-        <location filename="../inc/machine/session.php" line="528"/>
-        <source>expected exactly one passwd element</source>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="124"/>
+        <source>Placed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="536"/>
-        <source>cannot set an empty password</source>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="125"/>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="322"/>
-        <source>invalid user name</source>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="126"/>
+        <source>Sold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="281"/>
-        <source>expected exactly 1 ACL element</source>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="127"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="380"/>
-        <source>unknown user name</source>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="128"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="364"/>
-        <source>expected exactly 1 Hosts element</source>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="129"/>
+        <source>Closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="468"/>
-        <source>Syntax Error</source>
+        <location filename="../inc/wob/wo_OrderInfo.php" line="344"/>
+        <source>Unable to deserialize object of type WOOrderInfo: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOPriceCategoryAbstract</name>
     <message>
-        <location filename="../inc/machine/session.php" line="486"/>
-        <source>Cannot remove user: DB error while deleting ACL.</source>
+        <location filename="../inc/wext/price.php" line="21"/>
+        <source>New Category must be a valid object.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="495"/>
-        <source>Cannot remove user: unable to replace user.</source>
+        <location filename="../inc/wext/price.php" line="38"/>
+        <source>Category must be a valid object.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="509"/>
-        <source>Cannot remove user: DB error while deleting user.</source>
+        <location filename="../inc/wext/price.php" line="45"/>
+        <source>Category does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="541"/>
-        <source>Unable to change this password.</source>
+        <location filename="../inc/wob/wo_PriceCategory.php" line="153"/>
+        <source>Unable to deserialize object of type WOPriceCategory: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WORoleAbstract</name>
     <message>
-        <location filename="../inc/machine/template.php" line="42"/>
-        <source>Template File not found in database</source>
+        <location filename="../inc/wob/wo_Role.php" line="107"/>
+        <source>Unable to deserialize object of type WORole: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WORoomAbstract</name>
     <message>
-        <location filename="../inc/machine/template.php" line="83"/>
-        <source>Unable to find file name</source>
+        <location filename="../inc/wext/room.php" line="22"/>
+        <source>Room already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/template.php" line="91"/>
-        <source>Illegal File Name</source>
+        <location filename="../inc/wob/wo_Room.php" line="88"/>
+        <source>Unable to deserialize object of type WORoom: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOShippingAbstract</name>
     <message>
-        <location filename="../inc/classes/order.php" line="916"/>
-        <source>Order cannot be paid for, it is only a reservation. Order or sell it first!</source>
+        <location filename="../inc/wext/shipping.php" line="28"/>
+        <source>Shipping type not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1072"/>
-        <source>Unable to update order comment.</source>
+        <location filename="../inc/wext/shipping.php" line="35"/>
+        <source>Error while updating shipping information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1217"/>
-        <source>Invalid Order.</source>
+        <location filename="../inc/wob/wo_Shipping.php" line="123"/>
+        <source>Unable to deserialize object of type WOShipping: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOTemplateAbstract</name>
     <message>
-        <location filename="../inc/classes/order.php" line="1112"/>
-        <source>Invalid Shipping Method.</source>
+        <location filename="../inc/wext/template.php" line="54"/>
+        <location filename="../inc/wext/template.php" line="67"/>
+        <source>No such template.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1179"/>
-        <source>Unable to create new shipping method.</source>
+        <location filename="../inc/wob/wo_Template.php" line="155"/>
+        <source>Unable to deserialize object of type WOTemplate: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOTemplateInfo</name>
     <message>
-        <location filename="../inc/classes/order.php" line="1188"/>
-        <source>Unable to change shipping method.</source>
+        <location filename="../inc/wob/wo_TemplateInfo.php" line="103"/>
+        <source>Unable to deserialize object of type WOTemplateInfo: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOTicketAbstract</name>
     <message>
-        <location filename="../inc/classes/order.php" line="1201"/>
-        <source>Expected a numeric shipping ID.</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="94"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1206"/>
-        <source>Unable to delete shipping method.</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="95"/>
+        <source>Ordered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1224"/>
-        <source>Cannot change order from reservation.</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="96"/>
+        <source>Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/template.php" line="98"/>
-        <source>Template file does not exist</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="97"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="295"/>
-        <source>Unable to cancel voucher.</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="98"/>
+        <source>Refund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="303"/>
-        <source>Invalid voucher, cannot empty it.</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="99"/>
+        <source>MaskBlock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="316"/>
-        <source>Expected two arguments: voucher id and order id.</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="100"/>
+        <source>MaskPay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="350"/>
-        <source>Invalid voucher id.</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="101"/>
+        <source>MaskUsable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="360"/>
-        <source>Unable to process payment via voucher.</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="102"/>
+        <source>MaskReturnable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="369"/>
-        <source>Invalid voucher ID.</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="103"/>
+        <source>MaskChangeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="921"/>
-        <source>payment</source>
+        <location filename="../inc/wob/wo_Ticket.php" line="291"/>
+        <source>Unable to deserialize object of type WOTicket: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOTicketUse</name>
     <message>
-        <location filename="../inc/classes/order.php" line="921"/>
-        <source>refund</source>
+        <location filename="../inc/wob/wo_TicketUse.php" line="61"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1000"/>
-        <source>Ticket or Voucher not found.</source>
+        <location filename="../inc/wob/wo_TicketUse.php" line="62"/>
+        <source>NotFound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1005"/>
-        <source>Ticket/Voucher has no order.</source>
+        <location filename="../inc/wob/wo_TicketUse.php" line="63"/>
+        <source>WrongEvent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1124"/>
-        <source>shipping changed</source>
+        <location filename="../inc/wob/wo_TicketUse.php" line="64"/>
+        <source>AlreadyUsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1244"/>
-        <source>Expected 2 arguments: query type and ID.</source>
+        <location filename="../inc/wob/wo_TicketUse.php" line="65"/>
+        <source>NotUsable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="1263"/>
-        <source>Invalid Query Type.</source>
+        <location filename="../inc/wob/wo_TicketUse.php" line="66"/>
+        <source>Unpaid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="344"/>
-        <source>Expected two arguments: voucher id and amount to deduct.</source>
+        <location filename="../inc/wob/wo_TicketUse.php" line="67"/>
+        <source>InvalidEvent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="256"/>
-        <source>create order</source>
+        <location filename="../inc/wob/wo_TicketUse.php" line="209"/>
+        <source>Unable to deserialize object of type WOTicketUse: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOUser</name>
     <message>
-        <location filename="../inc/classes/order.php" line="407"/>
-        <source>invalidvalue</source>
-        <comment>voucher state</comment>
+        <location filename="../inc/wob/wo_User.php" line="86"/>
+        <source>Unable to deserialize object of type WOUser: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WOVoucher</name>
     <message>
-        <location filename="../inc/classes/order.php" line="413"/>
-        <source>invalidprice</source>
-        <comment>voucher state</comment>
+        <location filename="../inc/wob/wo_Voucher.php" line="191"/>
+        <source>Unable to deserialize object of type WOVoucher: invalid XML.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="434"/>
-        <source>Shipping type not available to user.</source>
+        <location filename="../inc/wob/wo_Voucher.php" line="72"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="451"/>
-        <source>Illegal shipping type.</source>
+        <location filename="../inc/wob/wo_Voucher.php" line="73"/>
+        <source>InvalidValue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/order.php" line="669"/>
-        <source>order cancelled</source>
+        <location filename="../inc/wob/wo_Voucher.php" line="74"/>
+        <source>InvalidPrice</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>_PrivilegeNames</name>
     <message>
-        <location filename="../inc/classes/order.php" line="707"/>
-        <source>reservation to order</source>
+        <location filename="../inc/wob/transaction.php" line="211"/>
+        <source>ChangeEvent:CancelEvent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="203"/>
-        <source>The ticket is not valid.</source>
+        <location filename="../inc/wob/transaction.php" line="212"/>
+        <source>CreateOrder:AnyVoucherValue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="207"/>
-        <source>The ticket has already been used.</source>
+        <location filename="../inc/wob/transaction.php" line="213"/>
+        <source>CreateOrder:DiffVoucherValuePrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="211"/>
-        <source>The ticket has not been bought or is cancelled.</source>
+        <location filename="../inc/wob/transaction.php" line="214"/>
+        <source>CreateOrder:LateSale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="216"/>
-        <source>The ticket has not been paid.</source>
+        <location filename="../inc/wob/transaction.php" line="215"/>
+        <source>CreateOrder:AfterTheFactSale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/ticket.php" line="220"/>
-        <source>The tickets order is in an invalid state or does not exist.</source>
+        <location filename="../inc/wob/transaction.php" line="216"/>
+        <source>CreateOrder:CanOrder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="120"/>
-        <source>cancel voucher</source>
+        <location filename="../inc/wob/transaction.php" line="217"/>
+        <source>CreateOrder:CanSell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="134"/>
-        <source>empty voucher</source>
+        <location filename="../inc/wob/transaction.php" line="218"/>
+        <source>CreateReservation:LateReserve</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="157"/>
-        <source>create voucher</source>
+        <location filename="../inc/wob/transaction.php" line="219"/>
+        <source>CancelOrder:CancelSentOrder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="221"/>
-        <source>pay with voucher</source>
+        <location filename="../inc/wob/transaction.php" line="220"/>
+        <source>CancelOrder:CancelPastTickets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/classes/voucher.php" line="257"/>
-        <source>pay with voucher outside system</source>
+        <location filename="../inc/wob/transaction.php" line="221"/>
+        <source>OrderChangeShipping:ChangePrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="82"/>
-        <source>Unknown Host</source>
+        <location filename="../inc/wob/transaction.php" line="222"/>
+        <source>OrderMarkShipped:SetTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="89"/>
-        <source>Host/User combination not allowed</source>
+        <location filename="../inc/wob/transaction.php" line="223"/>
+        <source>ReturnTicketVoucher:ReturnPastTicket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="99"/>
-        <source>Host authentication failed</source>
+        <location filename="../inc/wob/transaction.php" line="224"/>
+        <source>ChangeTicketPrice:ChangeUsedTicket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="114"/>
-        <source>User Authentication failed</source>
+        <location filename="../inc/wob/transaction.php" line="225"/>
+        <source>ChangeTicketPrice:ChangePastTicket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="184"/>
-        <source>Ooops. Unable to find user. You have been deleted.</source>
+        <location filename="../inc/wob/transaction.php" line="226"/>
+        <source>ChangeTicketPriceCategory:ChangeUsedTicket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../inc/machine/session.php" line="187"/>
-        <source>Ooops. Internal storage error - cannot verify old password.</source>
+        <location filename="../inc/wob/transaction.php" line="227"/>
+        <source>ChangeTicketPriceCategory:ChangePastTicket</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>_TransactionNames</name>
     <message>
-        <location filename="../inc/machine/session.php" line="190"/>
-        <source>Wrong password. Request denied.</source>
+        <location filename="../inc/wob/transaction.php" line="115"/>
+        <source>Backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="116"/>
+        <source>GetLanguage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="117"/>
+        <source>GetValidFlags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="118"/>
+        <source>SetFlag</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="119"/>
+        <source>DeleteFlag</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="120"/>
+        <source>ServerInfo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="121"/>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="122"/>
+        <source>Logout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="123"/>
+        <source>GetMyRoles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="124"/>
+        <source>GetMyRights</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="125"/>
+        <source>ChangeMyPassword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="126"/>
+        <source>GetAllUsers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="127"/>
+        <source>GetUser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="128"/>
+        <source>CreateUser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="129"/>
+        <source>ChangePassword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="130"/>
+        <source>DeleteUser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="131"/>
+        <source>SetUserDescription</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="132"/>
+        <source>GetUserRoles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="133"/>
+        <source>SetUserRoles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="134"/>
+        <source>GetUserHosts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="135"/>
+        <source>SetUserHosts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="136"/>
+        <source>SetUserFlags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="137"/>
+        <source>GetAllRoles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="138"/>
+        <source>GetRole</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="139"/>
+        <source>CreateRole</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="140"/>
+        <source>SetRoleDescription</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="141"/>
+        <source>SetRoleRights</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="142"/>
+        <source>DeleteRole</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="143"/>
+        <source>SetRoleFlags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="144"/>
+        <source>GetAllRightNames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="145"/>
+        <source>GetAllHostNames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="146"/>
+        <source>GetAllHosts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="147"/>
+        <source>SetHost</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="148"/>
+        <source>DeleteHost</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="149"/>
+        <source>GetAllContactTypes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="150"/>
+        <source>CreateContactType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="151"/>
+        <source>GetCustomer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="152"/>
+        <source>GetAllCustomerNames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="153"/>
+        <source>CreateCustomer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="154"/>
+        <source>ChangeCustomer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="155"/>
+        <source>DeleteCustomer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="156"/>
+        <source>GetAddress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="157"/>
+        <source>GetAllCountries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="158"/>
+        <source>CreateCountry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="159"/>
+        <source>GetAllArtists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="160"/>
+        <source>CreateArtist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="161"/>
+        <source>GetAllPriceCategories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="162"/>
+        <source>CreatePriceCategory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="163"/>
+        <source>ChangePriceCategory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="164"/>
+        <source>GetEvent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="165"/>
+        <source>GetAllEvents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="166"/>
+        <source>GetEventList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="167"/>
+        <source>CreateEvent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="168"/>
+        <source>ChangeEvent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="169"/>
+        <source>CancelEvent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="170"/>
+        <source>GetAllRooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="171"/>
+        <source>CreateRoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="172"/>
+        <source>GetEventSummary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="173"/>
+        <source>GetTicket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="174"/>
+        <source>GetVoucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="175"/>
+        <source>GetOrder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="176"/>
+        <source>GetOrderList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="177"/>
+        <source>GetOrdersByEvents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="178"/>
+        <source>GetOrdersByCustomer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="179"/>
+        <source>GetOrderByBarcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="180"/>
+        <source>CreateOrder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="181"/>
+        <source>CreateReservation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="182"/>
+        <source>ReservationToOrder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="183"/>
+        <source>CancelOrder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="184"/>
+        <source>OrderPay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="185"/>
+        <source>OrderRefund</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="186"/>
+        <source>UseVoucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="187"/>
+        <source>DeductVoucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="188"/>
+        <source>EmptyVoucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="189"/>
+        <source>OrderChangeShipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="190"/>
+        <source>OrderMarkShipped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="191"/>
+        <source>OrderAddComment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="192"/>
+        <source>OrderChangeComments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="193"/>
+        <source>ReturnTicketVoucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="194"/>
+        <source>ChangeTicketPrice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="195"/>
+        <source>ChangeTicketPriceCategory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="196"/>
+        <source>GetAllShipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="197"/>
+        <source>ChangeShipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="198"/>
+        <source>CreateShipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="199"/>
+        <source>DeleteShipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="200"/>
+        <source>GetValidVoucherPrices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="201"/>
+        <source>UseTicket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="202"/>
+        <source>GetEntranceEvents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="203"/>
+        <source>GetTemplateList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="204"/>
+        <source>GetTemplate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="205"/>
+        <source>SetTemplate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="206"/>
+        <source>SetTemplateDescription</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../inc/wob/transaction.php" line="207"/>
+        <source>DeleteTemplate</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/www/translations/unify.xsl b/www/translations/unify.xsl
index 6ab6e82..c18e532 100644
--- a/www/translations/unify.xsl
+++ b/www/translations/unify.xsl
@@ -1,14 +1,9 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-	<xsl:output method="xml" encoding="utf-8" doctype="TS"/>
+	<xsl:output method="xml" encoding="utf-8" doctype-public="TS"/>
 	
 	<xsl:template name="context">
 		<xsl:for-each select="message">
-			<xsl:element name="message">
-				<xsl:for-each select="source|translation">
-					<xsl:copy-of select="."/>
-				</xsl:for-each>
-				<!-- ignoring comments and locations, they are not needed in the copy -->
-			</xsl:element>
+			<xsl:copy-of select="."/>
 		</xsl:for-each>
 	</xsl:template>
 	
-- 
1.7.2.5