update translations, fix typo

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@186 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/src/orderwin.cpp b/src/orderwin.cpp
index 3e8570c..0bf2915 100644 (file)
--- a/src/orderwin.cpp
+++ b/src/orderwin.cpp
@@ -353,7 +353,7 @@ void MOrderWindow::payment()
                return;
        }
        if(req->responseStatus()!=MWebRequest::Ok){
-               QMessageBox::warning(this,tr("Warning"),tr("Error whily trying to pay: %1").arg(tr(req->responseBody())));
+               QMessageBox::warning(this,tr("Warning"),tr("Error while trying to pay: %1").arg(tr(req->responseBody())));
                return;
        }
        m_order.setAmountPaid(req->responseBody().trimmed().toInt());

diff --git a/src/smoke_de.ts b/src/smoke_de.ts
index 2cfee5c..fa3b23f 100644 (file)
--- a/src/smoke_de.ts
+++ b/src/smoke_de.ts
@@ -14,7 +14,7 @@
         <translation>Kann XML Daten nicht parsen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="537"/>
+        <location filename="../www/inc/machine/session.php" line="573"/>
         <source>unable to parse XML data</source>
         <translation>Kann XML Daten nicht parsen</translation>
     </message>
@@ -34,12 +34,12 @@
         <translation>Nicht authentifiziert, Passwort kann nicht geändert werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="542"/>
+        <location filename="../www/inc/machine/session.php" line="578"/>
         <source>expected exactly one passwd element</source>
         <translation>Nur 1 &quot;passwd&quot; Element erwartet.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="550"/>
+        <location filename="../www/inc/machine/session.php" line="586"/>
         <source>cannot set an empty password</source>
         <translation>Leeres Passwort kann nicht gesetzt werden</translation>
     </message>
@@ -79,7 +79,7 @@
         <translation>Clientfehler: es wurde nur 1 Hosts Element erwartet.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="555"/>
+        <location filename="../www/inc/machine/session.php" line="591"/>
         <source>Unable to change this password.</source>
         <translation>Dieses Passwort kann nicht geändert werden.</translation>
     </message>
@@ -354,362 +354,204 @@
         <translation>Sie haben nicht das Recht diese Transaktin durchzuführen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="348"/>
+        <location filename="../www/machine.php" line="358"/>
         <source>Internal Error: unknown command, hiccup in code structure.</source>
         <translation>Interner Fehler: unbekanntes Kommando, Fehler in Code-Struktur. Bitte melden Sie diesen Fehler und wie es dazu kam dem Programmierer.</translation>
     </message>
-</context>
-<context>
-    <name>@default</name>
     <message>
-        <location filename="../www/machine.php" line="16"/>
-        <source>serverinfo</source>
-        <translation type="obsolete">Serverinformationen</translation>
+        <location filename="../www/inc/classes/customer.php" line="314"/>
+        <source>Cannot find customer ID to delete.</source>
+        <translation>Kann zu löschende Kundennummer nicht finden.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="17"/>
-        <source>startsession</source>
-        <translation type="obsolete">Session beginnen</translation>
+        <location filename="../www/inc/classes/customer.php" line="320"/>
+        <source>Invalid Customer ID, cannot delete.</source>
+        <translation>Ungültige Kundennummer kann nicht gelöscht werden.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="17"/>
-        <source>sessionauth</source>
-        <translation type="obsolete">Session authentifizieren</translation>
+        <location filename="../www/inc/classes/customer.php" line="328"/>
+        <source>Invalid Customer ID, cannot merge.</source>
+        <translation>Ungültige Kundennummer kann nicht vereint werden.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="17"/>
-        <source>closesession</source>
-        <translation type="obsolete">Sessen beenden</translation>
+        <location filename="../www/inc/classes/customer.php" line="346"/>
+        <source>Cannot find Customer ID, cannot delete.</source>
+        <translation>Kann zu löschende Kundennummer nicht finden.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="19"/>
-        <source>getmyroles</source>
-        <translation type="obsolete">meine Rollen herausfinden</translation>
+        <location filename="../www/inc/classes/customer.php" line="367"/>
+        <source>Cannot merge customers.</source>
+        <translation>Kann Kunden-Einträge nicht vereinen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>getusers</source>
-        <translation type="obsolete">Nutzer abfragen</translation>
+        <location filename="../www/inc/classes/customer.php" line="377"/>
+        <source>Cannot delete customer.</source>
+        <translation>Kann Kunde nicht löschen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>setuserdescription</source>
-        <translation type="obsolete">Nutzerkommentar setzen</translation>
+        <location filename="../www/inc/classes/ticket.php" line="255"/>
+        <source>Malformed request.</source>
+        <translation>Fehlerhaftes Anfrageformat.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>getuseracl</source>
-        <translation type="obsolete">Nutzerrechte abfragen</translation>
+        <location filename="../www/inc/classes/event.php" line="419"/>
+        <source>The event id must be numeric.</source>
+        <translation>Die Veranstaltungsnummer muss numerisch sein.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>setuseracl</source>
-        <translation type="obsolete">Nutzerrechte setzen</translation>
+        <location filename="../www/inc/classes/event.php" line="433"/>
+        <source>Invalid event id.</source>
+        <translation>Ungültige Veranstaltungsnummer.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>getuserhosts</source>
-        <translation type="obsolete">erlaubte Hosts eines Nutzers abfragen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>setuserhosts</source>
-        <translation type="obsolete">erlaubte Hosts eines Nutzers setzen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>adduser</source>
-        <translation type="obsolete">neue Nutzer anlegen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>deleteuser</source>
-        <translation type="obsolete">Nutzer löschen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="22"/>
-        <source>gethosts</source>
-        <translation type="obsolete">Hosts abfragen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="22"/>
-        <source>sethost</source>
-        <translation type="obsolete">Hosts anlegen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="22"/>
-        <source>addhost</source>
-        <translation type="obsolete">Neue Hosts anlegen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="22"/>
-        <source>deletehost</source>
-        <translation type="obsolete">Hosts löschen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="23"/>
-        <source>geteventlist</source>
-        <translation type="obsolete">Liste der Veranstaltungen abfragen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="23"/>
-        <source>geteventdata</source>
-        <translation type="obsolete">Veranstaltungsdetails abfragen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="23"/>
-        <source>seteventdata</source>
-        <translation type="obsolete">Veranstaltungsdetails ändern</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="24"/>
-        <source>getroomdata</source>
-        <translation type="obsolete">Raumdaten abfragen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="24"/>
-        <source>setroomdata</source>
-        <translation type="obsolete">Raumdaten setzen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="25"/>
-        <source>getcustomerlist</source>
-        <translation type="obsolete">Kunden abfragen</translation>
+        <location filename="../www/inc/classes/order.php" line="517"/>
+        <source>Cannot place order, sorry.</source>
+        <translation>Kann Bestellung nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="337"/>
-        <source>_admin</source>
-        <translation type="obsolete">Alle Rechte, Administrator</translation>
+        <location filename="../www/inc/classes/order.php" line="528"/>
+        <source>Cannot place sale, sorry.</source>
+        <translation>Kann Verkauf nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="537"/>
-        <source>unable to parse XML data</source>
-        <translation type="obsolete">Kann XML Daten nicht parsen</translation>
+        <location filename="../www/inc/classes/order.php" line="533"/>
+        <source>Internal Error: unknown action.</source>
+        <translation>Interner Fehler: unbekannte Aktion.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/host.php" line="89"/>
-        <source>Cannot delete special hosts.</source>
-        <translation type="obsolete">Spezialhosts können nicht gelöscht werden.</translation>
+        <location filename="../www/inc/classes/order.php" line="591"/>
+        <source>No such orderID in database.</source>
+        <translation>Diese Bestellnummer existiert nicht in der Datenbank.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="138"/>
-        <source>missing some authentication data</source>
-        <translation type="obsolete">Authentifikationsdaten sind unvollständig</translation>
+        <location filename="../www/inc/classes/order.php" line="602"/>
+        <source>Expected 2 arguments.</source>
+        <translation>2 Argumente erwartet.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="210"/>
-        <source>Not authenticated. Can&apos;t change password.</source>
-        <translation type="obsolete">Nicht authentifiziert, Passwort kann nicht geändert werden.</translation>
+        <location filename="../www/inc/classes/order.php" line="608"/>
+        <source>Invalid Order ID</source>
+        <translation>Ungültige Bestellnummer.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="542"/>
-        <source>expected exactly one passwd element</source>
-        <translation type="obsolete">Nur 1 &quot;passwd&quot; Element erwartet.</translation>
+        <location filename="../www/inc/classes/order.php" line="614"/>
+        <source>Expected positive amount.</source>
+        <translation>Die Anzahl muss eine positive Zahl sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="550"/>
-        <source>cannot set an empty password</source>
-        <translation type="obsolete">Leeres Passwort kann nicht gesetzt werden</translation>
+        <location filename="../www/inc/classes/order.php" line="623"/>
+        <source>Order does not exist.</source>
+        <translation>Bestellung existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="236"/>
-        <source>Ooops. Unable to find user. You have been deleted.</source>
-        <translation type="obsolete">Ups. Sie wurden gelöscht.</translation>
+        <location filename="../www/inc/classes/order.php" line="629"/>
+        <source>Order cannot be changed, it is closed.</source>
+        <translation>Die Bestellung kann nicht geändert werden, da sie bereits geschlossen ist.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="241"/>
-        <source>Wrong password. Session hijacked, terminating it.</source>
-        <translation type="obsolete">Falsches Passwort. Session wird beendet.</translation>
+        <location filename="../www/inc/classes/order.php" line="671"/>
+        <source>Order ID must be numeric.</source>
+        <translation>Bestellnummer muss numerisch sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="373"/>
-        <source>invalid user name</source>
-        <translation type="obsolete">Falscher Nutzername.</translation>
+        <location filename="../www/inc/classes/order.php" line="681"/>
+        <source>Order ID is invalid.</source>
+        <translation>Bestellnummer ist ungültig.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="333"/>
-        <source>expected exactly 1 ACL element</source>
-        <translation type="obsolete">Clientfehler: es wurde nur 1 ACL Element erwartet.</translation>
+        <location filename="../www/inc/classes/order.php" line="662"/>
+        <source>Wrong state, cannot set order to shipped.</source>
+        <translation>Kann Bestellung nicht auf &quot;versandt&quot; setzen: sie ist im falschen Ausgangszustand.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="431"/>
-        <source>unknown user name</source>
-        <translation type="obsolete">Unbekannter Nutzer.</translation>
+        <location filename="../www/inc/classes/order.php" line="687"/>
+        <source>Wrong state, cannot set order to cancelled.</source>
+        <translation>Kann Bestellung nicht auf &quot;abgebrochen&quot; setzen: sie ist im falschen Ausgangszustand.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="415"/>
-        <source>expected exactly 1 Hosts element</source>
-        <translation type="obsolete">Clientfehler: es wurde nur 1 Hosts Element erwartet.</translation>
+        <location filename="../www/inc/classes/order.php" line="698"/>
+        <source>Ticket not found.</source>
+        <translation>Karte nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="555"/>
-        <source>Unable to change this password.</source>
-        <translation type="obsolete">Dieses Passwort kann nicht geändert werden.</translation>
+        <location filename="../www/inc/classes/order.php" line="702"/>
+        <source>Ticket has no order.</source>
+        <translation>Karte hat keine Bestellung.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>setmypasswd</source>
-        <translation type="obsolete">eigenes Passwort ändern</translation>
+        <location filename="../www/inc/classes/ticket.php" line="201"/>
+        <source>The ticket is not valid.</source>
+        <translation>Die Karte ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>setpasswd</source>
-        <translation type="obsolete">Passwort eines anderen Nutzers ändern</translation>
+        <location filename="../www/inc/classes/ticket.php" line="205"/>
+        <source>The ticket has already been used.</source>
+        <translation>Die Karte wurde bereits benutzt.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
-        <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>
+        <location filename="../www/inc/classes/ticket.php" line="209"/>
+        <source>The ticket has not been bought or is cancelled.</source>
+        <translation>Die Karte wurde nicht gekauft oder ist zurückgegeben.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="85"/>
-        <source>Invalid or missing sessionid, or session timed out.</source>
-        <translation type="obsolete">Die Session kann nicht benutzt werden. Bitte neu anmelden.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="214"/>
+        <source>The ticket has not been paid.</source>
+        <translation>Die Karte ist nicht bezahlt.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="97"/>
-        <source>Session not yet authenticated.</source>
-        <translation type="obsolete">Die Session ist noch nicht authentifiziert.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="218"/>
+        <source>The tickets order is in an invalid state or does not exist.</source>
+        <translation>Die Bestellung dieser Karte ist in einem ungültigen Zustand oder existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="109"/>
-        <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>
+        <location filename="../www/inc/classes/ticket.php" line="290"/>
+        <source>Unable to find this ticket.</source>
+        <translation>Kann diese Karte nicht finden.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="344"/>
-        <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>
+        <location filename="../www/inc/classes/ticket.php" line="260"/>
+        <source>Price must be a number.</source>
+        <translation>Der Preis muss eine Zahl sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="257"/>
-        <source>Unknown Customer</source>
-        <translation type="obsolete">Unbekannter Kunde</translation>
+        <location filename="../www/inc/classes/ticket.php" line="265"/>
+        <source>Price must be positive.</source>
+        <translation>Der Preis muss positiv sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="269"/>
-        <source>Unable to parse XML.</source>
-        <translation type="obsolete">Kann XML Daten nicht parsen.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="295"/>
+        <source>Ticket cannot be returned.</source>
+        <translation>Karte kann nicht zurückgegeben werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="33"/>
-        <source>Template File not found in database</source>
-        <translation type="obsolete">Vorlage kann nicht gefunden werden.</translation>
+        <location filename="../www/inc/machine/session.php" line="519"/>
+        <source>Syntax Error</source>
+        <translation>Syntaxfehler</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="44"/>
-        <source>Unable to find file name</source>
-        <translation type="obsolete">Dateiname kann nicht gefunden werden.</translation>
+        <location filename="../www/inc/machine/session.php" line="537"/>
+        <source>Cannot remove user: DB error while deleting ACL.</source>
+        <translation>Kann Nutzer nicht löschen: Datenbankfehler beim Löschen der Zugriffsrechte.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="52"/>
-        <source>Illegal File Name</source>
-        <translation type="obsolete">Illegaler Dateiname</translation>
+        <location filename="../www/inc/machine/session.php" line="546"/>
+        <source>Cannot remove user: unable to replace user.</source>
+        <translation>Kann Nutzer nicht löschen: kann Nutzer nicht ersetzen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
-        <source>getcustomer</source>
-        <translation type="obsolete">Kunde abfragen</translation>
+        <location filename="../www/inc/machine/session.php" line="559"/>
+        <source>Cannot remove user: DB error while deleting user.</source>
+        <translation>Kann Nutzer nicht löschen: Datenbankfehler beim Löschen.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="25"/>
-        <source>setcustomer</source>
-        <translation type="obsolete">Kunde anlegen</translation>
+        <source>deletecustomer</source>
+        <translation>Nutzer löschen/ersetzen</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
-        <source>checkorder</source>
-        <translation type="obsolete">Bestellung testen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>createorder</source>
-        <translation type="obsolete">Bestellung anlegen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>createsale</source>
-        <translation type="obsolete">Verkaufen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="28"/>
-        <source>gettemplatelist</source>
-        <translation type="obsolete">Vorlagenliste abfragen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="28"/>
-        <source>gettemplate</source>
-        <translation type="obsolete">Vorlage abfragen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="29"/>
-        <source>settemplate</source>
-        <translation type="obsolete">Vorlage erstellen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="23"/>
-        <source>eventsummary</source>
-        <translation type="obsolete">Veranstaltungübersicht</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>getorderlist</source>
-        <translation type="obsolete">Liste der Bestellungen abfragen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>getorder</source>
-        <translation type="obsolete">Bestellung: Details abfragen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="23"/>
-        <source>cancelevent</source>
-        <translation type="obsolete">Veranstaltung abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>orderpay</source>
-        <translation type="obsolete">Bestellung bezahlen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>orderrefund</source>
-        <translation type="obsolete">Bestellung: Geld zurück geben</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>ordershipped</source>
-        <translation type="obsolete">Bestellung als verschickt markieren</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>cancelorder</source>
-        <translation type="obsolete">Bestellung rückgängig machen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>orderbyticket</source>
-        <translation type="obsolete">Bestellung mit Ticket finden</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="27"/>
-        <source>getticket</source>
-        <translation type="obsolete">Ticket abrufen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="27"/>
-        <source>useticket</source>
-        <translation type="obsolete">Ticket entwerten</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="27"/>
-        <source>changeticketprice</source>
-        <translation type="obsolete">Ticketpreis ändern</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="27"/>
-        <source>ticketreturn</source>
-        <translation type="obsolete">Ticket zurückgeben</translation>
+        <source>setordercomment</source>
+        <translation>Bestellkommentar (in angelegter Bestellung) ändern</translation>
     </message>
 </context>
 <context>
@@ -728,47 +570,47 @@
 <context>
     <name>MCustomerDialog</name>
     <message>
-        <location filename="customer.cpp" line="306"/>
+        <location filename="customer.cpp" line="351"/>
         <source>Customer %1</source>
         <translation>Kunde %1</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="308"/>
+        <location filename="customer.cpp" line="353"/>
         <source>New Customer</source>
         <translation>Neuer Kunde</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="314"/>
+        <location filename="customer.cpp" line="359"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="316"/>
+        <location filename="customer.cpp" line="361"/>
         <source>Address:</source>
         <translation>Rechnungsadresse:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="319"/>
+        <location filename="customer.cpp" line="364"/>
         <source>Contact Information:</source>
         <translation>Kontaktinformationen:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="323"/>
+        <location filename="customer.cpp" line="368"/>
         <source>Web-Login/eMail:</source>
         <translation>Web-Login/eMail:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="326"/>
+        <location filename="customer.cpp" line="371"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="334"/>
+        <location filename="customer.cpp" line="379"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="337"/>
+        <location filename="customer.cpp" line="382"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -776,73 +618,113 @@
 <context>
     <name>MCustomerListDialog</name>
     <message>
-        <location filename="customer.cpp" line="194"/>
+        <location filename="customer.cpp" line="197"/>
         <source>Select a Customer</source>
         <translation>Kunde auswählen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="196"/>
+        <location filename="customer.cpp" line="199"/>
         <source>Customers</source>
         <translation>Kunden</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="208"/>
+        <location filename="customer.cpp" line="211"/>
         <source>Details...</source>
         <translation>Details...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="210"/>
+        <location filename="customer.cpp" line="213"/>
         <source>Create new...</source>
         <translation>Neu...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="212"/>
+        <location filename="customer.cpp" line="216"/>
         <source>Delete...</source>
         <translation>Löschen...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="220"/>
+        <location filename="customer.cpp" line="224"/>
         <source>Select</source>
         <translation>Auswählen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="223"/>
+        <location filename="customer.cpp" line="227"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="226"/>
+        <location filename="customer.cpp" line="230"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
+    <message>
+        <location filename="customer.cpp" line="301"/>
+        <source>Delete Customer</source>
+        <translation>Kunden Löschen</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="304"/>
+        <source>Really delete this customer (%1)?</source>
+        <translation>Diesen Kunden (%1) wirklich löschen?</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="307"/>
+        <source>merge with other entry:</source>
+        <translation>mit anderem Eintrag vereinen:</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="319"/>
+        <source>&amp;Yes</source>
+        <translation>&amp;Ja</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="321"/>
+        <source>&amp;No</source>
+        <translation>&amp;Nein</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="337"/>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="333"/>
+        <source>Failed to delete customer.</source>
+        <translation>Kann Kunden nicht löschen.</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="337"/>
+        <source>Failed to delete customer: %1</source>
+        <translation>Kann Kunden nicht löschen: %1</translation>
+    </message>
 </context>
 <context>
     <name>MEvent</name>
     <message>
-        <location filename="event.cpp" line="179"/>
+        <location filename="event.cpp" line="186"/>
         <source>Event is not complete, cannot save.</source>
         <translation>Veranstaltung ist nicht komplett. Kann nicht speichern.</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="224"/>
+        <location filename="event.cpp" line="231"/>
         <source>[0-9]+\.[0-9]{2}</source>
         <comment>price validator regexp</comment>
         <translation>[0-9]+,[0-9]{2}</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="247"/>
+        <location filename="event.cpp" line="254"/>
         <source>.</source>
         <comment>price decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="266"/>
+        <location filename="event.cpp" line="273"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="261"/>
+        <location filename="event.cpp" line="268"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation>d.M.yyyy</translation>
@@ -967,107 +849,132 @@
 <context>
     <name>MEventSummary</name>
     <message>
-        <location filename="eventsummary.cpp" line="38"/>
+        <location filename="eventsummary.cpp" line="56"/>
         <source>Summary for Event %1</source>
         <translation>Übersicht zu Veranstaltung %1</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="44"/>
+        <location filename="eventsummary.cpp" line="66"/>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="46"/>
+        <location filename="eventsummary.cpp" line="68"/>
         <source>Artist:</source>
         <translation>Künstler:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="48"/>
+        <location filename="eventsummary.cpp" line="70"/>
         <source>Start:</source>
         <translation>Beginn:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="190"/>
+        <location filename="eventsummary.cpp" line="237"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>Date+Time format for displaying event start time</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="51"/>
+        <location filename="eventsummary.cpp" line="73"/>
         <source>Capacity:</source>
         <translation>Sitzplätze:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="53"/>
+        <location filename="eventsummary.cpp" line="75"/>
         <source>Tickets currently reserved:</source>
         <translation>Momentan reservierte Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="55"/>
+        <location filename="eventsummary.cpp" line="77"/>
         <source>Tickets currently cancelled:</source>
         <translation>Momentan abgesagte Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="57"/>
+        <location filename="eventsummary.cpp" line="79"/>
         <source>Tickets currently usable:</source>
         <translation>Momentan nutzbare Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="59"/>
+        <location filename="eventsummary.cpp" line="81"/>
         <source>Total Income:</source>
         <translation>Umsatz:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="238"/>
+        <location filename="eventsummary.cpp" line="285"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="92"/>
         <source>Price</source>
         <translation>Preis</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="92"/>
         <source>Bought</source>
         <translation>Gekauft</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="92"/>
         <source>Used</source>
         <translation>Benutzt</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="92"/>
         <source>Unused</source>
         <translation>Unbenutzt</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="86"/>
+        <location filename="eventsummary.cpp" line="122"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="88"/>
+        <location filename="eventsummary.cpp" line="124"/>
         <source>Save as...</source>
         <translation>Speichern unter...</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="91"/>
+        <location filename="eventsummary.cpp" line="127"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="159"/>
+        <location filename="eventsummary.cpp" line="206"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="159"/>
+        <location filename="eventsummary.cpp" line="206"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
         <translation>Kann Vorlage (eventsummary.odtt) nicht finden. Gebe auf.</translation>
     </message>
+    <message>
+        <location filename="eventsummary.cpp" line="62"/>
+        <source>Summary</source>
+        <translation>Zusammenfassung</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="87"/>
+        <source>Tickets</source>
+        <translation>Karten</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="104"/>
+        <source>Comments</source>
+        <translation>Kommentare</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="110"/>
+        <source>Order: </source>
+        <translation>Bestellung:</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="112"/>
+        <source>Customer: </source>
+        <translation>Kunde:</translation>
+    </message>
 </context>
 <context>
     <name>MKeyGen</name>
@@ -1113,55 +1020,60 @@ At least %1 Bits of random are required.</source>
         <translation>mm</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="74"/>
+        <location filename="labeldlg.cpp" line="75"/>
         <source>Label offset:</source>
         <translation>Seitenrand:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="80"/>
+        <location filename="labeldlg.cpp" line="81"/>
         <source>Label size:</source>
         <translation>Etikettengröße:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="86"/>
+        <location filename="labeldlg.cpp" line="87"/>
         <source>Unit:</source>
         <translation>Einheit:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="88"/>
+        <location filename="labeldlg.cpp" line="89"/>
         <source>Millimeter</source>
         <translation>Millimeter</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="89"/>
+        <location filename="labeldlg.cpp" line="90"/>
         <source>Centimeter</source>
         <translation>Zentimeter</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="90"/>
+        <location filename="labeldlg.cpp" line="91"/>
         <source>Inch</source>
         <translation>Zoll</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="94"/>
+        <location filename="labeldlg.cpp" line="99"/>
         <source>Page usage:</source>
         <translation>Seitennutzung:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="97"/>
+        <location filename="labeldlg.cpp" line="102"/>
         <source>Page %1</source>
         <translation>Seite %1</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="141"/>
+        <location filename="labeldlg.cpp" line="146"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="145"/>
+        <location filename="labeldlg.cpp" line="150"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
+    <message>
+        <location filename="labeldlg.cpp" line="303"/>
+        <source>Warning: the label may not fit on the page!</source>
+        <translation>Warnung: der Aufkleber könnte größer als die eingestellte Seite sein!</translation>
+    </message>
 </context>
 <context>
     <name>MMainWindow</name>
@@ -1444,275 +1356,295 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrderWindow</name>
     <message>
-        <location filename="orderwin.cpp" line="42"/>
+        <location filename="orderwin.cpp" line="43"/>
         <source>Order Details</source>
         <translation>Bestelldetails</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="47"/>
+        <location filename="orderwin.cpp" line="48"/>
         <source>&amp;Order</source>
         <translation>&amp;Bestellung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="48"/>
+        <location filename="orderwin.cpp" line="49"/>
         <source>&amp;Order...</source>
         <translation>&amp;Bestellung...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="50"/>
+        <location filename="orderwin.cpp" line="51"/>
         <source>&amp;Sell...</source>
         <translation>&amp;Verkauf...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="53"/>
+        <location filename="orderwin.cpp" line="54"/>
         <source>C&amp;ancel Order...</source>
         <translation>Bestellung &amp;Stornieren...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="63"/>
+        <location filename="orderwin.cpp" line="66"/>
         <source>&amp;Close</source>
         <translation>S&amp;chließen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="64"/>
+        <location filename="orderwin.cpp" line="67"/>
         <source>&amp;Payment</source>
         <translation>&amp;Bezahlung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="66"/>
+        <location filename="orderwin.cpp" line="69"/>
         <source>Receive &amp;Payment...</source>
         <translation>&amp;bezahlen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="68"/>
+        <location filename="orderwin.cpp" line="71"/>
         <source>&amp;Refund...</source>
         <translation>&amp;zurückgeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="70"/>
+        <location filename="orderwin.cpp" line="73"/>
         <source>P&amp;rinting</source>
         <translation>&amp;Druck</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="72"/>
+        <location filename="orderwin.cpp" line="75"/>
         <source>Print &amp;Bill...</source>
         <translation>&amp;Rechnung drucken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="73"/>
+        <location filename="orderwin.cpp" line="76"/>
         <source>Save Bill &amp;as file...</source>
         <translation>Rechnung &amp;speichern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="75"/>
+        <location filename="orderwin.cpp" line="78"/>
         <source>Print &amp;Tickets...</source>
         <translation>&amp;Eintrittskarten drucken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="76"/>
+        <location filename="orderwin.cpp" line="79"/>
         <source>Print &amp;Current Ticket...</source>
         <translation>markierte Eintrittskarte drucken</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="77"/>
+        <location filename="orderwin.cpp" line="80"/>
         <source>&amp;View Tickets...</source>
         <translation>Eintrittskarten &amp;ansehen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="88"/>
+        <location filename="orderwin.cpp" line="91"/>
         <source>Order ID:</source>
         <translation>Bestell-Nr.:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="90"/>
+        <location filename="orderwin.cpp" line="93"/>
         <source>Order Date:</source>
         <translation>Bestelldatum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="92"/>
+        <location filename="orderwin.cpp" line="95"/>
         <source>Shipping Date:</source>
         <translation>Versandtdatum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="94"/>
+        <location filename="orderwin.cpp" line="97"/>
         <source>Customer:</source>
         <translation>Kunde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="99"/>
+        <location filename="orderwin.cpp" line="102"/>
         <source>Sold by:</source>
         <translation>Verkauft durch:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="101"/>
+        <location filename="orderwin.cpp" line="104"/>
         <source>Total Price:</source>
         <translation>Gesamtpreis:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="103"/>
+        <location filename="orderwin.cpp" line="106"/>
         <source>Already Paid:</source>
         <translation>bereits bezahlt:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="105"/>
+        <location filename="orderwin.cpp" line="108"/>
         <source>Order State:</source>
         <translation>Bestellstatus:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="orderwin.cpp" line="141"/>
         <source>Ticket ID</source>
         <translation>Karten-Nr.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="orderwin.cpp" line="141"/>
         <source>Event</source>
         <translation>Veranstaltung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="orderwin.cpp" line="141"/>
         <source>Start Time</source>
         <translation>Anfangszeit</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="orderwin.cpp" line="141"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="orderwin.cpp" line="141"/>
         <source>Price</source>
         <translation>Preis</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="55"/>
+        <location filename="orderwin.cpp" line="56"/>
         <source>&amp;Mark Order as Shipped...</source>
         <translation>Bestellung als versandt markieren...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="58"/>
+        <location filename="orderwin.cpp" line="59"/>
         <source>Ch&amp;ange Ticket-Price...</source>
         <translation>Kartenpreis ändern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="60"/>
+        <location filename="orderwin.cpp" line="61"/>
         <source>&amp;Return Ticket...</source>
         <translation>Karte zurückgeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="449"/>
+        <location filename="orderwin.cpp" line="452"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="205"/>
+        <location filename="orderwin.cpp" line="208"/>
         <source>Unable to get template file (ticket.xtt). Giving up.</source>
         <translation>Kann Vorlage (ticket.xtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="233"/>
+        <location filename="orderwin.cpp" line="236"/>
         <source>Unable to get template file (bill.odtt). Giving up.</source>
         <translation>Kann Vorlage (bill.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="475"/>
+        <location filename="orderwin.cpp" line="478"/>
         <source>Mark as shipped?</source>
         <translation>Als versandt markieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="475"/>
+        <location filename="orderwin.cpp" line="478"/>
         <source>Mark this order as shipped now?</source>
         <translation>Diese Bestellung jetzt als versandt markieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="256"/>
+        <location filename="orderwin.cpp" line="259"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
         <translation>Kann Vorlage (eventsummary.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="342"/>
+        <location filename="orderwin.cpp" line="345"/>
         <source>Enter Payment</source>
         <translation>Zahlbetrag eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="342"/>
+        <location filename="orderwin.cpp" line="345"/>
         <source>Please enter the amount that has been paid:</source>
         <translation>Bitte geben Sie den Betrag ein, der bezahlt wurde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="349"/>
+        <location filename="orderwin.cpp" line="352"/>
         <source>Unable to submit payment request.</source>
         <translation>Kann Bestellung nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="353"/>
-        <source>Error whily trying to pay: %1</source>
+        <location filename="orderwin.cpp" line="356"/>
+        <source>Error while trying to pay: %1</source>
         <translation>Fehler während der Bezahlung: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="401"/>
+        <location filename="orderwin.cpp" line="404"/>
         <source>Enter Refund</source>
         <translation>Rückgabe eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="401"/>
+        <location filename="orderwin.cpp" line="404"/>
         <source>Please enter the amount that will be refunded:</source>
         <translation>Bitte geben Sie den Betrag ein, der zurückgegeben wird:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="372"/>
+        <location filename="orderwin.cpp" line="375"/>
         <source>Unable to submit refund request.</source>
         <translation>Kann Rückgabe nicht übermitteln.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="376"/>
+        <location filename="orderwin.cpp" line="379"/>
         <source>Error whily trying to refund: %1</source>
         <translation>Fehler während der Rückgabe: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="429"/>
+        <location filename="orderwin.cpp" line="432"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation>Diese Karte kann nicht zurückgegeben werden: sie wurde bereits verwendet.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="433"/>
+        <location filename="orderwin.cpp" line="436"/>
         <source>Return Ticket</source>
         <translation>Karte zurückgeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="433"/>
+        <location filename="orderwin.cpp" line="436"/>
         <source>Do you really want to return this ticket?</source>
         <translation>Wollen Sie diese Karte wirklich zurückgeben?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="443"/>
+        <location filename="orderwin.cpp" line="446"/>
         <source>Cancel Order?</source>
         <translation>Bestellung stornieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="443"/>
+        <location filename="orderwin.cpp" line="446"/>
         <source>Cancel this order now?</source>
         <translation>Diese Bestellung jetzt stornieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="445"/>
+        <location filename="orderwin.cpp" line="448"/>
         <source>Cannot cancel this order: it is in the wrong state.</source>
         <translation>Diese Bestellung kann nicht: sie ist im falschen Zustand.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="449"/>
+        <location filename="orderwin.cpp" line="452"/>
         <source>Failed to cancel this order.</source>
         <translation>Kann diese Bestellung nicht stornieren. Schade.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="96"/>
+        <location filename="orderwin.cpp" line="99"/>
         <source>Delivery Address:</source>
         <translation>Lieferadresse:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="107"/>
+        <location filename="orderwin.cpp" line="110"/>
         <source>Order Comment:</source>
         <translation>Bestellkommentar:</translation>
     </message>
+    <message>
+        <location filename="orderwin.cpp" line="63"/>
+        <source>Change Commen&amp;t...</source>
+        <translation>Kommen&amp;tar ändern...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="490"/>
+        <source>Set comment: order %1</source>
+        <translation>Kommentar ändern: Bestellung %1</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="501"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Speichern</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="503"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Abbrechen</translation>
+    </message>
 </context>
 <context>
     <name>MOverview</name>
@@ -1742,22 +1674,17 @@ At least %1 Bits of random are required.</source>
         <translation>&amp;Kunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="81"/>
-        <source>C&amp;onfigure</source>
-        <translation type="obsolete">&amp;Konfigurieren</translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="94"/>
         <source>Events</source>
         <translation>Veranstaltungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1135"/>
+        <location filename="overview.cpp" line="1142"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="346"/>
+        <location filename="overview.cpp" line="349"/>
         <source>I was unable to renew the login at the server, the error was: %1</source>
         <translation>Der erneute Login ist fehlgeschlagen: %1</translation>
     </message>
@@ -1802,11 +1729,6 @@ At least %1 Bits of random are required.</source>
         <translation>&amp;Einkauf abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="79"/>
-        <source>&amp;Show all orders</source>
-        <translation type="obsolete">&amp;Alle Bestellungen anzeigen</translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="104"/>
         <source>New Event...</source>
         <translation>Neue Veranstaltung...</translation>
@@ -1862,12 +1784,12 @@ At least %1 Bits of random are required.</source>
         <translation>Von vorn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="721"/>
+        <location filename="overview.cpp" line="730"/>
         <source>Start Time</source>
         <translation>Anfangszeit</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="721"/>
+        <location filename="overview.cpp" line="730"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
@@ -1923,42 +1845,37 @@ At least %1 Bits of random are required.</source>
         <translation>Hosts</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="408"/>
+        <location filename="overview.cpp" line="411"/>
         <source>Login Name</source>
         <translation>Loginname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="408"/>
+        <location filename="overview.cpp" line="411"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="423"/>
+        <location filename="overview.cpp" line="425"/>
         <source>New User</source>
         <translation>Neuer Nutzer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="423"/>
+        <location filename="overview.cpp" line="425"/>
         <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
         <translation>Neuen Nutzernamen eingeben (Buchstaben, Ziffern, Unterstrich):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="838"/>
+        <location filename="overview.cpp" line="844"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="413"/>
-        <source>The user name must contain only letters, digits, and underscores and must be at least one character long!</source>
-        <translation type="obsolete">Der Nutzername darf nur aus Buchstaben, Ziffern und Unterstrich bestehen. Er muss mindestens ein Zeichen enthalten.</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="463"/>
+        <location filename="overview.cpp" line="475"/>
         <source>Edit Description</source>
         <translation>Beschreibung ändern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="463"/>
+        <location filename="overview.cpp" line="475"/>
         <source>Descriptionof user %1:</source>
         <translation>Beschreibung von Nutzer %1:</translation>
     </message>
@@ -2003,127 +1920,127 @@ At least %1 Bits of random are required.</source>
         <translation>Exportieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="432"/>
+        <location filename="overview.cpp" line="434"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="432"/>
+        <location filename="overview.cpp" line="434"/>
         <source>Please enter an initial password for the user:</source>
         <translation>Bitte geben Sie ein intiales Passwort ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="447"/>
+        <location filename="overview.cpp" line="449"/>
         <source>Delete User?</source>
         <translation>Nutzer löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="447"/>
+        <location filename="overview.cpp" line="449"/>
         <source>Really delete user &apos;%1&apos;?</source>
         <translation>Nutzer &apos;%1&apos; wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="506"/>
+        <location filename="overview.cpp" line="518"/>
         <source>Error setting password: %1</source>
         <translation>Passwort kann nicht gesetzt werden: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="521"/>
+        <location filename="overview.cpp" line="533"/>
         <source>The password must be non-empty and both lines must match</source>
         <translation>Das Passwort darf nicht leer sein und beide Zeilen müssen übereinstimmen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="537"/>
+        <location filename="overview.cpp" line="549"/>
         <source>Host Name</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="537"/>
+        <location filename="overview.cpp" line="549"/>
         <source>Host Key</source>
         <translation>Hostkey</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="555"/>
+        <location filename="overview.cpp" line="566"/>
         <source>Create New Host</source>
         <translation>Neuen Host anlegen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="555"/>
+        <location filename="overview.cpp" line="566"/>
         <source>Please enter a host name:</source>
         <translation>Bitte geben Sie einen neuen Hostnamen ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="563"/>
+        <location filename="overview.cpp" line="574"/>
         <source>The key of this new host could only be generated with %1 bits entropy. Store anyway?</source>
         <translation>Der Key dieses Hosts konnte nur mit %1 Bits Entropie angelegt werde. Trotzdem speichern?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="586"/>
+        <location filename="overview.cpp" line="597"/>
         <source>Delete this Host?</source>
         <translation>Diesen Host löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="586"/>
+        <location filename="overview.cpp" line="597"/>
         <source>Really delete host &apos;%1&apos;?</source>
         <translation>Den Host &apos;%1&apos; wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="600"/>
+        <location filename="overview.cpp" line="611"/>
         <source>Change Host Key?</source>
         <translation>Hostkey ändern?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="600"/>
+        <location filename="overview.cpp" line="611"/>
         <source>Really change the key of host &apos;%1&apos;?</source>
         <translation>Den Key von Host &apos;%1&apos; wirklich ändern?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="605"/>
+        <location filename="overview.cpp" line="616"/>
         <source>The new key of this host could only be generated with %1 bits entropy. Store anyway?</source>
         <translation>Der Key dieses Hosts konnte nur mit %1 Bits Entropie angelegt werde. Trotzdem speichern?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="616"/>
+        <location filename="overview.cpp" line="627"/>
         <source>Import Key from File</source>
         <translation>Key aus Datei importieren</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="625"/>
+        <location filename="overview.cpp" line="636"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation>Datei %1 kann nicht zum Lesen geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="637"/>
+        <location filename="overview.cpp" line="648"/>
         <source>This is not a host key file.</source>
         <translation>Dies ist keine Hostkeydatei.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="642"/>
+        <location filename="overview.cpp" line="653"/>
         <source>This host key file does not contain a valid host name.</source>
         <translation>Die Hostkeydatei enthält keinen gültigen Hostnamen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="647"/>
+        <location filename="overview.cpp" line="658"/>
         <source>This host key file does not contain a valid key.</source>
         <translation>Diese Datei enthält keinen gültigen Hostkey.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="652"/>
+        <location filename="overview.cpp" line="663"/>
         <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
         <translation>Die Checksumme dieser Datei ist fehlgeschlagen. Bitte besorgen Sie eine neue Kopie der Datei.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="670"/>
+        <location filename="overview.cpp" line="681"/>
         <source>This host cannot be exported.</source>
         <translation>Dieser Host kann nicht exportiert werden.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="675"/>
+        <location filename="overview.cpp" line="686"/>
         <source>Export Key to File</source>
         <translation>Hostkey als Datei speichern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="684"/>
+        <location filename="overview.cpp" line="695"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation>Datei %1 kann nicht zum Schreiben geöffnet werden: %2</translation>
     </message>
@@ -2133,11 +2050,6 @@ At least %1 Bits of random are required.</source>
         <translation>Bestellung anlegen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="157"/>
-        <source>Sell Items</source>
-        <translation type="obsolete">Verkaufen</translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="171"/>
         <source>Order List</source>
         <translation>Bestellungsliste</translation>
@@ -2168,62 +2080,42 @@ At least %1 Bits of random are required.</source>
         <translation>Offene Rückerstattungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="169"/>
-        <source>Payment</source>
-        <translation type="obsolete">Bezahlen</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="170"/>
-        <source>Refund</source>
-        <translation type="obsolete">Rückerstattung</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="172"/>
-        <source>Print Tickets</source>
-        <translation type="obsolete">Eintrittskarten drucken</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="173"/>
-        <source>Print Bill</source>
-        <translation type="obsolete">Rechnung drucken</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="721"/>
+        <location filename="overview.cpp" line="730"/>
         <source>Amount</source>
         <translation>Anzahl</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="742"/>
+        <location filename="overview.cpp" line="751"/>
         <source>Select Event to order Ticket</source>
         <translation>Bitte wählen Sie eine Verstaltung aus, um zu bestellen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="756"/>
+        <location filename="overview.cpp" line="764"/>
         <source>Select</source>
         <translation>Auswählen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1016"/>
+        <location filename="overview.cpp" line="1023"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="794"/>
+        <location filename="overview.cpp" line="800"/>
         <source>There is nothing in the order. Ignoring it.</source>
         <translation>Bestellung ist leer. Vorgang abgebrochen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="798"/>
+        <location filename="overview.cpp" line="804"/>
         <source>Please chose a customer first!</source>
         <translation>Bitte wählen Sie zunächst einen Kunden aus!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="834"/>
+        <location filename="overview.cpp" line="840"/>
         <source>The request failed.</source>
         <translation>Anfrage ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="838"/>
+        <location filename="overview.cpp" line="844"/>
         <source>A problem occurred during the order: %1</source>
         <translation>Die Bestellung ist fehlgeschlagen: %1</translation>
     </message>
@@ -2233,24 +2125,9 @@ At least %1 Bits of random are required.</source>
         <translation>Einlasskontrolle</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="832"/>
-        <source>Ticket Ok</source>
-        <translation type="obsolete">Eintrittskarte gültig</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="836"/>
-        <source>Ticket Already Used</source>
-        <translation type="obsolete">Die Eintrittkarte wurde bereits benutzt!</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="840"/>
-        <source>Ticket Not Paid</source>
-        <translation type="obsolete">Die Eintrittskarte ist noch nicht bezahlt!</translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="115"/>
-        <source>Ticket Summary...</source>
-        <translation>Eintrittskartenübersicht...</translation>
+        <source>Event Summary...</source>
+        <translation>Veranstaltungsübersicht...</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="180"/>
@@ -2263,22 +2140,22 @@ At least %1 Bits of random are required.</source>
         <translation>Auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1073"/>
+        <location filename="overview.cpp" line="1080"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1073"/>
+        <location filename="overview.cpp" line="1080"/>
         <source>Total</source>
         <translation>Gesamt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1073"/>
+        <location filename="overview.cpp" line="1080"/>
         <source>Paid</source>
         <translation>bezahlt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1073"/>
+        <location filename="overview.cpp" line="1080"/>
         <source>Customer</source>
         <translation>Kunde</translation>
     </message>
@@ -2308,138 +2185,138 @@ At least %1 Bits of random are required.</source>
         <translation>Mit Kartennummer finden...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="393"/>
+        <location filename="overview.cpp" line="396"/>
         <source>Cancel Event</source>
         <translation>Veranstaltung absagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="393"/>
+        <location filename="overview.cpp" line="396"/>
         <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
         <translation>Bitte geben Sie einen Grund für die Absage der Veranstaltung &quot;%1&quot; ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="396"/>
+        <location filename="overview.cpp" line="399"/>
         <source>Event Cancelled</source>
         <translation>Veranstaltung abgesagt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="396"/>
+        <location filename="overview.cpp" line="399"/>
         <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
         <translation>Die Veranstaltung &quot;%1&quot; wurde abgesagt. Bitte informieren Sie alle Kunden.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="398"/>
+        <location filename="overview.cpp" line="401"/>
         <source>Unable to cancel event &quot;%1&quot;.</source>
         <translation>Kann Veranstaltung &quot;%1&quot; nicht absagen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="886"/>
+        <location filename="overview.cpp" line="892"/>
         <source>Ticket &quot;%1&quot; Not Valid</source>
         <translation>Karte &quot;%1&quot; ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="890"/>
+        <location filename="overview.cpp" line="896"/>
         <source>Ticket &quot;%1&quot; has already been used</source>
         <translation>Karte &quot;%1&quot; wurde bereits verwendet.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="894"/>
+        <location filename="overview.cpp" line="900"/>
         <source>Ticket &quot;%1&quot; has not been bought.</source>
         <translation>Karte &quot;%1&quot; wurde nicht gekauft.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="898"/>
+        <location filename="overview.cpp" line="904"/>
         <source>Ticket &quot;%1&quot; Ok</source>
         <translation>Karte &quot;%1&quot; Okay.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="903"/>
+        <location filename="overview.cpp" line="909"/>
         <source>Ticket &quot;%1&quot; Ok; the Order has a refund</source>
         <translation>Karte &quot;%1&quot; Okay.
 Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="908"/>
+        <location filename="overview.cpp" line="914"/>
         <source>Ticket &quot;%1&quot; is not paid for!</source>
         <translation>Karte &quot;%1&quot; ist nicht bezahlt!!!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="911"/>
+        <location filename="overview.cpp" line="917"/>
         <source>Ticket &quot;%1&quot; cannot be accepted, please check the order!</source>
         <translation>Karte &quot;%1&quot; kann nicht akzeptiert werden, bitte prüfen Sie die Bestellung.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="976"/>
+        <location filename="overview.cpp" line="983"/>
         <source>Enter Ticket</source>
         <translation>Bitte Ticket eingeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="976"/>
+        <location filename="overview.cpp" line="983"/>
         <source>Please enter the ID of one of the tickets of the order you seek:</source>
         <translation>Bitte geben Sie die Nr. einer Karte aus der gesuchten Bestellung ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="980"/>
+        <location filename="overview.cpp" line="987"/>
         <source>Unable to query server.</source>
         <translation>Kann Server nicht abfragen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="989"/>
+        <location filename="overview.cpp" line="996"/>
         <source>Server returned an invalid order ID.</source>
         <translation>Server hat eine ungültige Bestellnummer geliefert.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1098"/>
+        <location filename="overview.cpp" line="1105"/>
         <source>Please select a template file.</source>
         <translation>Bitte wählen Sie eine Vorlage aus.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1105"/>
+        <location filename="overview.cpp" line="1112"/>
         <source>Enter Template Name</source>
         <translation>Vorlagenname eingeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1105"/>
+        <location filename="overview.cpp" line="1112"/>
         <source>Please enter a name for the template file, it should contain only letters, digits, underscores and dots:</source>
         <translation>Bitte geben Sie einen Namen für die Vorlage ein. Der Name sollte nur Buchstaben, Zahlen und Unterstriche und Punkte enthalten:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1108"/>
+        <location filename="overview.cpp" line="1115"/>
         <source>The template name must only contain letters, digits, underscores and dots.</source>
         <translation>Der Vorlagenname darf nur Buchstaben, Ziffern, Unterstriche und Punkte enthalten.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1112"/>
+        <location filename="overview.cpp" line="1119"/>
         <source>Success</source>
         <translation>Erfolg</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1112"/>
+        <location filename="overview.cpp" line="1119"/>
         <source>Successfully uploaded the template.</source>
         <translation>Vorlage wurde erfolgreich hochgeladen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1114"/>
+        <location filename="overview.cpp" line="1121"/>
         <source>Unable to upload the template.</source>
         <translation>Kann Vorlage nicht hochladen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1121"/>
+        <location filename="overview.cpp" line="1128"/>
         <source>Return Ticket</source>
         <translation>Karte zurückgeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1121"/>
+        <location filename="overview.cpp" line="1128"/>
         <source>Please enter the ticket ID to return:</source>
         <translation>Bitte geben Sie die Karte ein, die zurückgegeben wird:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1125"/>
+        <location filename="overview.cpp" line="1132"/>
         <source>This is not a valid ticket.</source>
         <translation>Dies ist keine gültige Karte.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1130"/>
+        <location filename="overview.cpp" line="1137"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation>Diese Karte kann nicht zurückgegeben werden: sie wurde bereits benutzt oder befindet sich im falschen Status.</translation>
     </message>
@@ -2479,60 +2356,96 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
         <translation>Nach Kunde finden...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="428"/>
+        <location filename="overview.cpp" line="430"/>
         <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
         <translation>Nutzernamen dürfen nur Buchstaben, Ziffern, Punkte und Unterstriche enthalten und müssen mindestens ein Zeichen lang sein!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1002"/>
+        <location filename="overview.cpp" line="1009"/>
         <source>Select Event</source>
         <translation>Veranstaltung auswählen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1014"/>
+        <location filename="overview.cpp" line="1021"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
+    <message>
+        <location filename="overview.cpp" line="318"/>
+        <source>Capacity</source>
+        <translation>Sitzplätze:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="318"/>
+        <source>Sold</source>
+        <translation>Verkauft</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="318"/>
+        <source>Reserved</source>
+        <translation>Reserviert</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="318"/>
+        <source>Free</source>
+        <translation>Frei</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="453"/>
+        <source>(Nobody)</source>
+        <comment>this is a username for no user, the string must contain &apos;(&apos; to distinguish it from the others</comment>
+        <translation>(Niemand)</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="456"/>
+        <source>Delete User</source>
+        <translation>Nutzer Löschen</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="456"/>
+        <source>Select which user will inherit this users database objects:</source>
+        <translation>Bitte wählen Sie einen Nutzer, der die Datenbankobjekte des gelöschten Nutzers erbt:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="461"/>
+        <source>Cannot delete user: %1</source>
+        <translation>Kann Nutzer nicht löschen: %1</translation>
+    </message>
 </context>
 <context>
     <name>MPasswordChange</name>
     <message>
-        <location filename="overview.cpp" line="1146"/>
+        <location filename="overview.cpp" line="1153"/>
         <source>Change my password</source>
         <translation>Mein Passwort ändern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="910"/>
-        <source>Reset password of user %1</source>
-        <translation type="obsolete">Passwort von Nutzer %1 setzen</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="1152"/>
+        <location filename="overview.cpp" line="1159"/>
         <source>Old Password:</source>
         <translation>Altes Passwort:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1156"/>
+        <location filename="overview.cpp" line="1163"/>
         <source>New Password:</source>
         <translation>Neues Passwort:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1159"/>
+        <location filename="overview.cpp" line="1166"/>
         <source>Repeat Password:</source>
         <translation>Paswort wiederholen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1167"/>
+        <location filename="overview.cpp" line="1174"/>
         <source>Set Password</source>
         <translation>Passwort setzen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1169"/>
+        <location filename="overview.cpp" line="1176"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1148"/>
+        <location filename="overview.cpp" line="1155"/>
         <source>Reset password of user &quot;%1&quot;</source>
         <translation>Passwort des Nutzers &quot;%1&quot; zurücksetzen</translation>
     </message>
@@ -2540,95 +2453,95 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
 <context>
     <name>MTicket</name>
     <message>
-        <location filename="order.cpp" line="575"/>
+        <location filename="order.cpp" line="595"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="610"/>
+        <location filename="order.cpp" line="630"/>
         <source>bought</source>
         <comment>ticket state</comment>
         <translation>gekauft</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="611"/>
+        <location filename="order.cpp" line="631"/>
         <source>to refund</source>
         <comment>ticket state</comment>
         <translation>zurückgegeben</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="612"/>
+        <location filename="order.cpp" line="632"/>
         <source>used</source>
         <comment>ticket state</comment>
         <translation>benutzt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="613"/>
+        <location filename="order.cpp" line="633"/>
         <source>reserved</source>
         <comment>ticket state</comment>
         <translation>reserviert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="614"/>
+        <location filename="order.cpp" line="634"/>
         <source>ok</source>
         <comment>ticket state</comment>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="615"/>
+        <location filename="order.cpp" line="635"/>
         <source>sale only</source>
         <comment>ticket state</comment>
         <translation>nur zum Verkauf</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="616"/>
+        <location filename="order.cpp" line="636"/>
         <source>order only</source>
         <comment>ticket state</comment>
         <translation>nur zur Bestellung</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="617"/>
+        <location filename="order.cpp" line="637"/>
         <source>too late: event over</source>
         <comment>ticket state</comment>
         <translation>zu spät: Veranstaltung ist vorbei</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="618"/>
+        <location filename="order.cpp" line="638"/>
         <source>no more tickets</source>
         <comment>ticket state</comment>
         <translation>keine Karten mehr verfügbar</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="619"/>
+        <location filename="order.cpp" line="639"/>
         <source>event cancelled</source>
         <comment>ticket state</comment>
         <translation>Veranstaltung abgesagt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="620"/>
+        <location filename="order.cpp" line="640"/>
         <source>no such event</source>
         <comment>ticket state</comment>
         <translation>Veranstaltung unbekannt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="621"/>
+        <location filename="order.cpp" line="641"/>
         <source>invalid</source>
         <comment>ticket state</comment>
         <translation>ungültig</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="640"/>
+        <location filename="order.cpp" line="660"/>
         <source>Cannot execute request.</source>
         <translation>Kann Anfrage nicht ausführen.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="667"/>
+        <location filename="order.cpp" line="687"/>
         <source>Ticket is not stored, can&apos;t return it.</source>
         <translation>Karte ist nicht gespeichert, kann sie nicht zurückgeben.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="669"/>
+        <location filename="order.cpp" line="689"/>
         <source>Failed to execute request</source>
         <translation>Kann Anfrage nicht ausführen.</translation>
     </message>
@@ -2636,25 +2549,33 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
 <context>
     <name>MTicketView</name>
     <message>
-        <location filename="orderwin.cpp" line="487"/>
+        <location filename="orderwin.cpp" line="518"/>
         <source>Preview Tickets</source>
         <translation>Karten-Vorschau</translation>
     </message>
 </context>
 <context>
+    <name>MUser</name>
+    <message>
+        <location filename="user.cpp" line="106"/>
+        <source>User not valid: cannot delete.</source>
+        <translation>Ungültiger Nutzer: kann nicht gelöscht werden.</translation>
+    </message>
+</context>
+<context>
     <name>MUserHost</name>
     <message>
-        <location filename="user.cpp" line="303"/>
+        <location filename="user.cpp" line="308"/>
         <source>_any</source>
         <translation>beliebiger Host</translation>
     </message>
     <message>
-        <location filename="user.cpp" line="303"/>
+        <location filename="user.cpp" line="308"/>
         <source>_online</source>
         <translation>Web-Präsenz</translation>
     </message>
     <message>
-        <location filename="user.cpp" line="303"/>
+        <location filename="user.cpp" line="308"/>
         <source>_anon</source>
         <translation>Anonym</translation>
     </message>
@@ -2662,92 +2583,92 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
 <context>
     <name>MWebRequest</name>
     <message>
-        <location filename="webrequest.cpp" line="177"/>
+        <location filename="webrequest.cpp" line="179"/>
         <source>Unable to get server info.</source>
         <translation>Serverdaten können nicht gelesen werden.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="184"/>
+        <location filename="webrequest.cpp" line="186"/>
         <source>Error while parsing server info (line %1 col %2): %3</source>
         <translation>Fehler beim Lesen der Serverdaten (Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="189"/>
+        <location filename="webrequest.cpp" line="191"/>
         <source>Error in server info: missing authentication algorithm info.</source>
         <translation>Fehler in Serverdaten: Authentifikationsalgorithmus fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="194"/>
+        <location filename="webrequest.cpp" line="196"/>
         <source>The server requested an unsupported hash algorithm: %1.</source>
         <translation>Der Server verlangt einen nicht unterstützten Algorithmus (%1). Kann nicht fortsetzen.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="200"/>
+        <location filename="webrequest.cpp" line="202"/>
         <source>Unable to get authentication challenge.</source>
         <translation>Authentifikation fehlgeschlagen (es wurde kein Challenge angeboten).</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="204"/>
+        <location filename="webrequest.cpp" line="206"/>
         <source>Error while parsing session challenge (line %1 col %2): %3</source>
         <translation>Fehler beim Lesen der Authentifikationsdaten (Challenge; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="210"/>
+        <location filename="webrequest.cpp" line="212"/>
         <source>Error in session challenge: missing session ID.</source>
         <translation>Fehler in Authentifikationsdaten (Challenge): Session-ID fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="216"/>
+        <location filename="webrequest.cpp" line="218"/>
         <source>Error in session challenge: missing host challenge.</source>
         <translation>Fehler in Authentifikationsdaten (Challenge): Host-Challenge fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="222"/>
+        <location filename="webrequest.cpp" line="224"/>
         <source>Error in session challenge: missing user challenge.</source>
         <translation>Fehler in Authentifikationsdaten (Challenge): Nutzer-Challenge fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="248"/>
+        <location filename="webrequest.cpp" line="250"/>
         <source>Failed to log in: user/password mismatch, non-allowed host key, or challenge timed out.</source>
         <translation>Authentifikation fehlgeschlagen: Passwort ist falsch, Host ist nicht zugelassen oder Challenge-Timeout.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="252"/>
+        <location filename="webrequest.cpp" line="254"/>
         <source>Unable to authenticate.</source>
         <translation>Authentifikation fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="344"/>
+        <location filename="webrequest.cpp" line="346"/>
         <source>Error parsing EventList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Lesen der XML-Daten (Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="295"/>
+        <location filename="webrequest.cpp" line="297"/>
         <source>Cannot change password, old password does not match!</source>
         <translation>Passwort kann nicht geändert werden: altes Passwort ist falsch.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="368"/>
+        <location filename="webrequest.cpp" line="370"/>
         <source>Error parsing RoomList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Lesen der Daten (RoomList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="392"/>
+        <location filename="webrequest.cpp" line="394"/>
         <source>Error parsing UserList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Lesen der Daten (UserList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="416"/>
+        <location filename="webrequest.cpp" line="418"/>
         <source>Error parsing HostList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Lesen der Daten (HostList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="440"/>
+        <location filename="webrequest.cpp" line="442"/>
         <source>Error parsing CustomerList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Lesen der Daten (CustomerList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="491"/>
+        <location filename="webrequest.cpp" line="493"/>
         <source>Error parsing OrderList XML data (line %1 column %2): %3</source>
         <translation>Fehler beim Parsen der XML-Daten (Zeile %1, Spalte %2): %3</translation>
     </message>
@@ -2755,27 +2676,27 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
 <context>
     <name>initkey</name>
     <message>
-        <location filename="main.cpp" line="134"/>
+        <location filename="main.cpp" line="145"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <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>MagicSmoke braucht einen Hostkey. Sie müssen einen Hostkey generieren bevor das Programm benutzt werden kann.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="128"/>
+        <location filename="main.cpp" line="139"/>
         <source>Enter Host Name</source>
         <translation>Bitte Hostnamen eingeben</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="129"/>
+        <location filename="main.cpp" line="140"/>
         <source>Host name:</source>
         <translation>Hostname:</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="134"/>
+        <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>MagicSmoke braucht einen Hostnamen. Sie müssen einen Hostnamen eingeben bevor das Programm benutzt werden kann.</translation>
     </message>
@@ -2783,18 +2704,18 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
 <context>
     <name>initprofile</name>
     <message>
-        <location filename="main.cpp" line="143"/>
+        <location filename="main.cpp" line="154"/>
         <source>default</source>
         <comment>initial profile</comment>
         <translation>Standardprofil</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="144"/>
+        <location filename="main.cpp" line="155"/>
         <source>Create Initial Profile</source>
         <translation>Initiales Profil anlegen</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="144"/>
+        <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>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>
@@ -2802,22 +2723,22 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück.</translation>
 <context>
     <name>lang</name>
     <message>
-        <location filename="main.cpp" line="52"/>
+        <location filename="main.cpp" line="63"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="52"/>
+        <location filename="main.cpp" line="63"/>
         <source>The changed language setting will only be active after restarting the application.</source>
         <translation>Die Änderung der Sprachkonfiguration wird es nach dem nächsten Neustart des Programms wirksam.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="47"/>
+        <location filename="main.cpp" line="58"/>
         <source>Chose Language</source>
         <translation>Sprache auswählen</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="47"/>
+        <location filename="main.cpp" line="58"/>
         <source>Language:</source>
         <translation>Sprache:</translation>
     </message>

diff --git a/src/smoke_de_SAX.ts b/src/smoke_de_SAX.ts
index 3b309f6..625a0f5 100644 (file)
--- a/src/smoke_de_SAX.ts
+++ b/src/smoke_de_SAX.ts
@@ -1,649 +1,557 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="de">
+<defaultcodec></defaultcodec>
 <context>
     <name></name>
     <message>
         <location filename="../www/inc/classes/customer.php" line="257"/>
         <source>Unknown Customer</source>
-        <translation type="unfinished">Unbegannder Gunde. Da iss was schiefgelaufn.</translation>
+        <translation>Unbegannder Gunde. Da iss was schiefgelaufn.</translation>
     </message>
     <message>
         <location filename="../www/inc/classes/customer.php" line="269"/>
         <source>Unable to parse XML.</source>
-        <translation type="unfinished">Gann des XML nisch vorschdehn.</translation>
+        <translation>Gann des XML nisch vorschdehn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="537"/>
+        <location filename="../www/inc/machine/session.php" line="573"/>
         <source>unable to parse XML data</source>
-        <translation type="unfinished">Gann de XML Daden nisch verstehn</translation>
+        <translation>Gann de XML Daden nisch verstehn</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/host.php" line="89"/>
         <source>Cannot delete special hosts.</source>
-        <translation type="unfinished">Schbedsielle Reschnor gönnen nisch gelöschd werdn.</translation>
+        <translation>Schbedsielle Reschnor gönnen nisch gelöschd werdn.</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/session.php" line="138"/>
         <source>missing some authentication data</source>
-        <translation type="unfinished">Isch vormisse a bissl was von dor Audendigadsion.</translation>
+        <translation>Isch vormisse a bissl was von dor Audendigadsion.</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/session.php" line="210"/>
         <source>Not authenticated. Can&apos;t change password.</source>
-        <translation type="unfinished">De bissd nisch angemeldet, also gannsde och gee Bassword ändorn.</translation>
+        <translation>De bissd nisch angemeldet, also gannsde och gee Bassword ändorn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="542"/>
+        <location filename="../www/inc/machine/session.php" line="578"/>
         <source>expected exactly one passwd element</source>
-        <translation type="unfinished">Isch hadde eschendlich nur een Bassword erwarded.</translation>
+        <translation>Isch hadde eschendlich nur een Bassword erwarded.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="550"/>
+        <location filename="../www/inc/machine/session.php" line="586"/>
         <source>cannot set an empty password</source>
-        <translation type="unfinished">Also ganns so eefach isses ned: Du mussd schon äweng in das neie Bassword eindrachen.</translation>
+        <translation>Also ganns so eefach isses ned: Du mussd schon äweng in das neie Bassword eindrachen.</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/session.php" line="236"/>
         <source>Ooops. Unable to find user. You have been deleted.</source>
-        <translation type="unfinished">Nanu. Dei Nudsoreindrach is fudsch. Jemand had&apos;sch gelöschd.</translation>
+        <translation>Nanu. Dei Nudsoreindrach is fudsch. Jemand had&apos;sch gelöschd.</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/session.php" line="241"/>
         <source>Wrong password. Session hijacked, terminating it.</source>
-        <translation type="unfinished">Falsches Bassword. Du bissd wahrscheinlich a böser Birad. Geh wech!</translation>
+        <translation>Falsches Bassword. Du bissd wahrscheinlich a böser Birad. Geh wech!</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/session.php" line="373"/>
         <source>invalid user name</source>
-        <translation type="unfinished">Falscher Nudsorname.</translation>
+        <translation>Falscher Nudsorname.</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/session.php" line="337"/>
         <source>_admin</source>
-        <translation type="unfinished">Godd. Darf alles, gann alles, wees alles bessor.</translation>
+        <translation>Godd. Darf alles, gann alles, wees alles bessor.</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/session.php" line="333"/>
         <source>expected exactly 1 ACL element</source>
-        <translation type="unfinished">Isch hab nur een ACL elemend erwarded. Nu hammern Salad, isch wees ned welsches.</translation>
+        <translation>Isch hab nur een ACL elemend erwarded. Nu hammern Salad, isch wees ned welsches.</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/session.php" line="431"/>
         <source>unknown user name</source>
-        <translation type="unfinished">Unbegannder Nudsorname. Findsde das ni&apos; ooch Misd?</translation>
+        <translation>Unbegannder Nudsorname. Findsde das ni&apos; ooch Misd?</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/session.php" line="415"/>
         <source>expected exactly 1 Hosts element</source>
-        <translation type="unfinished">Isch hab nur een Host Elemend erwarded. Mach ma rischdsch.</translation>
+        <translation>Isch hab nur een Host Elemend erwarded. Mach ma rischdsch.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="555"/>
+        <location filename="../www/inc/machine/session.php" line="591"/>
         <source>Unable to change this password.</source>
-        <translation type="unfinished">Isch gann das Bassword &apos;ne ändern.</translation>
+        <translation>Isch gann das Bassword &apos;ne ändern.</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/template.php" line="33"/>
         <source>Template File not found in database</source>
-        <translation type="unfinished">De Vorlache gibsd ned in dor Dadenbank.</translation>
+        <translation>De Vorlache gibsd ned in dor Dadenbank.</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/template.php" line="44"/>
         <source>Unable to find file name</source>
-        <translation type="unfinished">De Dadai gibsd ned.</translation>
+        <translation>De Dadai gibsd ned.</translation>
     </message>
     <message>
         <location filename="../www/inc/machine/template.php" line="52"/>
         <source>Illegal File Name</source>
-        <translation type="unfinished">De Dadai is nich erlaubd. Du mussd Disch schon an de Gonvendsion halden.</translation>
+        <translation>De Dadai is nich erlaubd. Du mussd Disch schon an de Gonvendsion halden.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="16"/>
         <source>serverinfo</source>
-        <translation type="unfinished">Informadschjon&apos; übern Sörvor.</translation>
+        <translation>Informadschjon&apos; übern Sörvor.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="17"/>
         <source>startsession</source>
-        <translation type="unfinished">&apos;Ne Seschon anfang&apos;</translation>
+        <translation>&apos;Ne Seschon anfang&apos;</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="17"/>
         <source>sessionauth</source>
-        <translation type="unfinished">Am Sörvor anmeld&apos;n</translation>
+        <translation>Am Sörvor anmeld&apos;n</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="17"/>
         <source>closesession</source>
-        <translation type="unfinished">Dsum Sörvor gude Nachd sachn</translation>
+        <translation>Dsum Sörvor gude Nachd sachn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="19"/>
         <source>getmyroles</source>
-        <translation type="unfinished">Rausfinden was isch machn darf</translation>
+        <translation>Rausfinden was isch machn darf</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="21"/>
         <source>getusers</source>
-        <translation type="unfinished">Guggn welche Nudsor es gibd</translation>
+        <translation>Guggn welche Nudsor es gibd</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="21"/>
         <source>setuserdescription</source>
-        <translation type="unfinished">Nen bleeden Gommendar über jemand andres machn</translation>
+        <translation>Nen bleeden Gommendar über jemand andres machn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="21"/>
         <source>getuseracl</source>
-        <translation type="unfinished">Rausfinden was een andror darf</translation>
+        <translation>Rausfinden was een andror darf</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="21"/>
         <source>setuseracl</source>
-        <translation type="unfinished">Dem Andorn was vorbiedn dürfen</translation>
+        <translation>Dem Andorn was vorbiedn dürfen</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="21"/>
         <source>getuserhosts</source>
-        <translation type="unfinished">Rausfinden von wo ä Nudsor arbäden darf</translation>
+        <translation>Rausfinden von wo ä Nudsor arbäden darf</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="21"/>
         <source>setuserhosts</source>
-        <translation type="unfinished">Fesdleechn von wo ä Nudsor arbäden darf</translation>
+        <translation>Fesdleechn von wo ä Nudsor arbäden darf</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="21"/>
         <source>adduser</source>
-        <translation type="unfinished">&apos;Nen neuen Nudsor anlechen</translation>
+        <translation>&apos;Nen neuen Nudsor anlechen</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="21"/>
         <source>deleteuser</source>
-        <translation type="unfinished">&apos;Nen Nudsor löschen. Eefach so.</translation>
+        <translation>&apos;Nen Nudsor löschen. Eefach so.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="21"/>
         <source>setmypasswd</source>
-        <translation type="unfinished">Des eechne Bassword ändorn.</translation>
+        <translation>Des eechne Bassword ändorn.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="21"/>
         <source>setpasswd</source>
-        <translation type="unfinished">Des Bassword von jemand gans andors ändorn.</translation>
+        <translation>Des Bassword von jemand gans andors ändorn.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="22"/>
         <source>gethosts</source>
-        <translation type="unfinished">Rausfinden von wo mor alles arbäden gönnde.</translation>
+        <translation>Rausfinden von wo mor alles arbäden gönnde.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="22"/>
         <source>sethost</source>
-        <translation type="unfinished">&apos;Ne Arbedsschdelle ändorn</translation>
+        <translation>&apos;Ne Arbedsschdelle ändorn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="22"/>
         <source>addhost</source>
-        <translation type="unfinished">&apos;Ne neue Arbedsschdelle einrischdn</translation>
+        <translation>&apos;Ne neue Arbedsschdelle einrischdn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="22"/>
         <source>deletehost</source>
-        <translation type="unfinished">&apos;Ne Arbedsschdelle dichd machn</translation>
+        <translation>&apos;Ne Arbedsschdelle dichd machn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="23"/>
         <source>geteventlist</source>
-        <translation type="unfinished">Lisde dor Veranschdaldungen holen</translation>
+        <translation>Lisde dor Veranschdaldungen holen</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="23"/>
         <source>geteventdata</source>
-        <translation type="unfinished">Dedails zu eener Veranschdaldung holen</translation>
+        <translation>Dedails zu eener Veranschdaldung holen</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="23"/>
         <source>seteventdata</source>
-        <translation type="unfinished">Dedails zu eener Veranschdaldung ändorn</translation>
+        <translation>Dedails zu eener Veranschdaldung ändorn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="23"/>
         <source>eventsummary</source>
-        <translation type="unfinished"></translation>
+        <translation>Veranschdaltungsdsusamm&apos;nfassung holen</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="23"/>
         <source>cancelevent</source>
-        <translation type="unfinished"></translation>
+        <translation>Veranschdaldung absach&apos;n</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="24"/>
         <source>getroomdata</source>
-        <translation type="unfinished">Räumlischgeden anzeichen</translation>
+        <translation>Räumlischgeden anzeichen</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="24"/>
         <source>setroomdata</source>
-        <translation type="unfinished">Räumlischgeden ändorn</translation>
+        <translation>Räumlischgeden ändorn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="25"/>
         <source>getcustomerlist</source>
-        <translation type="unfinished">Lisde dor Gunden anguggn</translation>
+        <translation>Lisde dor Gunden anguggn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="25"/>
         <source>getcustomer</source>
-        <translation type="unfinished">Gunde abfrachen.</translation>
+        <translation>Gunde abfrachen.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="25"/>
         <source>setcustomer</source>
-        <translation type="unfinished">Gunde anlechen oder ändorn.</translation>
+        <translation>Gunde anlechen oder ändorn.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>checkorder</source>
-        <translation type="unfinished">Ma guggn ob ne Beschdellung gehen würde.</translation>
+        <translation>Ma guggn ob ne Beschdellung gehen würde.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>createorder</source>
-        <translation type="unfinished">Ne Beschdellung anlegn.</translation>
+        <translation>Ne Beschdellung anlegn.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>createsale</source>
-        <translation type="unfinished">Was vorkofen.</translation>
+        <translation>Was vorkofen.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>getorderlist</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellungslisde holen</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>getorder</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellung anguggn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>orderpay</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellung bezahl&apos;n</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>orderrefund</source>
-        <translation type="unfinished"></translation>
+        <translation>Geld zurüggeben</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>ordershipped</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellung wegschiggn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>cancelorder</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellung abbrech&apos;n</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>orderbyticket</source>
-        <translation type="unfinished"></translation>
+        <translation>gans dief ins Arschief guggn und &apos;ne Beschdellung nur mit nor Garte finden</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
         <source>getordersbyevents</source>
-        <translation type="unfinished"></translation>
+        <translation>de Beschdellungen zu nor Veranschdaldung finden</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="27"/>
         <source>getticket</source>
-        <translation type="unfinished"></translation>
+        <translation>Garde anguggn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="27"/>
         <source>useticket</source>
-        <translation type="unfinished"></translation>
+        <translation>Garde benudsen</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="27"/>
         <source>changeticketprice</source>
-        <translation type="unfinished"></translation>
+        <translation>Gardenbreis ändorn</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="27"/>
         <source>ticketreturn</source>
-        <translation type="unfinished"></translation>
+        <translation>Garde zurüggeben</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="28"/>
         <source>gettemplatelist</source>
-        <translation type="unfinished">Vorlachenlisde anguggen.</translation>
+        <translation>Vorlachenlisde anguggen.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="28"/>
         <source>gettemplate</source>
-        <translation type="unfinished">Vorlache runderladen.</translation>
+        <translation>Vorlache runderladen.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="29"/>
         <source>settemplate</source>
-        <translation type="unfinished">Vorlache erschdellen.</translation>
+        <translation>Vorlache erschdellen.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="34"/>
         <source>Invalid Request, please use the MagicSmoke Client with this page.</source>
-        <translation type="unfinished">Da iss was gabudd mit Deim Brogramm, Du mussd schon &apos;s rischdsche nehm.</translation>
+        <translation>Da iss was gabudd mit Deim Brogramm, Du mussd schon &apos;s rischdsche nehm.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="85"/>
         <source>Invalid or missing sessionid, or session timed out.</source>
-        <translation type="unfinished">De Seschion gehd nimmer.</translation>
+        <translation>De Seschion gehd nimmer.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="97"/>
         <source>Session not yet authenticated.</source>
-        <translation type="unfinished">De Seschion gann noch ned benudsd werden. Du mussd schon alle Zeddl ausfüllen bevor isch Disch reenlass.</translation>
+        <translation>De Seschion gann noch ned benudsd werden. Du mussd schon alle Zeddl ausfüllen bevor isch Disch reenlass.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="109"/>
         <source>You do not have the right to execute this transaction.</source>
-        <translation type="unfinished">Des darfsde nisch. Da mussde den Baba Adminischdrador frachn.</translation>
+        <translation>Des darfsde nisch. Da mussde den Baba Adminischdrador frachn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="348"/>
+        <location filename="../www/machine.php" line="358"/>
         <source>Internal Error: unknown command, hiccup in code structure.</source>
-        <translation type="unfinished">Isch hab da een Broblem. Irschendwie gibsd das Gommando nur halb, aber och ni&apos; rischdisch. Frach ma&apos; den Brogrammierer.</translation>
-    </message>
-</context>
-<context>
-    <name>@default</name>
-    <message>
-        <location filename="../www/machine.php" line="16"/>
-        <source>serverinfo</source>
-        <translation type="obsolete">Informadschjon&apos; übern Sörvor.</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="17"/>
-        <source>startsession</source>
-        <translation type="obsolete">&apos;Ne Seschon anfang&apos;</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="17"/>
-        <source>sessionauth</source>
-        <translation type="obsolete">Am Sörvor anmeld&apos;n</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="17"/>
-        <source>closesession</source>
-        <translation type="obsolete">Dsum Sörvor gude Nachd sachn</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="19"/>
-        <source>getmyroles</source>
-        <translation type="obsolete">Rausfinden was isch machn darf</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>getusers</source>
-        <translation type="obsolete">Guggn welche Nudsor es gibd</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>setuserdescription</source>
-        <translation type="obsolete">Nen bleeden Gommendar über jemand andres machn</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>getuseracl</source>
-        <translation type="obsolete">Rausfinden was een andror darf</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>setuseracl</source>
-        <translation type="obsolete">Dem Andorn was vorbiedn dürfen</translation>
+        <translation>Isch hab da een Broblem. Irschendwie gibsd das Gommando nur halb, aber och ni&apos; rischdisch. Frach ma&apos; den Brogrammierer.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>getuserhosts</source>
-        <translation type="obsolete">Rausfinden von wo ä Nudsor arbäden darf</translation>
+        <location filename="../www/inc/classes/customer.php" line="314"/>
+        <source>Cannot find customer ID to delete.</source>
+        <translation>Gann den Gunden ni finden, den wo isch löschen soll.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>setuserhosts</source>
-        <translation type="obsolete">Fesdleechn von wo ä Nudsor arbäden darf</translation>
+        <location filename="../www/inc/classes/customer.php" line="320"/>
+        <source>Invalid Customer ID, cannot delete.</source>
+        <translation>Gann den Gunden ni löschen, weil die Nummer gibsd gar ni! Widsbold!</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>adduser</source>
-        <translation type="obsolete">&apos;Nen neuen Nudsor anlechen</translation>
+        <location filename="../www/inc/classes/customer.php" line="328"/>
+        <source>Invalid Customer ID, cannot merge.</source>
+        <translation>Ungüldsche Nummer sachd der Sörvor. Jedsd gannor de Gunden ni zusammlechn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>deleteuser</source>
-        <translation type="obsolete">&apos;Nen Nudsor löschen. Eefach so.</translation>
+        <location filename="../www/inc/classes/customer.php" line="346"/>
+        <source>Cannot find Customer ID, cannot delete.</source>
+        <translation>Ei verbübschd! Ich gann den Kunden gar ni findn, den Du löschen willst!</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
-        <source>gethosts</source>
-        <translation type="obsolete">Rausfinden von wo mor alles arbäden gönnde.</translation>
+        <location filename="../www/inc/classes/customer.php" line="367"/>
+        <source>Cannot merge customers.</source>
+        <translation>Kann de Gunden nisch zusammlechen. Worum wees&apos;sch och ni.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
-        <source>sethost</source>
-        <translation type="obsolete">&apos;Ne Arbedsschdelle ändorn</translation>
+        <location filename="../www/inc/classes/customer.php" line="377"/>
+        <source>Cannot delete customer.</source>
+        <translation>Gann den Gunden ni löschen. Gomm&apos;se morchen nochma&apos;.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
-        <source>addhost</source>
-        <translation type="obsolete">&apos;Ne neue Arbedsschdelle einrischdn</translation>
+        <location filename="../www/inc/classes/ticket.php" line="255"/>
+        <source>Malformed request.</source>
+        <translation>Gabudde Anfrache. Nimm ma&apos; das Logbuch und lauf damit zum Brogrammierer, dem Lümmel.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="22"/>
-        <source>deletehost</source>
-        <translation type="obsolete">&apos;Ne Arbedsschdelle dichd machn</translation>
+        <location filename="../www/inc/classes/event.php" line="419"/>
+        <source>The event id must be numeric.</source>
+        <translation>Die Veranschdaldungsnummer muss och wirschlich &apos;ne Nummer sein.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
-        <source>geteventlist</source>
-        <translation type="obsolete">Lisde dor Veranschdaldungen holen</translation>
+        <location filename="../www/inc/classes/event.php" line="433"/>
+        <source>Invalid event id.</source>
+        <translation>Ungüldsche Veranschdaldungsnummer.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="23"/>
-        <source>geteventdata</source>
-        <translation type="obsolete">Dedails zu eener Veranschdaldung holen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="23"/>
-        <source>seteventdata</source>
-        <translation type="obsolete">Dedails zu eener Veranschdaldung ändorn</translation>
+        <location filename="../www/inc/classes/order.php" line="517"/>
+        <source>Cannot place order, sorry.</source>
+        <translation>Jedsd gann&apos;sch vor Schregg die Beschdellung ni anleschn. Dud mir wirschlich leid!</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="24"/>
-        <source>getroomdata</source>
-        <translation type="obsolete">Räumlischgeden anzeichen</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="24"/>
-        <source>setroomdata</source>
-        <translation type="obsolete">Räumlischgeden ändorn</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="25"/>
-        <source>getcustomerlist</source>
-        <translation type="obsolete">Lisde dor Gunden anguggn</translation>
-    </message>
-    <message>
-        <location filename="../www/inc/machine/session.php" line="337"/>
-        <source>_admin</source>
-        <translation type="obsolete">Godd. Darf alles, gann alles, wees alles bessor.</translation>
+        <location filename="../www/inc/classes/order.php" line="528"/>
+        <source>Cannot place sale, sorry.</source>
+        <translation>Das gann&apos;sch jedsd aus irschendnem Grund ni vergaufen. Gomisch.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="537"/>
-        <source>unable to parse XML data</source>
-        <translation type="obsolete">Gann de XML Daden nisch verstehn</translation>
+        <location filename="../www/inc/classes/order.php" line="533"/>
+        <source>Internal Error: unknown action.</source>
+        <translation>Huch! Jedsd habsch was falsch gemachd: de &quot;Action&quot; is ni begannd. Frach ma jemand anders.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/host.php" line="89"/>
-        <source>Cannot delete special hosts.</source>
-        <translation type="obsolete">Schbedsielle Reschnor gönnen nisch gelöschd werdn.</translation>
+        <location filename="../www/inc/classes/order.php" line="591"/>
+        <source>No such orderID in database.</source>
+        <translation>De Beschdellung is ni in dor Dadenbank.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="138"/>
-        <source>missing some authentication data</source>
-        <translation type="obsolete">Isch vormisse a bissl was von dor Audendigadsion.</translation>
+        <location filename="../www/inc/classes/order.php" line="602"/>
+        <source>Expected 2 arguments.</source>
+        <translation>Eischendlich hadsch zwee Argumende erwarded. Wasn&apos; nu?</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="210"/>
-        <source>Not authenticated. Can&apos;t change password.</source>
-        <translation type="obsolete">De bissd nisch angemeldet, also gannsde och gee Bassword ändorn.</translation>
+        <location filename="../www/inc/classes/order.php" line="608"/>
+        <source>Invalid Order ID</source>
+        <translation>Ungüldsche Beschdellnummer</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="542"/>
-        <source>expected exactly one passwd element</source>
-        <translation type="obsolete">Isch hadde eschendlich nur een Bassword erwarded.</translation>
+        <location filename="../www/inc/classes/order.php" line="614"/>
+        <source>Expected positive amount.</source>
+        <translation>Wenn&apos;de mir sachst wieviel&apos;s sein soll, dann versuch mich ni zu verarschen: s&apos; muss schon &apos;ne bosidive Zahl sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="550"/>
-        <source>cannot set an empty password</source>
-        <translation type="obsolete">Also ganns so eefach isses ned: Du mussd schon äweng in das neie Bassword eindrachen.</translation>
+        <location filename="../www/inc/classes/order.php" line="623"/>
+        <source>Order does not exist.</source>
+        <translation>Beschdellung gibsd ni. Wirschlich ni. Bionierärenword.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="236"/>
-        <source>Ooops. Unable to find user. You have been deleted.</source>
-        <translation type="obsolete">Nanu. Dei Nudsoreindrach is fudsch. Jemand had&apos;sch gelöschd.</translation>
+        <location filename="../www/inc/classes/order.php" line="629"/>
+        <source>Order cannot be changed, it is closed.</source>
+        <translation>De Beschdellung gansch jedsd ni mehr ändern. Ärsdens is gleisch Feierahmd und zweed&apos;ns is die schon geschloss&apos;n.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="241"/>
-        <source>Wrong password. Session hijacked, terminating it.</source>
-        <translation type="obsolete">Falsches Bassword. Du bissd wahrscheinlich a böser Birad. Geh wech!</translation>
+        <location filename="../www/inc/classes/order.php" line="671"/>
+        <source>Order ID must be numeric.</source>
+        <translation>Du hör ma! Das heesd Beschdellnummer weils &apos;ne Nummer sein soll, ni weil&apos;de Göthe zidiern sollsd.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="373"/>
-        <source>invalid user name</source>
-        <translation type="obsolete">Falscher Nudsorname.</translation>
+        <location filename="../www/inc/classes/order.php" line="681"/>
+        <source>Order ID is invalid.</source>
+        <translation>Ungüldsche Beschdellnummer</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="333"/>
-        <source>expected exactly 1 ACL element</source>
-        <translation type="obsolete">Isch hab nur een ACL elemend erwarded. Nu hammern Salad, isch wees ned welsches.</translation>
+        <location filename="../www/inc/classes/order.php" line="662"/>
+        <source>Wrong state, cannot set order to shipped.</source>
+        <translation>De Beschdellung gann ni weggeschiggd werden. Bungd.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="431"/>
-        <source>unknown user name</source>
-        <translation type="obsolete">Unbegannder Nudsorname. Findsde das ni&apos; ooch Misd?</translation>
+        <location filename="../www/inc/classes/order.php" line="687"/>
+        <source>Wrong state, cannot set order to cancelled.</source>
+        <translation>De Beschdellung gann ni abgebrochn werden. Bungd.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="415"/>
-        <source>expected exactly 1 Hosts element</source>
-        <translation type="obsolete">Isch hab nur een Host Elemend erwarded. Mach ma rischdsch.</translation>
+        <location filename="../www/inc/classes/order.php" line="698"/>
+        <source>Ticket not found.</source>
+        <translation>Garde nisch gefunden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="555"/>
-        <source>Unable to change this password.</source>
-        <translation type="obsolete">Isch gann das Bassword &apos;ne ändern.</translation>
+        <location filename="../www/inc/classes/order.php" line="702"/>
+        <source>Ticket has no order.</source>
+        <translation>Garde had geene Beschdellung. Seid wann machn&apos; worn sowas?</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>setmypasswd</source>
-        <translation type="obsolete">Des eechne Bassword ändorn.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="201"/>
+        <source>The ticket is not valid.</source>
+        <translation>De Garde is nisch güldsch. Wollmor uns widder einschmuggeln - hä?</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
-        <source>setpasswd</source>
-        <translation type="obsolete">Des Bassword von jemand gans andors ändorn.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="205"/>
+        <source>The ticket has already been used.</source>
+        <translation>De Garde wurde schonma benudsd. Mir sin&apos; hier nisch bei &quot;Nimm Zwei&quot;!</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
-        <source>Invalid Request, please use the MagicSmoke Client with this page.</source>
-        <translation type="obsolete">Da iss was gabudd mit Deim Brogramm, Du mussd schon &apos;s rischdsche nehm.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="209"/>
+        <source>The ticket has not been bought or is cancelled.</source>
+        <translation>De Garde wurde nisch gegaufd oder wurde schon zurüggegeben. So ni!</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="85"/>
-        <source>Invalid or missing sessionid, or session timed out.</source>
-        <translation type="obsolete">De Seschion gehd nimmer.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="214"/>
+        <source>The ticket has not been paid.</source>
+        <translation>De Garde is nisch bezahlt! Kohle her oder zu Hause blei&apos;m!</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="97"/>
-        <source>Session not yet authenticated.</source>
-        <translation type="obsolete">De Seschion gann noch ned benudsd werden. Du mussd schon alle Zeddl ausfüllen bevor isch Disch reenlass.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="218"/>
+        <source>The tickets order is in an invalid state or does not exist.</source>
+        <translation>De Beschdellung von dor Garde is ungüldsch! Das müssmer ersdma scheggn eh der rein darf!</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="109"/>
-        <source>You do not have the right to execute this transaction.</source>
-        <translation type="obsolete">Des darfsde nisch. Da mussde den Baba Adminischdrador frachn.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="290"/>
+        <source>Unable to find this ticket.</source>
+        <translation>Gann de Garde ni finden. War&apos;s vielleischd ä Gassenzeddel?</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="344"/>
-        <source>Internal Error: unknown command, hiccup in code structure.</source>
-        <translation type="obsolete">Isch hab da een Broblem. Irschendwie gibsd das Gommando nur halb, aber och ni&apos; rischdisch. Frach ma&apos; den Brogrammierer.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="260"/>
+        <source>Price must be a number.</source>
+        <translation>Also wär schon schön, wenn dor Breis irschendwie Zahlenähnlisch wär.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="257"/>
-        <source>Unknown Customer</source>
-        <translation type="obsolete">Unbegannder Gunde. Da iss was schiefgelaufn.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="265"/>
+        <source>Price must be positive.</source>
+        <translation>Mir sind hier nisch beim Loddo. Breise sind größer als Null.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="269"/>
-        <source>Unable to parse XML.</source>
-        <translation type="obsolete">Gann des XML nisch vorschdehn.</translation>
+        <location filename="../www/inc/classes/ticket.php" line="295"/>
+        <source>Ticket cannot be returned.</source>
+        <translation>Garde gann nisch zurüggegeben werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="33"/>
-        <source>Template File not found in database</source>
-        <translation type="obsolete">De Vorlache gibsd ned in dor Dadenbank.</translation>
+        <location filename="../www/inc/machine/session.php" line="519"/>
+        <source>Syntax Error</source>
+        <translation>Syntaxfehler... ...&quot;Südagsfählor&quot; - isch glob&apos; das is wenn mor sisch vergwasslt.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="44"/>
-        <source>Unable to find file name</source>
-        <translation type="obsolete">De Dadai gibsd ned.</translation>
+        <location filename="../www/inc/machine/session.php" line="537"/>
+        <source>Cannot remove user: DB error while deleting ACL.</source>
+        <translation>Gann den Nudsor nisch löschen: de&apos; Dadenbank will de Zugriffsreschde ni&apos; löschn. Is hald och nur&apos;n Mensch.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="52"/>
-        <source>Illegal File Name</source>
-        <translation type="obsolete">De Dadai is nich erlaubd. Du mussd Disch schon an de Gonvendsion halden.</translation>
+        <location filename="../www/inc/machine/session.php" line="546"/>
+        <source>Cannot remove user: unable to replace user.</source>
+        <translation>Gann den Nudsor nisch löschen: gann de zwee&apos;e ni verdauschen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
-        <source>getcustomer</source>
-        <translation type="obsolete">Gunde abfrachen.</translation>
+        <location filename="../www/inc/machine/session.php" line="559"/>
+        <source>Cannot remove user: DB error while deleting user.</source>
+        <translation>Gann den Nudsor nisch löschen: de&apos; Dadenbank will&apos;n ni&apos; löschn. Is hald och nur&apos;n Mensch.</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="25"/>
-        <source>setcustomer</source>
-        <translation type="obsolete">Gunde anlechen oder ändorn.</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>checkorder</source>
-        <translation type="obsolete">Ma guggn ob ne Beschdellung gehen würde.</translation>
+        <source>deletecustomer</source>
+        <translation>Gunde löschen</translation>
     </message>
     <message>
         <location filename="../www/machine.php" line="26"/>
-        <source>createorder</source>
-        <translation type="obsolete">Ne Beschdellung anlegn.</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="26"/>
-        <source>createsale</source>
-        <translation type="obsolete">Was vorkofen.</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="28"/>
-        <source>gettemplatelist</source>
-        <translation type="obsolete">Vorlachenlisde anguggen.</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="28"/>
-        <source>gettemplate</source>
-        <translation type="obsolete">Vorlache runderladen.</translation>
-    </message>
-    <message>
-        <location filename="../www/machine.php" line="29"/>
-        <source>settemplate</source>
-        <translation type="obsolete">Vorlache erschdellen.</translation>
+        <source>setordercomment</source>
+        <translation>Dummen Schbruch in dor Beschdellung ändorn</translation>
     </message>
 </context>
 <context>
@@ -662,47 +570,47 @@
 <context>
     <name>MCustomerDialog</name>
     <message>
-        <location filename="customer.cpp" line="306"/>
+        <location filename="customer.cpp" line="351"/>
         <source>Customer %1</source>
         <translation>Gunde %1</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="308"/>
+        <location filename="customer.cpp" line="353"/>
         <source>New Customer</source>
         <translation>Neier Gunde</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="314"/>
+        <location filename="customer.cpp" line="359"/>
         <source>Name:</source>
         <translation>Dor Name:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="316"/>
+        <location filename="customer.cpp" line="361"/>
         <source>Address:</source>
         <translation>De Adresse:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="319"/>
+        <location filename="customer.cpp" line="364"/>
         <source>Contact Information:</source>
         <translation>Wie mor den erreischen gann:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="323"/>
+        <location filename="customer.cpp" line="368"/>
         <source>Web-Login/eMail:</source>
         <translation>Wie er sisch im Web anmelden gann:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="326"/>
+        <location filename="customer.cpp" line="371"/>
         <source>Comment:</source>
         <translation>Gommendar:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="334"/>
+        <location filename="customer.cpp" line="379"/>
         <source>Save</source>
         <translation>Schbeichorn</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="337"/>
+        <location filename="customer.cpp" line="382"/>
         <source>Cancel</source>
         <translation>Doch ni&apos; machen</translation>
     </message>
@@ -710,76 +618,116 @@
 <context>
     <name>MCustomerListDialog</name>
     <message>
-        <location filename="customer.cpp" line="194"/>
+        <location filename="customer.cpp" line="197"/>
         <source>Select a Customer</source>
         <translation>Gunde auswählen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="196"/>
+        <location filename="customer.cpp" line="199"/>
         <source>Customers</source>
         <translation>Gunden</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="208"/>
+        <location filename="customer.cpp" line="211"/>
         <source>Details...</source>
         <translation>Dedails anzeichen...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="210"/>
+        <location filename="customer.cpp" line="213"/>
         <source>Create new...</source>
         <translation>Neuen anlechen...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="212"/>
+        <location filename="customer.cpp" line="216"/>
         <source>Delete...</source>
         <translation>Wechschmeißen...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="220"/>
+        <location filename="customer.cpp" line="224"/>
         <source>Select</source>
         <translation>Auswählen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="223"/>
+        <location filename="customer.cpp" line="227"/>
         <source>Cancel</source>
         <translation>Mach ma ni&apos;</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="226"/>
+        <location filename="customer.cpp" line="230"/>
         <source>Close</source>
         <translation>Zumachn</translation>
     </message>
+    <message>
+        <location filename="customer.cpp" line="301"/>
+        <source>Delete Customer</source>
+        <translation>Gunden Löschn</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="304"/>
+        <source>Really delete this customer (%1)?</source>
+        <translation>Willsde den Gunden wirschlich löschen? Has&apos;de Dir das och gud üborleschd? Das ist dor %1.</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="307"/>
+        <source>merge with other entry:</source>
+        <translation>Mid &apos;nem andorn Eindrag zusamm&apos;lechn:</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="319"/>
+        <source>&amp;Yes</source>
+        <translation>&amp;Nu glar!</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="321"/>
+        <source>&amp;No</source>
+        <translation>Nee &amp;Lass ma!</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="337"/>
+        <source>Error</source>
+        <translation>Gans doller falschor Fehler</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="333"/>
+        <source>Failed to delete customer.</source>
+        <translation>Gann den Gunden ni löschen. Gomm&apos;se morchen nochma&apos;.</translation>
+    </message>
+    <message>
+        <location filename="customer.cpp" line="337"/>
+        <source>Failed to delete customer: %1</source>
+        <translation>Gann den Gunden &quot;%1&quot; ni löschen. Gomm&apos;se morchen nochma&apos;.</translation>
+    </message>
 </context>
 <context>
     <name>MEvent</name>
     <message>
-        <location filename="event.cpp" line="179"/>
+        <location filename="event.cpp" line="186"/>
         <source>Event is not complete, cannot save.</source>
         <translation>De Veranschdaldung is ni gombledd, das gansch so ni abschiggn.</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="224"/>
+        <location filename="event.cpp" line="231"/>
         <source>[0-9]+\.[0-9]{2}</source>
         <comment>price validator regexp</comment>
         <translation>[0-9]+,[0-9]{2}</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="247"/>
+        <location filename="event.cpp" line="254"/>
         <source>.</source>
         <comment>price decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="266"/>
+        <location filename="event.cpp" line="273"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
-        <translation type="unfinished"></translation>
+        <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="261"/>
+        <location filename="event.cpp" line="268"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
-        <translation type="unfinished"></translation>
+        <translation>d.M.yyyy</translation>
     </message>
 </context>
 <context>
@@ -838,7 +786,7 @@
     <message>
         <location filename="eventedit.cpp" line="108"/>
         <source>Event Cancelled:</source>
-        <translation type="unfinished">Voranschaldung absachn:</translation>
+        <translation>Voranschaldung absachn:</translation>
     </message>
     <message>
         <location filename="eventedit.cpp" line="120"/>
@@ -895,112 +843,137 @@
     <message>
         <location filename="eventedit.cpp" line="53"/>
         <source>ID:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nummor:</translation>
     </message>
 </context>
 <context>
     <name>MEventSummary</name>
     <message>
-        <location filename="eventsummary.cpp" line="38"/>
+        <location filename="eventsummary.cpp" line="56"/>
         <source>Summary for Event %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zusamm&apos;fassung für de Veranschdaldung %1</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="44"/>
+        <location filename="eventsummary.cpp" line="66"/>
         <source>Title:</source>
-        <translation type="unfinished">Diddel:</translation>
+        <translation>Diddel:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="46"/>
+        <location filename="eventsummary.cpp" line="68"/>
         <source>Artist:</source>
-        <translation type="unfinished">Günsdlor:</translation>
+        <translation>Günsdlor:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="48"/>
+        <location filename="eventsummary.cpp" line="70"/>
         <source>Start:</source>
-        <translation type="unfinished"></translation>
+        <translation>Da gehds los:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="190"/>
+        <location filename="eventsummary.cpp" line="237"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>Date+Time format for displaying event start time</comment>
-        <translation type="unfinished"></translation>
+        <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="51"/>
+        <location filename="eventsummary.cpp" line="73"/>
         <source>Capacity:</source>
-        <translation type="unfinished">Magsimale Gäsde:</translation>
+        <translation>Magsimale Gäsde:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="53"/>
+        <location filename="eventsummary.cpp" line="75"/>
         <source>Tickets currently reserved:</source>
-        <translation type="unfinished"></translation>
+        <translation>Garden die resorvierd sind:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="55"/>
+        <location filename="eventsummary.cpp" line="77"/>
         <source>Tickets currently cancelled:</source>
-        <translation type="unfinished"></translation>
+        <translation>Garden die zurüggegeben wurd&apos;n:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="57"/>
+        <location filename="eventsummary.cpp" line="79"/>
         <source>Tickets currently usable:</source>
-        <translation type="unfinished"></translation>
+        <translation>Garden die genudsd werden gönn&apos;:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="59"/>
+        <location filename="eventsummary.cpp" line="81"/>
         <source>Total Income:</source>
-        <translation type="unfinished"></translation>
+        <translation>Summe dor Einnahm&apos;n:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="238"/>
+        <location filename="eventsummary.cpp" line="285"/>
         <source>.</source>
         <comment>decimal dot</comment>
-        <translation type="unfinished">,</translation>
+        <translation>,</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="92"/>
         <source>Price</source>
-        <translation type="unfinished"></translation>
+        <translation>Breis</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="92"/>
         <source>Bought</source>
-        <translation type="unfinished"></translation>
+        <translation>Gegaufd</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="92"/>
         <source>Used</source>
-        <translation type="unfinished"></translation>
+        <translation>Benudsd</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="70"/>
+        <location filename="eventsummary.cpp" line="92"/>
         <source>Unused</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbenudsd</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="86"/>
+        <location filename="eventsummary.cpp" line="122"/>
         <source>Print</source>
-        <translation type="unfinished"></translation>
+        <translation>Druggn</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="88"/>
+        <location filename="eventsummary.cpp" line="124"/>
         <source>Save as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Schbeichorn undor...</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="91"/>
+        <location filename="eventsummary.cpp" line="127"/>
         <source>Close</source>
-        <translation type="unfinished">Zumachn</translation>
+        <translation>Zumachn</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="159"/>
+        <location filename="eventsummary.cpp" line="206"/>
         <source>Warning</source>
-        <translation type="unfinished">Dumm gelaufen</translation>
+        <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="159"/>
+        <location filename="eventsummary.cpp" line="206"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Vorlache (eventsummary.odtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="62"/>
+        <source>Summary</source>
+        <translation>Zusamm&apos;fassung</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="87"/>
+        <source>Tickets</source>
+        <translation>Garden</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="104"/>
+        <source>Comments</source>
+        <translation>Gommendare</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="110"/>
+        <source>Order: </source>
+        <translation>Beschdellung:</translation>
+    </message>
+    <message>
+        <location filename="eventsummary.cpp" line="112"/>
+        <source>Customer: </source>
+        <translation>Gunde:</translation>
     </message>
 </context>
 <context>
@@ -1038,63 +1011,68 @@ At least %1 Bits of random are required.</source>
     <message>
         <location filename="labeldlg.cpp" line="40"/>
         <source>Label Printing Setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufglebordruggeinschdellung</translation>
     </message>
     <message>
         <location filename="labeldlg.cpp" line="49"/>
         <source>mm</source>
         <comment>defaultmetric: mm, in, cm</comment>
-        <translation type="unfinished"></translation>
+        <translation>mm</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="74"/>
+        <location filename="labeldlg.cpp" line="75"/>
         <source>Label offset:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufgleborabschdand:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="80"/>
+        <location filename="labeldlg.cpp" line="81"/>
         <source>Label size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufgleborgröße:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="86"/>
+        <location filename="labeldlg.cpp" line="87"/>
         <source>Unit:</source>
-        <translation type="unfinished"></translation>
+        <translation>Einheid:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="88"/>
+        <location filename="labeldlg.cpp" line="89"/>
         <source>Millimeter</source>
-        <translation type="unfinished"></translation>
+        <translation>Millimedor</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="89"/>
+        <location filename="labeldlg.cpp" line="90"/>
         <source>Centimeter</source>
-        <translation type="unfinished"></translation>
+        <translation>Sendimedor</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="90"/>
+        <location filename="labeldlg.cpp" line="91"/>
         <source>Inch</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoll (Insch)</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="94"/>
+        <location filename="labeldlg.cpp" line="99"/>
         <source>Page usage:</source>
-        <translation type="unfinished"></translation>
+        <translation>Seidennudsung:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="97"/>
+        <location filename="labeldlg.cpp" line="102"/>
         <source>Page %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Seide %1</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="141"/>
+        <location filename="labeldlg.cpp" line="146"/>
         <source>Ok</source>
-        <translation type="unfinished">Is gud so.</translation>
+        <translation>Is gud so.</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="145"/>
+        <location filename="labeldlg.cpp" line="150"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbreschn</translation>
+    </message>
+    <message>
+        <location filename="labeldlg.cpp" line="303"/>
+        <source>Warning: the label may not fit on the page!</source>
+        <translation>Warnung: es gann undor Umschdänd&apos;n bassiern dass dor Aufglebor ni gans off de Seide bassd!</translation>
     </message>
 </context>
 <context>
@@ -1286,366 +1264,386 @@ At least %1 Bits of random are required.</source>
         <location filename="order.cpp" line="112"/>
         <source>placed</source>
         <comment>state</comment>
-        <translation type="unfinished"></translation>
+        <translation>bladsierd</translation>
     </message>
     <message>
         <location filename="order.cpp" line="113"/>
         <source>sent</source>
         <comment>state</comment>
-        <translation type="unfinished"></translation>
+        <translation>abgeschiggd</translation>
     </message>
     <message>
         <location filename="order.cpp" line="114"/>
         <source>cancelled</source>
         <comment>state</comment>
-        <translation type="unfinished"></translation>
+        <translation>abgebroch&apos;n</translation>
     </message>
     <message>
         <location filename="order.cpp" line="115"/>
         <source>closed</source>
         <comment>state</comment>
-        <translation type="unfinished"></translation>
+        <translation>geschlossn</translation>
     </message>
     <message>
         <location filename="order.cpp" line="116"/>
         <source>check: ok</source>
         <comment>state</comment>
-        <translation type="unfinished"></translation>
+        <translation>Brüfung: is gud so</translation>
     </message>
     <message>
         <location filename="order.cpp" line="117"/>
         <source>check: sale only</source>
         <comment>state</comment>
-        <translation type="unfinished"></translation>
+        <translation>Brüfung: nur zum Vergauf</translation>
     </message>
     <message>
         <location filename="order.cpp" line="118"/>
         <source>check: order only</source>
         <comment>state</comment>
-        <translation type="unfinished"></translation>
+        <translation>Brüfung: nur zur Beschdellung</translation>
     </message>
     <message>
         <location filename="order.cpp" line="119"/>
         <source>check: failed</source>
         <comment>state</comment>
-        <translation type="unfinished"></translation>
+        <translation>Brüfung: gehd ni. Wirschlich ni.</translation>
     </message>
     <message>
         <location filename="order.cpp" line="120"/>
         <source>invalid</source>
         <comment>state</comment>
-        <translation type="unfinished"></translation>
+        <translation>ungüldsch</translation>
     </message>
     <message>
         <location filename="order.cpp" line="147"/>
         <source>.</source>
         <comment>decimal dot</comment>
-        <translation type="unfinished">,</translation>
+        <translation>,</translation>
     </message>
     <message>
         <location filename="order.cpp" line="329"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
-        <translation type="unfinished"></translation>
+        <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
         <location filename="order.cpp" line="342"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
-        <translation type="unfinished"></translation>
+        <translation>d.M.yyyy</translation>
     </message>
     <message>
         <location filename="order.cpp" line="397"/>
         <source>This ticket is not part of this order.</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde gehörd ni zu dor Beschdellung. Da mussde was vorwegseld ham!</translation>
     </message>
     <message>
         <location filename="order.cpp" line="431"/>
         <source>Error</source>
-        <translation type="unfinished">Gans doller falschor Fehler</translation>
+        <translation>Gans doller falschor Fehler</translation>
     </message>
     <message>
         <location filename="order.cpp" line="427"/>
         <source>The request failed.</source>
-        <translation type="unfinished">De Anfrache is schiefgegangen.</translation>
+        <translation>De Anfrache is schiefgegangen.</translation>
     </message>
     <message>
         <location filename="order.cpp" line="431"/>
         <source>A problem occurred during the order: %1</source>
-        <translation type="unfinished">Isch hadde nen Broblem mit dor Beschdellung: %1</translation>
+        <translation>Isch hadde nen Broblem mit dor Beschdellung: %1</translation>
     </message>
 </context>
 <context>
     <name>MOrderWindow</name>
     <message>
-        <location filename="orderwin.cpp" line="42"/>
+        <location filename="orderwin.cpp" line="43"/>
         <source>Order Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdelldedails</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="47"/>
+        <location filename="orderwin.cpp" line="48"/>
         <source>&amp;Order</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Beschdellen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="48"/>
+        <location filename="orderwin.cpp" line="49"/>
         <source>&amp;Order...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Beschdellen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="50"/>
+        <location filename="orderwin.cpp" line="51"/>
         <source>&amp;Sell...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vorgofen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="53"/>
+        <location filename="orderwin.cpp" line="54"/>
         <source>C&amp;ancel Order...</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellung &amp;abbreschn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="63"/>
+        <location filename="orderwin.cpp" line="66"/>
         <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Schließen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="64"/>
+        <location filename="orderwin.cpp" line="67"/>
         <source>&amp;Payment</source>
-        <translation type="unfinished"></translation>
+        <translation>Bed&amp;sahlung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="66"/>
+        <location filename="orderwin.cpp" line="69"/>
         <source>Receive &amp;Payment...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bedsahln...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="68"/>
+        <location filename="orderwin.cpp" line="71"/>
         <source>&amp;Refund...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zurüggeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="70"/>
+        <location filename="orderwin.cpp" line="73"/>
         <source>P&amp;rinting</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Druggn</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="72"/>
+        <location filename="orderwin.cpp" line="75"/>
         <source>Print &amp;Bill...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Reschnung druggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="73"/>
+        <location filename="orderwin.cpp" line="76"/>
         <source>Save Bill &amp;as file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Reschnung als Dadai &amp;schbeichorn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="75"/>
+        <location filename="orderwin.cpp" line="78"/>
         <source>Print &amp;Tickets...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Garden druggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="76"/>
+        <location filename="orderwin.cpp" line="79"/>
         <source>Print &amp;Current Ticket...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;agduelle Garde druggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="77"/>
+        <location filename="orderwin.cpp" line="80"/>
         <source>&amp;View Tickets...</source>
-        <translation type="unfinished"></translation>
+        <translation>Gar&amp;den anguggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="88"/>
+        <location filename="orderwin.cpp" line="91"/>
         <source>Order ID:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellnummer:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="90"/>
+        <location filename="orderwin.cpp" line="93"/>
         <source>Order Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdelldadum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="92"/>
+        <location filename="orderwin.cpp" line="95"/>
         <source>Shipping Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Versanddadum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="94"/>
+        <location filename="orderwin.cpp" line="97"/>
         <source>Customer:</source>
-        <translation type="unfinished">Gunde:</translation>
+        <translation>Gunde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="99"/>
+        <location filename="orderwin.cpp" line="102"/>
         <source>Sold by:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vergaufd von:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="101"/>
+        <location filename="orderwin.cpp" line="104"/>
         <source>Total Price:</source>
-        <translation type="unfinished"></translation>
+        <translation>Endvorbraucherbreis:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="103"/>
+        <location filename="orderwin.cpp" line="106"/>
         <source>Already Paid:</source>
-        <translation type="unfinished"></translation>
+        <translation>Schon bedsahld:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="105"/>
+        <location filename="orderwin.cpp" line="108"/>
         <source>Order State:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellschdadus:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="orderwin.cpp" line="141"/>
         <source>Ticket ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Gardennummer</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="orderwin.cpp" line="141"/>
         <source>Event</source>
-        <translation type="unfinished"></translation>
+        <translation>Veranschdaldung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="orderwin.cpp" line="141"/>
         <source>Start Time</source>
-        <translation type="unfinished">Anfangszeit</translation>
+        <translation>Anfangszeit</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="orderwin.cpp" line="141"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Schdadus</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="orderwin.cpp" line="141"/>
         <source>Price</source>
-        <translation type="unfinished"></translation>
+        <translation>Breis</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="55"/>
+        <location filename="orderwin.cpp" line="56"/>
         <source>&amp;Mark Order as Shipped...</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellung is weschgeschiggd...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="58"/>
+        <location filename="orderwin.cpp" line="59"/>
         <source>Ch&amp;ange Ticket-Price...</source>
-        <translation type="unfinished"></translation>
+        <translation>Gardenbreis ändorn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="60"/>
+        <location filename="orderwin.cpp" line="61"/>
         <source>&amp;Return Ticket...</source>
-        <translation type="unfinished"></translation>
+        <translation>Garde zurüggeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="449"/>
+        <location filename="orderwin.cpp" line="452"/>
         <source>Warning</source>
-        <translation type="unfinished">Dumm gelaufen</translation>
+        <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="205"/>
+        <location filename="orderwin.cpp" line="208"/>
         <source>Unable to get template file (ticket.xtt). Giving up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Vorlache (ticket.xtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="233"/>
+        <location filename="orderwin.cpp" line="236"/>
         <source>Unable to get template file (bill.odtt). Giving up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Vorlache (bill.xtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="475"/>
+        <location filename="orderwin.cpp" line="478"/>
         <source>Mark as shipped?</source>
-        <translation type="unfinished"></translation>
+        <translation>Als wechgeschiggd margieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="475"/>
+        <location filename="orderwin.cpp" line="478"/>
         <source>Mark this order as shipped now?</source>
-        <translation type="unfinished"></translation>
+        <translation>Als wechgeschiggd margieren? Also jedsd. Rischdisch weg? Beim Gunden?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="256"/>
+        <location filename="orderwin.cpp" line="259"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Vorlache (eventsummary.odtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="342"/>
+        <location filename="orderwin.cpp" line="345"/>
         <source>Enter Payment</source>
-        <translation type="unfinished"></translation>
+        <translation>Geldbedrach eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="342"/>
+        <location filename="orderwin.cpp" line="345"/>
         <source>Please enter the amount that has been paid:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bidde den Bedrach eingebn der bedsahld wurde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="349"/>
+        <location filename="orderwin.cpp" line="352"/>
         <source>Unable to submit payment request.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Bedsahlung nisch schbeischorn. De Gommunisdn wolln das Neds vom Geld frei haldn.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="353"/>
-        <source>Error whily trying to pay: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="orderwin.cpp" line="356"/>
+        <source>Error while trying to pay: %1</source>
+        <translation>&apos;S is bleede, abor da war&apos;n Fehlor beim bedsahln: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="401"/>
+        <location filename="orderwin.cpp" line="404"/>
         <source>Enter Refund</source>
-        <translation type="unfinished"></translation>
+        <translation>Rügggabe eingäben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="401"/>
+        <location filename="orderwin.cpp" line="404"/>
         <source>Please enter the amount that will be refunded:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bidde den Bedrach eingebn der zurüggegebn wurde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="372"/>
+        <location filename="orderwin.cpp" line="375"/>
         <source>Unable to submit refund request.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Rügggabe nisch schbeischorn. De Bankengriese hadd uns wiedor.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="376"/>
+        <location filename="orderwin.cpp" line="379"/>
         <source>Error whily trying to refund: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;S is bleede, abor da war&apos;n Fehlor beim zurüggeben: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="429"/>
+        <location filename="orderwin.cpp" line="432"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde gannsch ni zurügnehm. Die wurde schonma benudsd oder so.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="433"/>
+        <location filename="orderwin.cpp" line="436"/>
         <source>Return Ticket</source>
-        <translation type="unfinished"></translation>
+        <translation>Garde zurüggeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="433"/>
+        <location filename="orderwin.cpp" line="436"/>
         <source>Do you really want to return this ticket?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wolln&apos;se de Garde wirschlisch zurüggeben? S&apos;wär schade drum.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="443"/>
+        <location filename="orderwin.cpp" line="446"/>
         <source>Cancel Order?</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellung abbreschn?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="443"/>
+        <location filename="orderwin.cpp" line="446"/>
         <source>Cancel this order now?</source>
-        <translation type="unfinished"></translation>
+        <translation>De Beschdellung jedsd wirschlich abbreschn? S&apos;gibd dann kee zurüg mehr - also ni rumheuln!</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="445"/>
+        <location filename="orderwin.cpp" line="448"/>
         <source>Cannot cancel this order: it is in the wrong state.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Beschdellung ni abbreschn: die hadd wie&apos;n bissl &apos;n falschn Schdadus.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="449"/>
+        <location filename="orderwin.cpp" line="452"/>
         <source>Failed to cancel this order.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Beschdellung ni abbreschn.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="96"/>
+        <location filename="orderwin.cpp" line="99"/>
         <source>Delivery Address:</source>
-        <translation type="unfinished">Adresse wo&apos;s Zeuch hin soll:</translation>
+        <translation>Adresse wo&apos;s Zeuch hin soll:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="107"/>
+        <location filename="orderwin.cpp" line="110"/>
         <source>Order Comment:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellgommendar:</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="63"/>
+        <source>Change Commen&amp;t...</source>
+        <translation>Gommendar ändorn...</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="490"/>
+        <source>Set comment: order %1</source>
+        <translation>Gommendar ändorn: Beschdellung %1</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="501"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Schbeichorn</translation>
+    </message>
+    <message>
+        <location filename="orderwin.cpp" line="503"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Nee lass mal.</translation>
     </message>
 </context>
 <context>
@@ -1676,22 +1674,17 @@ At least %1 Bits of random are required.</source>
         <translation>&amp;Gunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="81"/>
-        <source>C&amp;onfigure</source>
-        <translation type="obsolete">G&amp;onfiguriern</translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="94"/>
         <source>Events</source>
         <translation>Veranschdaldungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1135"/>
+        <location filename="overview.cpp" line="1142"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="346"/>
+        <location filename="overview.cpp" line="349"/>
         <source>I was unable to renew the login at the server, the error was: %1</source>
         <translation>Isch gann de&apos; Verbindung off&apos;n gross&apos;n Reschner nisch erneuern. Der will nisch weil: %1</translation>
     </message>
@@ -1701,11 +1694,6 @@ At least %1 Bits of random are required.</source>
         <translation>&amp;Ohne Neds und Dobbelden Boden</translation>
     </message>
     <message>
-        <location filename="" line="6065"/>
-        <source>&amp;Show details...</source>
-        <translation type="obsolete">&amp;Dedails anzeigen...</translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="69"/>
         <source>&amp;New Event...</source>
         <translation>Veranschdaldung &amp;absach&apos;n...</translation>
@@ -1741,11 +1729,6 @@ At least %1 Bits of random are required.</source>
         <translation>&amp;Eingauf Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="79"/>
-        <source>&amp;Show all orders</source>
-        <translation type="obsolete">&amp;Alle Beschdellungen anzeichen</translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="104"/>
         <source>New Event...</source>
         <translation>Neue Veranschdaldung...</translation>
@@ -1796,22 +1779,17 @@ At least %1 Bits of random are required.</source>
         <translation>Wischdiches Gelaber und Gerede:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="125"/>
-        <source>Save Order</source>
-        <translation type="obsolete">Beschdellung abschbeichern</translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="167"/>
         <source>Clear</source>
         <translation>Wechwerfen und von vorne!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="721"/>
+        <location filename="overview.cpp" line="730"/>
         <source>Start Time</source>
         <translation>Anfangszeit</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="721"/>
+        <location filename="overview.cpp" line="730"/>
         <source>Title</source>
         <translation>Diddel</translation>
     </message>
@@ -1867,42 +1845,37 @@ At least %1 Bits of random are required.</source>
         <translation>Reschnor</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="408"/>
+        <location filename="overview.cpp" line="411"/>
         <source>Login Name</source>
         <translation>Name zum Anmelden</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="408"/>
+        <location filename="overview.cpp" line="411"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="423"/>
+        <location filename="overview.cpp" line="425"/>
         <source>New User</source>
         <translation>Neier Nudsor</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="423"/>
+        <location filename="overview.cpp" line="425"/>
         <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
         <translation>Bidde gib ma nen neien Nudsornam&apos; ein (nur Buchschdaben, Ziffern und &quot;_&quot;):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="838"/>
+        <location filename="overview.cpp" line="844"/>
         <source>Error</source>
         <translation>Gans doller falschor Fehler</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="413"/>
-        <source>The user name must contain only letters, digits, and underscores and must be at least one character long!</source>
-        <translation type="obsolete">Dor Nudsorname darf nur Buchschdaben, Ziffern und &quot;_&quot; endhalden. Umlaude sind böse. Und mindesdens een Buchschdaben lang mussor och sein.</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="463"/>
+        <location filename="overview.cpp" line="475"/>
         <source>Edit Description</source>
         <translation>Beschreibung ändorn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="463"/>
+        <location filename="overview.cpp" line="475"/>
         <source>Descriptionof user %1:</source>
         <translation>Beschreibung vom Nudsor %1:</translation>
     </message>
@@ -1947,127 +1920,127 @@ At least %1 Bits of random are required.</source>
         <translation>Eggsbordieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="432"/>
+        <location filename="overview.cpp" line="434"/>
         <source>Password</source>
         <translation>Bassword</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="432"/>
+        <location filename="overview.cpp" line="434"/>
         <source>Please enter an initial password for the user:</source>
         <translation>Bidde gib ma een Bassword für den Nudsor ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="447"/>
+        <location filename="overview.cpp" line="449"/>
         <source>Delete User?</source>
         <translation>Nudsor löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="447"/>
+        <location filename="overview.cpp" line="449"/>
         <source>Really delete user &apos;%1&apos;?</source>
         <translation>Nudsor &apos;%1&apos; wirklich löschen? Bissde Dir da och gans sischor?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="506"/>
+        <location filename="overview.cpp" line="518"/>
         <source>Error setting password: %1</source>
         <translation>Gann Bassword ni sedsen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="521"/>
+        <location filename="overview.cpp" line="533"/>
         <source>The password must be non-empty and both lines must match</source>
         <translation>Das Bassword darf nisch leer sein und beide Basswordzeilen müssen gleisch sein.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="537"/>
+        <location filename="overview.cpp" line="549"/>
         <source>Host Name</source>
         <translation>Reschnorname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="537"/>
+        <location filename="overview.cpp" line="549"/>
         <source>Host Key</source>
         <translation>Reschnorschlüssel</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="555"/>
+        <location filename="overview.cpp" line="566"/>
         <source>Create New Host</source>
         <translation>Neien Reschnor anlechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="555"/>
+        <location filename="overview.cpp" line="566"/>
         <source>Please enter a host name:</source>
         <translation>Gib ma nen Nam&apos; für de Gisde ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="563"/>
+        <location filename="overview.cpp" line="574"/>
         <source>The key of this new host could only be generated with %1 bits entropy. Store anyway?</source>
         <translation>Dor Schlüssel von der Gisde hat nur %1 zufällige Bids. Das is a bissl wenisch. Drodsdem schbeichorn?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="586"/>
+        <location filename="overview.cpp" line="597"/>
         <source>Delete this Host?</source>
         <translation>De Gisdge löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="586"/>
+        <location filename="overview.cpp" line="597"/>
         <source>Really delete host &apos;%1&apos;?</source>
         <translation>De Gisde &apos;%1&apos; wirklisch löschen? Bissde da och sischor?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="600"/>
+        <location filename="overview.cpp" line="611"/>
         <source>Change Host Key?</source>
         <translation>Den Schlüssel von dem Reschnor ändorn?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="600"/>
+        <location filename="overview.cpp" line="611"/>
         <source>Really change the key of host &apos;%1&apos;?</source>
         <translation>Wirglich den Schlüssel von dem Reschnor &apos;%1&apos; ändorn? Gans sischor?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="605"/>
+        <location filename="overview.cpp" line="616"/>
         <source>The new key of this host could only be generated with %1 bits entropy. Store anyway?</source>
         <translation>Dor Schlüssel von der Gisde hat nur %1 zufällige Bids. Das is a bissl wenisch. Drodsdem schbeichorn?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="616"/>
+        <location filename="overview.cpp" line="627"/>
         <source>Import Key from File</source>
         <translation>Schlüssel aus nor Dadai holen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="625"/>
+        <location filename="overview.cpp" line="636"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation>Gann de Dadai %1 nisch lesen. Des iss jedsd geene Ordografieschwäche, sondern: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="637"/>
+        <location filename="overview.cpp" line="648"/>
         <source>This is not a host key file.</source>
         <translation>Das is abor doch gar ge Schlüssel! Willsde misch verarschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="642"/>
+        <location filename="overview.cpp" line="653"/>
         <source>This host key file does not contain a valid host name.</source>
         <translation>De Schlüsseldadai had nen gans seldsamen Reschnornamen da drin. Desdorweschen gannsch die ni nehm.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="647"/>
+        <location filename="overview.cpp" line="658"/>
         <source>This host key file does not contain a valid key.</source>
         <translation>De Dadai is a bissl gabudd. Die mussde nochmal holen, ich gann die so ned lesen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="652"/>
+        <location filename="overview.cpp" line="663"/>
         <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
         <translation>Isch hab da ma nachgereschned. De Scheggsumme vom Schlüssel is falsch. Das gannsch Dir so ni abnehm.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="670"/>
+        <location filename="overview.cpp" line="681"/>
         <source>This host cannot be exported.</source>
         <translation>Den Reschnor gannsch ni schbeichorn.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="675"/>
+        <location filename="overview.cpp" line="686"/>
         <source>Export Key to File</source>
         <translation>Schlüssel als Dadei ablechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="684"/>
+        <location filename="overview.cpp" line="695"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation>Gann de Dadai %1 nicht zum Schreiben offmachen weil: %2</translation>
     </message>
@@ -2077,11 +2050,6 @@ At least %1 Bits of random are required.</source>
         <translation>Ne Beschdellung anlegn.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="157"/>
-        <source>Sell Items</source>
-        <translation type="obsolete">Vorkofen</translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="171"/>
         <source>Order List</source>
         <translation>Beschdelllisde</translation>
@@ -2112,62 +2080,42 @@ At least %1 Bits of random are required.</source>
         <translation>Wo was zurügerschdadded werden muss</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="169"/>
-        <source>Payment</source>
-        <translation type="obsolete">Bezahln</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="170"/>
-        <source>Refund</source>
-        <translation type="obsolete">Zurügerschdadden</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="172"/>
-        <source>Print Tickets</source>
-        <translation type="obsolete">Eindriddsgarde druggn</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="173"/>
-        <source>Print Bill</source>
-        <translation type="obsolete">Reschnung druggn</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="721"/>
+        <location filename="overview.cpp" line="730"/>
         <source>Amount</source>
         <translation>Anzahl</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="742"/>
+        <location filename="overview.cpp" line="751"/>
         <source>Select Event to order Ticket</source>
         <translation>Wähl ma ne Voranschdaldung aus um ne Garde zu beschdelln</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="756"/>
+        <location filename="overview.cpp" line="764"/>
         <source>Select</source>
         <translation>Auswähln</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1016"/>
+        <location filename="overview.cpp" line="1023"/>
         <source>Cancel</source>
         <translation>Ni machen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="794"/>
+        <location filename="overview.cpp" line="800"/>
         <source>There is nothing in the order. Ignoring it.</source>
         <translation>Da is doch gar nischd drin. Isch mach das jedsd ni!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="798"/>
+        <location filename="overview.cpp" line="804"/>
         <source>Please chose a customer first!</source>
         <translation>Du mussd schon nen Gunden auswähln, sonsd wees isch doch ni wer&apos;s griechen soll!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="834"/>
+        <location filename="overview.cpp" line="840"/>
         <source>The request failed.</source>
         <translation>De Anfrache is schiefgegangen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="838"/>
+        <location filename="overview.cpp" line="844"/>
         <source>A problem occurred during the order: %1</source>
         <translation>Isch hadde nen Broblem mit dor Beschdellung: %1</translation>
     </message>
@@ -2177,427 +2125,456 @@ At least %1 Bits of random are required.</source>
         <translation>Einlassgondrolle</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="832"/>
-        <source>Ticket Ok</source>
-        <translation type="obsolete">Eindriddsgarde is in Ordnung</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="836"/>
-        <source>Ticket Already Used</source>
-        <translation type="obsolete">Die habsch schonmal gesehn, da will eener bedrüchen.</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="840"/>
-        <source>Ticket Not Paid</source>
-        <translation type="obsolete">Eindriddsgarde is nisch bedsahld. Schiggn ma&apos; an de Gasse.</translation>
-    </message>
-    <message>
         <location filename="overview.cpp" line="115"/>
-        <source>Ticket Summary...</source>
-        <translation type="unfinished"></translation>
+        <source>Event Summary...</source>
+        <translation>Veranschdaldungszusammenfassung...</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="180"/>
         <source>Undelivered Orders</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschdellungen die noch ni ausgelieford sind</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="190"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Auffrischn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1073"/>
+        <location filename="overview.cpp" line="1080"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Schdadus</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1073"/>
+        <location filename="overview.cpp" line="1080"/>
         <source>Total</source>
-        <translation type="unfinished"></translation>
+        <translation>Summe</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1073"/>
+        <location filename="overview.cpp" line="1080"/>
         <source>Paid</source>
-        <translation type="unfinished"></translation>
+        <translation>Bedsahld</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1073"/>
+        <location filename="overview.cpp" line="1080"/>
         <source>Customer</source>
-        <translation type="unfinished"></translation>
+        <translation>Gunde</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="62"/>
         <source>&amp;Upload Template...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlache hochladn...</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="80"/>
         <source>&amp;Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorschiednes</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="81"/>
         <source>&amp;Return ticket...</source>
-        <translation type="unfinished"></translation>
+        <translation>Garde zurüggeben...</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="119"/>
         <source>Cancel Event...</source>
-        <translation type="unfinished"></translation>
+        <translation>Veranschdaldung absach&apos;n...</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="197"/>
         <source>Find by Ticket...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mit Garde finden...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="393"/>
+        <location filename="overview.cpp" line="396"/>
         <source>Cancel Event</source>
-        <translation type="unfinished"></translation>
+        <translation>Veranschdaldung absach&apos;n</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="393"/>
+        <location filename="overview.cpp" line="396"/>
         <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nu&apos; gib mir ma&apos;n rischdsch guden Grund warum Du de Veranschdaldung &quot;%1&quot; absachn willsd oder lass&apos;es sein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="396"/>
+        <location filename="overview.cpp" line="399"/>
         <source>Event Cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation>Veranschaldung abgesachd</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="396"/>
+        <location filename="overview.cpp" line="399"/>
         <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
-        <translation type="unfinished"></translation>
+        <translation>De Veranschdaldung &quot;%1&quot; wurde abgesacht. Bidde sorsch ma dafür dass och jedor Bescheid wees.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="398"/>
+        <location filename="overview.cpp" line="401"/>
         <source>Unable to cancel event &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Veranschdaldung &quot;%1&quot; ni absachn.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="886"/>
+        <location filename="overview.cpp" line="892"/>
         <source>Ticket &quot;%1&quot; Not Valid</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde &quot;%1&quot; is ni güldsch.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="890"/>
+        <location filename="overview.cpp" line="896"/>
         <source>Ticket &quot;%1&quot; has already been used</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde &quot;%1&quot; wurde schonma benudsd.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="894"/>
+        <location filename="overview.cpp" line="900"/>
         <source>Ticket &quot;%1&quot; has not been bought.</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde &quot;%1&quot; wurde ni gegauft.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="898"/>
+        <location filename="overview.cpp" line="904"/>
         <source>Ticket &quot;%1&quot; Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde &quot;%1&quot; is in Ordnung.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="903"/>
+        <location filename="overview.cpp" line="909"/>
         <source>Ticket &quot;%1&quot; Ok; the Order has a refund</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde &quot;%1&quot; is in Ordnung. Dor Gunde griggd sogar noch Geld zurüg.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="908"/>
+        <location filename="overview.cpp" line="914"/>
         <source>Ticket &quot;%1&quot; is not paid for!</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde &quot;%1&quot; is abor ni bedsahld!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="911"/>
+        <location filename="overview.cpp" line="917"/>
         <source>Ticket &quot;%1&quot; cannot be accepted, please check the order!</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde &quot;%1&quot; gönnmor so abor ni agsebdiern. Schegg ma&apos; de Beschdellung!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="976"/>
+        <location filename="overview.cpp" line="983"/>
         <source>Enter Ticket</source>
-        <translation type="unfinished"></translation>
+        <translation>Garde eingebn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="976"/>
+        <location filename="overview.cpp" line="983"/>
         <source>Please enter the ID of one of the tickets of the order you seek:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bidde gib de Gennung von nor Garde ein, die Du suchsd:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="980"/>
+        <location filename="overview.cpp" line="987"/>
         <source>Unable to query server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann den großen Reschnor im Neds ni erreischn. Da sin wo wiedor de Mäuse drin.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="989"/>
+        <location filename="overview.cpp" line="996"/>
         <source>Server returned an invalid order ID.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dor große Reschnor will misch verarschn: der gibd mir ne falsche Beschdellnummer.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1098"/>
+        <location filename="overview.cpp" line="1105"/>
         <source>Please select a template file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähl ma nen Vorlachennam&apos;n.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1105"/>
+        <location filename="overview.cpp" line="1112"/>
         <source>Enter Template Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlachennam&apos;n eingeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1105"/>
+        <location filename="overview.cpp" line="1112"/>
         <source>Please enter a name for the template file, it should contain only letters, digits, underscores and dots:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bidde gib ma nen neien Vorlachnnam&apos; ein (nur Buchschdaben, Ziffern, Bungde und &quot;_&quot;):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1108"/>
+        <location filename="overview.cpp" line="1115"/>
         <source>The template name must only contain letters, digits, underscores and dots.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nee. So ned. Du darfsd nur Buchschdaben, Zifforn, Bungde und &quot;_&quot; verwenden. Umlaude sind och nisch gud. Und es muss mid nem Buchschdaben anfangen. Is a bissl gomblizierd, aber Du schaffsd das schon!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1112"/>
+        <location filename="overview.cpp" line="1119"/>
         <source>Success</source>
-        <translation type="unfinished"></translation>
+        <translation>Heuregah! Erfolsch!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1112"/>
+        <location filename="overview.cpp" line="1119"/>
         <source>Successfully uploaded the template.</source>
-        <translation type="unfinished"></translation>
+        <translation>Isch graduliere! Dank unermüdlischer Arbeid im Gollegdief hammor de Vorlache erfolgreisch hochgeladn!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1114"/>
+        <location filename="overview.cpp" line="1121"/>
         <source>Unable to upload the template.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Vorlache ni hochladn. S&apos; lieschd vielleischd am Weddor.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1121"/>
+        <location filename="overview.cpp" line="1128"/>
         <source>Return Ticket</source>
-        <translation type="unfinished"></translation>
+        <translation>Garde zurüggeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1121"/>
+        <location filename="overview.cpp" line="1128"/>
         <source>Please enter the ticket ID to return:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte die Gennung von dor Garde eingeben die Se&apos; zurüggeben wolln:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1125"/>
+        <location filename="overview.cpp" line="1132"/>
         <source>This is not a valid ticket.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das is abor gehne güldsche Garde!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1130"/>
+        <location filename="overview.cpp" line="1137"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde gannsch ni zurügnehm. Die wurde schonma benudsd oder so.</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="83"/>
         <source>&amp;Admin</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Adminischdradsion</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="85"/>
         <source>&amp;Schedule Backup...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zeit für Sischerungsgobie fesdlechn...</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="86"/>
         <source>&amp;Backup now...</source>
-        <translation type="unfinished"></translation>
+        <translation>Jedsd &amp;Sischorungsgobie anleschn...</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="87"/>
         <source>&amp;Restore...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wiedorherschdelln...</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="182"/>
         <source>-search result-</source>
-        <translation type="unfinished"></translation>
+        <translation>-Suchräsuldahd-</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="200"/>
         <source>Find by Event...</source>
-        <translation type="unfinished"></translation>
+        <translation>Nach Veranschdaldung suchn...</translation>
     </message>
     <message>
         <location filename="overview.cpp" line="203"/>
         <source>Find by Customer...</source>
-        <translation type="unfinished"></translation>
+        <translation>Nach Gunde suchn...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="428"/>
+        <location filename="overview.cpp" line="430"/>
         <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nee. So ned. Du darfsd nur Buchschdaben, Zifforn, Bungde und &quot;_&quot; verwenden. Umlaude sind och nisch gud. Und es muss mid nem Buchschdaben anfangen. Is a bissl gomblizierd, aber Du schaffsd das schon!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1002"/>
+        <location filename="overview.cpp" line="1009"/>
         <source>Select Event</source>
-        <translation type="unfinished"></translation>
+        <translation>Veranschdaldung auswähln</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1014"/>
+        <location filename="overview.cpp" line="1021"/>
         <source>Ok</source>
-        <translation type="unfinished">Is gud so.</translation>
+        <translation>Is gud so.</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="318"/>
+        <source>Capacity</source>
+        <translation>Magsimale Gäsde</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="318"/>
+        <source>Sold</source>
+        <translation>Vergaufd</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="318"/>
+        <source>Reserved</source>
+        <translation>Resorvierd</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="318"/>
+        <source>Free</source>
+        <translation>Frei</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="453"/>
+        <source>(Nobody)</source>
+        <comment>this is a username for no user, the string must contain &apos;(&apos; to distinguish it from the others</comment>
+        <translation>(Gar Geener)</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="456"/>
+        <source>Delete User</source>
+        <translation>Nudsor Löschn</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="456"/>
+        <source>Select which user will inherit this users database objects:</source>
+        <translation>Such ma raus wer de Beschdellung&apos;n und so von dem Nudsor erbd:</translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="461"/>
+        <source>Cannot delete user: %1</source>
+        <translation>Gann den Nudsor ni löschn: %1</translation>
     </message>
 </context>
 <context>
     <name>MPasswordChange</name>
     <message>
-        <location filename="overview.cpp" line="1146"/>
+        <location filename="overview.cpp" line="1153"/>
         <source>Change my password</source>
         <translation>Mei eechnes Bassword ändorn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="910"/>
-        <source>Reset password of user %1</source>
-        <translation type="obsolete">Bassword vom Nudsor %1 zurügsedsen</translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="1152"/>
+        <location filename="overview.cpp" line="1159"/>
         <source>Old Password:</source>
         <translation>Aldes Bassword:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1156"/>
+        <location filename="overview.cpp" line="1163"/>
         <source>New Password:</source>
         <translation>Neies Bassword:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1159"/>
+        <location filename="overview.cpp" line="1166"/>
         <source>Repeat Password:</source>
         <translation>Nochma neies Bassword:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1167"/>
+        <location filename="overview.cpp" line="1174"/>
         <source>Set Password</source>
         <translation>Bassword sedsen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1169"/>
+        <location filename="overview.cpp" line="1176"/>
         <source>Cancel</source>
         <translation>Vorgisses, ni sedsen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1148"/>
+        <location filename="overview.cpp" line="1155"/>
         <source>Reset password of user &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Bassword von Nudsor &quot;%1&quot; zurügsedsen</translation>
     </message>
 </context>
 <context>
     <name>MTicket</name>
     <message>
-        <location filename="order.cpp" line="575"/>
+        <location filename="order.cpp" line="595"/>
         <source>.</source>
         <comment>decimal dot</comment>
-        <translation type="unfinished">,</translation>
+        <translation>,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="610"/>
+        <location filename="order.cpp" line="630"/>
         <source>bought</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>gegaufd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="611"/>
+        <location filename="order.cpp" line="631"/>
         <source>to refund</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>zurügzugebn</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="612"/>
+        <location filename="order.cpp" line="632"/>
         <source>used</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>benudsd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="613"/>
+        <location filename="order.cpp" line="633"/>
         <source>reserved</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>resorvierd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="614"/>
+        <location filename="order.cpp" line="634"/>
         <source>ok</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>nudsbar</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="615"/>
+        <location filename="order.cpp" line="635"/>
         <source>sale only</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>nur vergaufen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="616"/>
+        <location filename="order.cpp" line="636"/>
         <source>order only</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>nur beschdelln</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="617"/>
+        <location filename="order.cpp" line="637"/>
         <source>too late: event over</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>zu schbäd: de Veranschdaldung is schon vorbei</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="618"/>
+        <location filename="order.cpp" line="638"/>
         <source>no more tickets</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>geene Garden mehr übrisch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="619"/>
+        <location filename="order.cpp" line="639"/>
         <source>event cancelled</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>Veranschdaldung abgesachd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="620"/>
+        <location filename="order.cpp" line="640"/>
         <source>no such event</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>de Veranschdaldung egsisdierd nisch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="621"/>
+        <location filename="order.cpp" line="641"/>
         <source>invalid</source>
         <comment>ticket state</comment>
-        <translation type="unfinished"></translation>
+        <translation>ungüldsch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="640"/>
+        <location filename="order.cpp" line="660"/>
         <source>Cannot execute request.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Anfrache nisch ausführn. S&apos; is manschma gomisch.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="667"/>
+        <location filename="order.cpp" line="687"/>
         <source>Ticket is not stored, can&apos;t return it.</source>
-        <translation type="unfinished"></translation>
+        <translation>De Garde is ni geschbeichord, also gannsch se och ni zurüggeben.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="669"/>
+        <location filename="order.cpp" line="689"/>
         <source>Failed to execute request</source>
-        <translation type="unfinished"></translation>
+        <translation>Gann de Anfrache nisch ausführn. S&apos; is manschma gomisch.</translation>
     </message>
 </context>
 <context>
     <name>MTicketView</name>
     <message>
-        <location filename="orderwin.cpp" line="487"/>
+        <location filename="orderwin.cpp" line="518"/>
         <source>Preview Tickets</source>
-        <translation type="unfinished"></translation>
+        <translation>Garden anguggn.</translation>
+    </message>
+</context>
+<context>
+    <name>MUser</name>
+    <message>
+        <location filename="user.cpp" line="106"/>
+        <source>User not valid: cannot delete.</source>
+        <translation>Nudsor is ni güldsch: gann&apos; ni löschn.</translation>
     </message>
 </context>
 <context>
     <name>MUserHost</name>
     <message>
-        <location filename="user.cpp" line="303"/>
+        <location filename="user.cpp" line="308"/>
         <source>_any</source>
         <translation>Irschendeen Gombjudor</translation>
     </message>
     <message>
-        <location filename="user.cpp" line="303"/>
+        <location filename="user.cpp" line="308"/>
         <source>_online</source>
         <translation>De Webseidn</translation>
     </message>
     <message>
-        <location filename="user.cpp" line="303"/>
+        <location filename="user.cpp" line="308"/>
         <source>_anon</source>
         <translation>Annonühm</translation>
     </message>
@@ -2605,120 +2582,120 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MWebRequest</name>
     <message>
-        <location filename="webrequest.cpp" line="177"/>
+        <location filename="webrequest.cpp" line="179"/>
         <source>Unable to get server info.</source>
         <translation>Dor grosse Reschner will mir nischd über sisch sach&apos;n. Dummer Hund der.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="184"/>
+        <location filename="webrequest.cpp" line="186"/>
         <source>Error while parsing server info (line %1 col %2): %3</source>
         <translation>Isch gann den gross&apos;n Reschner nich verschdehn. Dor Fählor &quot;%3&quot; bassierd auf dor Dseile %1, Schbalde %2.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="189"/>
+        <location filename="webrequest.cpp" line="191"/>
         <source>Error in server info: missing authentication algorithm info.</source>
         <translation>Dor grosse Reschnor will mir nedd sach&apos;n wie mor offn&apos; droff gommd. Missd.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="194"/>
+        <location filename="webrequest.cpp" line="196"/>
         <source>The server requested an unsupported hash algorithm: %1.</source>
         <translation>Dor grosse Reschnor will &apos;ne Bereschnung von mir, die isch nedd gann: %1.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="200"/>
+        <location filename="webrequest.cpp" line="202"/>
         <source>Unable to get authentication challenge.</source>
         <translation>Dor grosse Reschnor reded nedd mit mir. Isch grich gehn &quot;Schällänsch&quot;.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="204"/>
+        <location filename="webrequest.cpp" line="206"/>
         <source>Error while parsing session challenge (line %1 col %2): %3</source>
         <translation>Isch gann den gross&apos;n Reschner nich verschdehn. Dor Fählor &quot;%3&quot; bassierd auf dor Dseile %1, Schbalde %2.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="210"/>
+        <location filename="webrequest.cpp" line="212"/>
         <source>Error in session challenge: missing session ID.</source>
         <translation>Fählor im &quot;Schällänsch&quot;: der had gehne &quot;Säschn-Ei-Dih&quot;.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="216"/>
+        <location filename="webrequest.cpp" line="218"/>
         <source>Error in session challenge: missing host challenge.</source>
         <translation>Fählor im &quot;Schällänsch&quot;: der had nischd fürn Gombjuder.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="222"/>
+        <location filename="webrequest.cpp" line="224"/>
         <source>Error in session challenge: missing user challenge.</source>
         <translation>Fählor im &quot;Schällänsch&quot;: der had nischd fürn Nudsor.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="248"/>
+        <location filename="webrequest.cpp" line="250"/>
         <source>Failed to log in: user/password mismatch, non-allowed host key, or challenge timed out.</source>
         <translation>Isch gann nisch offn&apos; grossen Reschnor. Das hadd zu lange gedauerd oder Du hasd&apos;sch vordibbd.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="252"/>
+        <location filename="webrequest.cpp" line="254"/>
         <source>Unable to authenticate.</source>
         <translation>Isch gann misch ned anmälden.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="344"/>
+        <location filename="webrequest.cpp" line="346"/>
         <source>Error parsing EventList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor EventList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="295"/>
+        <location filename="webrequest.cpp" line="297"/>
         <source>Cannot change password, old password does not match!</source>
         <translation>Gann Bassword ni&apos; ändorn, das alde war falsch!</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="368"/>
+        <location filename="webrequest.cpp" line="370"/>
         <source>Error parsing RoomList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor RoomList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="392"/>
+        <location filename="webrequest.cpp" line="394"/>
         <source>Error parsing UserList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor UserList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="416"/>
+        <location filename="webrequest.cpp" line="418"/>
         <source>Error parsing HostList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor HostList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="440"/>
+        <location filename="webrequest.cpp" line="442"/>
         <source>Error parsing CustomerList XML data (line %1 column %2): %3</source>
         <translation>Isch gann des XML von dor CustomerList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="491"/>
+        <location filename="webrequest.cpp" line="493"/>
         <source>Error parsing OrderList XML data (line %1 column %2): %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Isch gann des XML von dor OrderList ni verschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
 </context>
 <context>
     <name>initkey</name>
     <message>
-        <location filename="main.cpp" line="134"/>
+        <location filename="main.cpp" line="145"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <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>Mädschig Schmohg brauchd &apos;nen Schlüssel. Desweschen isser beleidschd. Beim nächsden Schdard mussde ihn einen mach&apos;n lass&apos;n.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="128"/>
+        <location filename="main.cpp" line="139"/>
         <source>Enter Host Name</source>
         <translation>Gombjudername eingäbn</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="129"/>
+        <location filename="main.cpp" line="140"/>
         <source>Host name:</source>
         <translation>Gombjudername:</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="134"/>
+        <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>Mädschig Schmohg brauchd &apos;nen Namen für diesen Gombjuder. Desweschen isser beleidschd. Beim nächsden Schdard mussde ihn eingäben. </translation>
     </message>
@@ -2726,18 +2703,18 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>initprofile</name>
     <message>
-        <location filename="main.cpp" line="143"/>
+        <location filename="main.cpp" line="154"/>
         <source>default</source>
         <comment>initial profile</comment>
         <translation>Schdandardbrofiel</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="144"/>
+        <location filename="main.cpp" line="155"/>
         <source>Create Initial Profile</source>
         <translation>Erschdes Brofiel anlechen</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="144"/>
+        <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>Gugge, Du brauchsd sowas wie&apos;n Brofiel. Mädschig Schmohg iss nedd und machd eens für Disch. Desderweschen brauchsde jedsd nur noch n Namen dafür eindibben.</translation>
     </message>
@@ -2745,22 +2722,22 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>lang</name>
     <message>
-        <location filename="main.cpp" line="52"/>
+        <location filename="main.cpp" line="63"/>
         <source>Information</source>
         <translation>Informadschion</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="52"/>
+        <location filename="main.cpp" line="63"/>
         <source>The changed language setting will only be active after restarting the application.</source>
         <translation>De Ändorung von dor Schbrache wird ersd wirgsam, wenn&apos;de das Brogramm neu geschdarded hasd. S&apos; is draurisch, aber wahr.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="47"/>
+        <location filename="main.cpp" line="58"/>
         <source>Chose Language</source>
         <translation>Schbrache Aussuch&apos;n</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="47"/>
+        <location filename="main.cpp" line="58"/>
         <source>Language:</source>
         <translation>Schbrache:</translation>
     </message>