remove order.h/cpp
authorkonrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Wed, 30 Dec 2009 11:18:42 +0000 (11:18 +0000)
committerkonrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Wed, 30 Dec 2009 11:18:42 +0000 (11:18 +0000)
move definition of req into msinterface.h

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

27 files changed:
src/dialogs/customerdlg.cpp
src/dialogs/eventedit.cpp
src/dialogs/eventsummary.cpp
src/dialogs/eventsummary.h
src/dialogs/orderwin.cpp
src/dialogs/orderwin.h
src/dialogs/shipping.cpp
src/iface/customer.cpp
src/iface/iface.pri
src/iface/msinterface.h
src/iface/order.cpp [deleted file]
src/iface/order.h [deleted file]
src/mwin/acltabs.cpp
src/mwin/carttab.cpp
src/mwin/entrancetab.cpp
src/mwin/eventstab.cpp
src/mwin/orderstab.cpp
src/mwin/overview.cpp
src/smoke_de.ts
src/smoke_de_SAX.ts
src/smoke_en.ts
src/templates/templates.cpp
src/templates/ticketrender.cpp
src/templates/ticketrender.h
src/wext/MOOrder.cpp [new file with mode: 0644]
src/wext/MOOrder.h
src/wext/wext.pri

index dc04e8f..91a17f1 100644 (file)
@@ -28,8 +28,6 @@
 #include <QStandardItemModel>
 #include <QTextEdit>
 
-#define req (MSInterface::instance())
-
 MCustomerListDialog::MCustomerListDialog(QWidget*par,bool isselect,qint64 presel)
        :QDialog(par)
 {
index 2b73b75..aee87fe 100644 (file)
@@ -29,8 +29,6 @@
 #include <msinterface.h>
 #include <MTGetEvent.h>
 
-#define req (MSInterface::instance())
-
 MEventEditor::MEventEditor(QWidget*w,qint64 id)
        :QDialog(w)
 {
index f850772..f600648 100644 (file)
 #include <QTableView>
 #include <QTextBrowser>
 
-#define req (MSInterface::instance())
-
 MEventSummary::MEventSummary(QWidget*par,qint64 eid)
-       :QDialog(par),event(eid)
+       :QDialog(par)/*,event(eid) TODO: get event somehow*/
 {
        nreserved=ncancelled=ntotaltickets=ntotalmoney=0;
        //get event data
@@ -51,7 +49,7 @@ MEventSummary::MEventSummary(QWidget*par,qint64 eid)
        gl->addWidget(new QLabel(tr("Artist:")),++rc,0);
        gl->addWidget(new QLabel(event.artist().value().name()),rc,1);
        gl->addWidget(new QLabel(tr("Start:")),++rc,0);
-       gl->addWidget(new QLabel(event.startTimeString()),rc,1);
+//     gl->addWidget(new QLabel(event.startTimeString()),rc,1);
        gl->addWidget(new QLabel(tr("Capacity:")),++rc,0);
        gl->addWidget(new QLabel(QString::number(event.capacity())),rc,1);
        gl->addWidget(new QLabel(tr("Tickets currently reserved:")),++rc,0);
@@ -114,7 +112,7 @@ void MEventSummary::getOrderData()
 {
        if(orderids.size()==orders.size())return;
        for(int i=0;i<orderids.size();i++){
-               orders.insert(orderids[i],MOrder(orderids[i]));
+               orders.insert(orderids[i],MOOrder(orderids[i]));
        }
 }
 
@@ -326,7 +324,7 @@ void MEventSummary::getLoopVariable(QString loopname,int iteration,QString varna
                if(!orders.contains(oid))return;
                
                if(varname=="CUSTOMERID")value=QString::number(orders[oid].orderid());else
-               if(varname=="CUSTOMER")value=orders[oid].customer_().name().value();else
+               if(varname=="CUSTOMER")value=orders[oid].customer().value().fullName();else
                if(varname=="FULLPRICE"){
                        value=orders[oid].totalprice().value();
                        av=MOdtRenderer::MoneyVar;
index 0333550..7913682 100644 (file)
@@ -16,7 +16,8 @@
 #include <QDialog>
 #include <QMap>
 
-#include "order.h"
+#include "MOOrder.h"
+#include "MOEvent.h"
 #include "odtrender.h"
 
 class QTableView;
@@ -46,7 +47,7 @@ class MEventSummary:public QDialog
                
        private:
                int eventid;
-               MEvent event;
+               MOEvent event;
                int nreserved,ncancelled,ntotaltickets,ntotalmoney;
                struct Tickets{
                        int price,bought,used,unused;
@@ -58,7 +59,7 @@ class MEventSummary:public QDialog
                };
                QList<Comment>comments;
                QList<int>orderids;
-               QMap<int,MOrder>orders;
+               QMap<int,MOOrder>orders;
                
                //get summary
                void getSummaryData();
index f5a25d9..9909304 100644 (file)
@@ -44,9 +44,7 @@
 
 #include <math.h>
 
-#define req (MSInterface::instance())
-
-MOrderWindow::MOrderWindow(QWidget*par,const MOrder&o)
+MOrderWindow::MOrderWindow(QWidget*par,const MOOrder&o)
        :QMainWindow(par),m_order(o)
 {
        setWindowTitle(tr("Order Details"));
@@ -56,19 +54,9 @@ MOrderWindow::MOrderWindow(QWidget*par,const MOrder&o)
        QMenuBar*mb=menuBar();
        QMenu *m=mb->addMenu(tr("&Order"));
        m->addAction(tr("&Order..."),this,SLOT(createOrder()))
-        ->setEnabled((req->hasRole("createorder")&&o.canOrder()) ||
-               (req->hasRole("reservationtoorder")&&o.isReservation()));
-       m->addAction(tr("&Sell..."),this,SLOT(createSale()))
-        ->setEnabled((req->hasRole("createsale")&&o.canSell()) ||
-               (req->hasRole("reservationtosale")&&o.isReservation()));
-       m->addAction(tr("Ma&ke Reservation..."),this,SLOT(createReservation()))
-        ->setEnabled(req->hasRole("createreservedorder")&&o.canReserve());
-       m->addAction(tr("&Prune and recheck..."),this,SLOT(recheckOrder()))
-        ->setEnabled(o.orderid()<0);
-       m->addSeparator();
+        ->setEnabled(req->hasRight(req->RReservationToOrder)&&o.isReservation());
        m->addAction(tr("C&ancel Order..."),this,SLOT(cancelOrder()))
-       //FIXME
-        ->setEnabled(req->hasRole("cancelorder")/*&&o.isStored()*/);
+        ->setEnabled(req->hasRight(req->RCancelOrder));
        m->addAction(tr("&Mark Order as Shipped..."),this,SLOT(shipOrder()))
         ->setEnabled(req->hasRole("ordershipped"));
        m->addSeparator();
@@ -123,7 +111,7 @@ MOrderWindow::MOrderWindow(QWidget*par,const MOrder&o)
        gl->addWidget(new QLabel(tr("Shipping Date:")),++rw,0);
        gl->addWidget(m_sentdate=new QLabel(m_order.sentDateTimeStr()),rw,1);
        gl->addWidget(new QLabel(tr("Customer:")),++rw,0);
-       gl->addWidget(new QLabel(m_order.customer_().address()),rw,1);
+       gl->addWidget(new QLabel(m_order.customer().value().fullName()),rw,1);
        gl->addWidget(new QLabel(tr("Delivery Address:")),++rw,0);
        //FIXME:gl->addWidget(lab=new QLabel(m_order.deliveryAddress()),rw,1);
        //lab->setWordWrap(true);
@@ -233,18 +221,18 @@ void MOrderWindow::printCurrentItem()
        int type=m_model->data(idx,Qt::UserRole).toInt();
        //find ticket/voucher
        if(type==ITEM_TICKET){
-               QList<MTicket>ticks;
+               QList<MOTicket>ticks;
                QList<MOTicket>tickets=m_order.tickets();
                for(int i=0;i<tickets.size();i++)
-                       if(tickets[i].ticketid().value()==id && MTicket(tickets[i]).isValid())
+                       if(tickets[i].ticketid().value()==id /*&& MOTicket(tickets[i]).isValid()*/)
                                ticks<<tickets[i];
                printTickets(ticks);
        }else
        if(type==ITEM_VOUCHER){
-               QList<MVoucher>vouchs;
+               QList<MOVoucher>vouchs;
                QList<MOVoucher>vouchers=m_order.vouchers();
                for(int i=0;i<vouchers.size();i++)
-                       if(vouchers[i].voucherid().value()==id && MVoucher(vouchers[i]).isValid())
+                       if(vouchers[i].voucherid().value()==id /*&& MOVoucher(vouchers[i]).isValid()*/)
                                vouchs<<vouchers[i];
                printVouchers(vouchs);
        }
@@ -263,7 +251,7 @@ void MOrderWindow::printVouchers()
        //printVouchers(m_order.vouchers());
 }
 
-void MOrderWindow::printTickets(QList<MTicket> ticketsin)
+void MOrderWindow::printTickets(QList<MOTicket> ticketsin)
 {/*TODO
        //reduce ticket list to usable ones
        QList<MTicket> tickets;
@@ -304,7 +292,7 @@ void MOrderWindow::printTickets(QList<MTicket> ticketsin)
        }*/
 }
 
-void MOrderWindow::printVouchers(QList<MVoucher> vouchersin)
+void MOrderWindow::printVouchers(QList<MOVoucher> vouchersin)
 {/*TODO
        //reduce voucher list to usable ones
        QList<MVoucher>vouchers;
@@ -526,12 +514,12 @@ void MOrderWindow::getLoopIterations(QString loopname,int&iterations)
        if(loopname=="TICKETS")iterations=printBuffer.tickets.size();
        if(loopname=="ACCTICKETS")iterations=printBuffer.tickinfo.size();
        if(loopname=="VOUCHERS")iterations=printBuffer.vouchers.size();
-       if(loopname=="ADDRESSLINES")iterations=m_order.customer_().address().split("\n").size();
+//     if(loopname=="ADDRESSLINES")iterations=m_order.customer_().address().split("\n").size();
 }
 void MOrderWindow::getLoopVariable(QString loopname,int it,QString vn,MOdtRenderer::VarType& av,QVariant&value)
 {
        if(loopname=="TICKETS"){
-               QList<MTicket> &tickets=printBuffer.tickets;
+               QList<MOTicket> &tickets=printBuffer.tickets;
                if(it<0 || it>=tickets.size())return;
                
                if(vn=="PRICE"){
@@ -539,21 +527,21 @@ void MOrderWindow::getLoopVariable(QString loopname,int it,QString vn,MOdtRender
                        av=MOdtRenderer::MoneyVar;
                }else
                if(vn=="ID")value=tickets[it].ticketid().value();else
-               if(vn=="TITLE")value=tickets[it].event().title().value();else
-               if(vn=="ARTIST")value=tickets[it].event().artist().value().name().value();else
+               if(vn=="TITLE");//value=tickets[it].event().title().value();else
+               if(vn=="ARTIST");//value=tickets[it].event().artist().value().name().value();else
                if(vn=="DATE"){
-                       value=tickets[it].event().start().value();
+//                     value=tickets[it].event().start().value();
                        av=MOdtRenderer::DateVar;
                }else
                if(vn=="STARTTIME"){
-                       value=tickets[it].event().start().value();
+//                     value=tickets[it].event().start().value();
                        av=MOdtRenderer::DateTimeVar;
                }else
                if(vn=="ENDTIME"){
-                       value=tickets[it].event().end().value();
+//                     value=tickets[it].event().end().value();
                        av=MOdtRenderer::DateTimeVar;
                }else
-               if(vn=="ROOM")value=tickets[it].event().room().value();
+               if(vn=="ROOM");//value=tickets[it].event().room().value();
        }else if(loopname=="ACCTICKETS"){
                QList<TickInfo> &tickets=printBuffer.tickinfo;
                if(it<0 || it>=tickets.size())return;
@@ -566,21 +554,21 @@ void MOrderWindow::getLoopVariable(QString loopname,int it,QString vn,MOdtRender
                        value=tickets[it].proto.price().value()*tickets[it].amount;
                        av=MOdtRenderer::MoneyVar;
                }else
-               if(vn=="TITLE")value=tickets[it].proto.event().title().value();else
-               if(vn=="ARTIST")value=tickets[it].proto.event().artist().value().name().value();else
+               if(vn=="TITLE");//value=tickets[it].proto.event().title().value();else
+               if(vn=="ARTIST");//value=tickets[it].proto.event().artist().value().name().value();else
                if(vn=="DATE"){
-                       value=tickets[it].proto.event().start().value();
+//                     value=tickets[it].proto.event().start().value();
                        av=MOdtRenderer::DateVar;
                }else
                if(vn=="STARTTIME"){
-                       value=tickets[it].proto.event().start().value();
+//                     value=tickets[it].proto.event().start().value();
                        av=MOdtRenderer::DateTimeVar;
                }else
                if(vn=="ENDTIME"){
-                       value=tickets[it].proto.event().end().value();
+//                     value=tickets[it].proto.event().end().value();
                        av=MOdtRenderer::DateTimeVar;
                }else
-               if(vn=="ROOM")value=tickets[it].proto.event().room().value();else
+               if(vn=="ROOM");//value=tickets[it].proto.event().room().value();else
                if(vn=="AMOUNT"){
                        value=tickets[it].amount;
                        av=MOdtRenderer::IntVar;
@@ -598,7 +586,7 @@ void MOrderWindow::getLoopVariable(QString loopname,int it,QString vn,MOdtRender
                }else
                if(vn=="ID")value=printBuffer.vouchers[it].voucherid().value();
        }else if(loopname=="ADDRESSLINES"){
-               QStringList lst=m_order.customer_().address().split("\n");
+               QStringList lst;//=m_order.customer_().address().split("\n");
                if(it<0 || it>=lst.size())return;
                value=lst[it];
        }else
@@ -612,7 +600,7 @@ void MOrderWindow::donePrintBuffer()
        printBuffer.tickinfo.clear();
 }
 
-static inline bool compare(const MTicket&a,const MTicket&b)
+static inline bool compare(const MOTicket&a,const MOTicket&b)
 {
        if(a.eventid()!=b.eventid())return false;
        if(a.price()!=b.price())return false;
index dd902ed..b4175ac 100644 (file)
 #ifndef MAGICSMOKE_ORDERWIN_H
 #define MAGICSMOKE_ORDERWIN_H
 
+#include <QDialog>
 #include <QMainWindow>
-#include "order.h"
 #include "odtrender.h"
+
+#include "MOOrder.h"
 #include "MOShipping.h"
 
 class QLabel;
@@ -28,7 +30,7 @@ class MOrderWindow:public QMainWindow
        Q_OBJECT
        public:
                /**creates the order window*/
-               MOrderWindow(QWidget*,const MOrder&);
+               MOrderWindow(QWidget*,const MOOrder&);
                
                /**returns whether the order has been changed by this window*/
                bool isChanged()const;
@@ -51,11 +53,11 @@ class MOrderWindow:public QMainWindow
                /**internal: print all tickets*/
                void printTickets();
                /**internal helper: print list of tickets*/
-               void printTickets(QList<MTicket>);
+               void printTickets(QList<MOTicket>);
                /**internal: print all vouchers*/
                void printVouchers();
                /**internal helper: print list of vouchers*/
-               void printVouchers(QList<MVoucher>);
+               void printVouchers(QList<MOVoucher>);
                
                /**print a bill*/
                void printBill();
@@ -109,7 +111,7 @@ class MOrderWindow:public QMainWindow
                void moneyLogVoucher();
        
        private:
-               MOrder m_order;
+               MOOrder m_order;
                bool m_changed;
                QLabel *m_orderid,*m_orderdate,*m_sentdate,*m_state,*m_paid,*m_total,*m_comment,
                 *m_shipmeth,*m_shipprice;
@@ -118,15 +120,15 @@ class MOrderWindow:public QMainWindow
                
                //printing buffer
                struct TickInfo{
-                       TickInfo(const MTicket&t):proto(t){amount=1;}
+                       TickInfo(const MOTicket&t):proto(t){amount=1;}
                        TickInfo(const TickInfo&t):proto(t.proto){amount=t.amount;}
                        TickInfo(){amount=0;}
-                       MTicket proto;
+                       MOTicket proto;
                        int amount;
                };
                struct PrintBuffer{
-                       QList<MTicket> tickets;
-                       QList<MVoucher> vouchers;
+                       QList<MOTicket> tickets;
+                       QList<MOVoucher> vouchers;
                        QList<TickInfo> tickinfo;
                }printBuffer;
                void initPrintBuffer();
index 3274b55..47eecc9 100644 (file)
@@ -28,8 +28,6 @@
 #include <QInputDialog>
 #include <QBoxLayout>
 
-#define req (MSInterface::instance())
-
 MShippingEditor::MShippingEditor(QWidget*par)
        :QDialog(par)
 {
index 8c2aabf..4ddff1f 100644 (file)
@@ -13,8 +13,6 @@
 #include "customer.h"
 #include "msinterface.h"
 
-#define req (MSInterface::instance())
-
 MCustomer::MCustomer(qint64 i)
 {
        MTGetCustomer gc=req->queryGetCustomer(i);
index f38a1b1..2836044 100644 (file)
@@ -1,7 +1,6 @@
 HEADERS += \
        iface/msinterface.h \
        iface/event.h \
-       iface/order.h \
        iface/sslexception.h \
        iface/customer.h
        
@@ -9,7 +8,6 @@ HEADERS += \
 SOURCES += \
        iface/msinterface.cpp \
        iface/event.cpp \
-       iface/order.cpp \
        iface/sslexception.cpp \
        iface/customer.cpp
 
index fa99253..937d8c7 100644 (file)
@@ -15,6 +15,9 @@
 
 #include "MInterface.h"
 
+#define req (MSInterface::instance())
+
+
 class MSslExceptions;
 
 /**the MagicSmoke specific interface class - enhances the basic interface by some functionality needed in the MagicSmoke context*/
diff --git a/src/iface/order.cpp b/src/iface/order.cpp
deleted file mode 100644 (file)
index fc9b99c..0000000
+++ /dev/null
@@ -1,445 +0,0 @@
-//
-// C++ Implementation: host
-//
-// Description: 
-//
-//
-// Author: Konrad Rosenbaum <konrad@silmor.de>, (C) 2007
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
-#include "misc.h"
-#include "order.h"
-
-#include "msinterface.h"
-
-#include <QCoreApplication>
-#include <QDomElement>
-#include <QMessageBox>
-
-#define req (MSInterface::instance())
-
-MOrder::MOrder(qint64 id)
-{
-       MTGetOrder go=req->queryGetOrder(id);
-       if(go.stage()==go.Success)
-               operator=(go.getorder().value());
-}
-
-bool MOrder::isValid()const
-{
-       //TODO: redefine isValid
-       return true;
-}
-
-MCustomer MOrder::customer_()const
-{
-       return MCustomer(customerid());
-}
-
-bool MOrder::isReservation()const
-{
-       return status()==Reserved;
-}
-
-bool MOrder::canOrder()const
-{
-       //TODO:redefine canOrder
-       //return m_status==CheckOk || m_status==CheckOrderOnly;
-       return true;
-}
-
-bool MOrder::canReserve()const{return canOrder();}
-
-bool MOrder::canSell()const
-{
-       //TODO: redefine canSell
-       //return m_status==CheckOk || m_status==CheckSaleOnly;
-       return true;
-}
-
-QString MOrder::orderStatusString()const
-{
-       return OrderState2str(status());
-}
-
-QString MOrder::totalPriceString(int off)const
-{
-       return cent2str(totalprice()+off);
-}
-
-QString MOrder::amountPaidString(int off)const
-{
-       return cent2str(amountpaid()+off);
-}
-
-bool MOrder::needsPayment()const
-{
-       if(status()==Placed || status()==Sent)
-               if(amountpaid()<totalprice())return true;
-       return false;
-}
-
-bool MOrder::needsRefund()const
-{
-       if(status()==Cancelled)
-               return amountpaid()>0;
-       if(status()==Placed || status()==Sent)
-               return amountpaid()>totalprice();
-       return false;
-}
-
-int MOrder::amountToPay()const
-{
-       if(status()==Placed || status()==Sent)
-               if(amountpaid()<totalprice())return totalprice()-amountpaid();
-       return 0;
-}
-
-int MOrder::amountToRefund()const
-{
-       if(status()==Cancelled)
-               return amountpaid();
-       if(status()==Placed || status()==Sent)
-               if(amountpaid()>totalprice())
-                       return amountpaid()-totalprice();
-       return 0;
-}
-
-QString MOrder::amountToPayStr(int off)const
-{
-       return cent2str(amountToPay()+off);
-}
-
-QString MOrder::amountToRefundStr(int off)const
-{
-       return cent2str(amountToRefund()+off);
-}
-
-bool MOrder::isSent()const
-{
-       //only in placed mode there is a need for action, hence in all other modes we assume sent
-       return status()!=Placed;
-}
-
-
-void MOrder::pruneInvalid()
-{/*TODO
-       //tickets
-       QList<MTicket>ntc;
-       for(int i=0;i<m_tickets.size();i++)
-               switch(m_tickets[i].status()){
-                       case MTicket::CheckFailTooLate:
-                       case MTicket::CheckFailExhausted:
-                       case MTicket::CheckFailCancelled:
-                       case MTicket::CheckFailEventInvalid:
-                       case MTicket::Invalid:
-                               //ignore
-                               break;
-                       default:
-                               //keep all others
-                               ntc.append(m_tickets[i]);
-               }
-       m_tickets=ntc;
-       //vouchers
-       QList<MVoucher>nvc;
-       for(int i=0;i<m_vouchers.size();i++)
-               if(m_vouchers[i].xmlState()=="")
-                       nvc.append(m_vouchers[i]);
-       m_vouchers=nvc;
-       //shipping info?
-       if(m_shipping.id()<0)m_shipping=MShipping();*/
-}
-
-QString MOrder::orderDateTimeStr()
-{
-       if(ordertime().value()==0)return "";
-       return QDateTime::fromTime_t(ordertime()).toString(QCoreApplication::translate("MOrder","yyyy-MM-dd hh:mm ap","date/time format"));
-}
-
-QDate MOrder::orderDate()
-{
-       return QDateTime::fromTime_t(ordertime()).date();
-}
-
-QString MOrder::orderDateStr()
-{
-       if(ordertime().value()==0)return "";
-       return QDateTime::fromTime_t(ordertime()).toString(QCoreApplication::translate("MOrder","yyyy-MM-dd","date format"));
-}
-
-QDateTime MOrder::sentDateTime()
-{
-       return QDateTime::fromTime_t(senttime());
-}
-
-QString MOrder::sentDateTimeStr()
-{
-       if(senttime().value()==0)return "";
-       return QDateTime::fromTime_t(senttime()).toString(QCoreApplication::translate("MOrder","yyyy-MM-dd hh:mm ap","date/time format"));
-}
-
-QDate MOrder::sentDate()
-{
-       return QDateTime::fromTime_t(senttime()).date();
-}
-
-QString MOrder::sentDateStr()
-{
-       if(senttime().value()==0)return "";
-       return QDateTime::fromTime_t(senttime()).toString(QCoreApplication::translate("MOrder","yyyy-MM-dd","date format"));
-}
-
-MOrder MOrder::createOrder()
-{/*TODO */
-       return MOrder();
-}
-
-MOrder MOrder::createSale()
-{//TODO
-       //return createOrder("createsale");
-       return MOrder();
-}
-
-MOrder MOrder::createReservation()
-{//TODO
-       //return createOrder("createreservedorder");
-       return MOrder();
-}
-
-bool MOrder::cancelOrder()
-{/*TODO
-       if(!req->request("cancelorder",QByteArray::number(m_orderid)))return false;
-       bool r=req->responseStatus()==MWebRequest::Ok;
-       if(r)m_status=Cancelled;
-       return r;*/
-       return false;
-}
-
-bool MOrder::shipOrder(QDateTime tm)
-{/*TODO
-       QByteArray rq=QByteArray::number(m_orderid);
-       if(req->hasRole("_explicitshipdate")){
-               rq+="\n";
-               rq+=QByteArray::number(tm.toTime_t());
-       }
-       if(!req->request("ordershipped",rq))return false;
-       bool r=req->responseStatus()==MWebRequest::Ok;
-       if(r){
-               m_status=Sent;
-               m_stime=req->responseBody().trimmed().toInt();
-       }
-       return r;*/
-       return false;
-}
-
-bool MOrder::sendComment(QString nc)
-{/*TODO
-       //make sure we are in a sane state
-       makeComplete();
-       if(!req || m_orderid<0)return false;
-       //create XML
-       QDomDocument doc;
-       QDomElement root=doc.createElement("OrderComment");
-       root.setAttribute("orderid",m_orderid);
-       root.appendChild(doc.createTextNode(nc));
-       doc.appendChild(root);
-       //request
-       if(!req->request("setordercomment",doc.toByteArray()))return false;
-       if(req->responseStatus()==MWebRequest::Ok){
-               m_comment=nc;
-               return true;
-       }else
-               return false;*/
-       return false;
-}
-
-bool MOrder::reservationToOrder(QString cmd)
-{/*TODO
-       //make sure we are in a sane state
-       makeComplete();
-       if(!req || m_orderid<0)return false;
-       //request
-       if(!req->request(cmd,QString::number(m_orderid).toUtf8()))return false;
-       if(req->responseStatus()==MWebRequest::Ok){
-               m_status=Placed;
-               return true;
-       }else
-               return false;*/
-       return false;
-}
-
-bool MOrder::reservationToSale()
-{/*TODO
-       if(reservationToOrder("reservationtosale")){
-               m_status=Sent;
-               m_paid=m_price;
-               return true;
-       }else return false;*/
-       return false;
-}
-
-/******************************************************************************
- * Ticket
- ******************************************************************************/
-
-MTicket::MTicket()
-{
-       m_paystate=PSUnknown;
-}
-
-MTicket::MTicket(QString t)
-{
-       m_paystate=PSUnknown;
-       MTGetTicket gt=req->queryGetTicket(t);
-       if(gt.stage()==gt.Success){
-               MOTicket::operator=(gt.getticket().value());
-       }
-}
-
-MTicket::MTicket(const MTicket&t)
-       :MOTicket(t)
-{
-       m_paystate=t.m_paystate;
-}
-
-MTicket::MTicket(const MOTicket&t)
-       :MOTicket(t)
-{
-       m_paystate=PSUnknown;
-}
-
-MTicket& MTicket::operator=(const MTicket&t)
-{
-       MOTicket::operator=(t);
-       m_paystate=t.m_paystate;
-       return *this;
-}
-
-bool MTicket::isValid()const
-{
-       //TODO: redo this method
-       return true;
-}
-
-QString MTicket::priceString(int off)const
-{
-       qint64 mp=price()+off;
-       return QString::number(mp/100)+QCoreApplication::translate("MTicket",".","decimal dot")+QString().sprintf("%02Ld",mp%100);
-}
-
-MEvent MTicket::event()const
-{
-       if(!isValid())return MEvent();
-       if(eventid()<0)return MEvent();
-       //TODO: reconsider if
-       //if(!m_event.isValid())
-               m_event=req->queryGetEvent(eventid()).getevent().value();
-       return m_event;
-}
-
-QString MTicket::statusString()const
-{
-       return TicketState2str(status());
-}
-
-
-MTicket::PaymentStatus MTicket::paymentStatus()
-{
-       /*TODO
-       if(m_paystate!=PSUnknown)return m_paystate;
-       if(!isValid())return PSUnknown;
-       if(!req->request("getticket",m_id.toAscii()))return PSUnknown;
-       if(req->responseStatus()!=MWebRequest::Ok)return PSUnknown;
-       QDomDocument doc;
-       if(!doc.setContent(req->responseBody()))return PSUnknown;
-       scanXml(doc.documentElement());
-       */
-       return m_paystate;
-}
-
-QString MTicket::markUsed()
-{/*TODO
-       if(!req->request("useticket",m_id.toAscii()))return QCoreApplication::translate("MTicket","Cannot execute request.");
-       if(req->responseStatus()==MWebRequest::Ok)return "";
-       return QCoreApplication::translate("MTicket",req->responseBody().data());*/
-       return "";
-}
-
-void MTicket::updatePrice(int p)
-{
-       if(p<0 || p==price())return;
-       //it only makes sense to contact the DB if it can be found there
-       /*TODO
-       if(isStored()){
-               if(req==0)return;
-               //send request
-               QByteArray rq=m_id.toAscii()+"\n"+QByteArray::number(p);
-               if(!req->request("changeticketprice",rq))return;
-               if(req->responseStatus()!=MWebRequest::Ok)return;
-       }*/
-       //update locally
-       setprice(p);
-}
-
-QString MTicket::ticketReturn()
-{/*TODO
-       if(!isStored())return QT_TRANSLATE_NOOP("MTicket","Ticket is not stored, can't return it.");
-       if(!req->request("ticketreturn",m_id.toUtf8()))
-               return QT_TRANSLATE_NOOP("MTicket","Failed to execute request");
-       if(req->responseStatus()!=MWebRequest::Ok)
-               return QString::fromUtf8(req->responseBody());
-       m_status=Refund;*/
-       return "";
-}
-
-/*int MTicket::amountToPay()const
-{
-       if(status()==Bought || status()==Used)return price();
-       else return 0;
-}*/
-
-bool MTicket::isToBePaid()const
-{
-       if(status()==Ordered || status()==Used)return true;
-       else return false;
-}
-
-
-/******************************************************************************
- * Voucher
- ******************************************************************************/
-
-MVoucher::MVoucher(QString v)
-{
-       MTGetVoucher gv=req->queryGetVoucher(v);
-       if(gv.stage()==gv.Success)
-               operator=(gv.getvoucher().value());
-}
-
-QString MVoucher::priceString(int off)const{return cent2str(price()+off);}
-QString MVoucher::valueString(int off)const{return cent2str(value()+off);}
-
-bool MVoucher::isValid()const{return voucherid().value()!="";}
-
-bool MVoucher::isCancelled()const{return price().value()==0 && value().value()==0;}
-
-bool MVoucher::isEmpty()const{return value().value()==0;}
-
-QString MVoucher::statusString()const
-{
-       return VoucherState2str(status());
-}
-
-QString MVoucher::voucherReturn()
-{/*TODO
-       if(!req)return QT_TRANSLATE_NOOP("MVoucher","Voucher is not stored, can't return it.");
-       if(!req->request("cancelvoucher",m_id.toUtf8()))
-               return QT_TRANSLATE_NOOP("MVoucher","Failed to execute request");
-       if(req->responseStatus()!=MWebRequest::Ok)
-               return QString::fromUtf8(req->responseBody());
-       m_value=m_price=0;*/
-       return "";
-}
diff --git a/src/iface/order.h b/src/iface/order.h
deleted file mode 100644 (file)
index 2b0aa11..0000000
+++ /dev/null
@@ -1,244 +0,0 @@
-//
-// C++ Interface: host
-//
-// Description: 
-//
-//
-// Author: Konrad Rosenbaum <konrad@silmor.de>, (C) 2007
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
-#ifndef MAGICSMOKE_ORDER_H
-#define MAGICSMOKE_ORDER_H
-
-#include <QDate>
-#include <QDateTime>
-#include <QString>
-
-#include "customer.h"
-#include "event.h"
-#include "shipping.h"
-
-#include "MOTicket.h"
-#include "MOVoucher.h"
-#include "MOOrder.h"
-
-class MWebRequest;
-class QDomDocument;
-class QDomElement;
-
-/**this class represents a single ticket*/
-class MTicket:public MOTicket
-{
-       public:
-               /**creates an invalid ticket*/
-               MTicket();
-               /**gets the ticket from the database*/
-               MTicket(QString);
-               /**copies a ticket*/
-               MTicket(const MTicket&);
-               MTicket(const MOTicket&);
-               
-               /**copies the ticket*/
-               MTicket& operator=(const MTicket&);
-               
-               /**returns whether the ticket is valid*/
-               bool isValid()const;
-               
-               /**returns the price of the ticket as localized string*/
-               QString priceString(int offsetvalue=0)const;
-               
-               /**returns whether the ticket is to be paid (ie. it is bought or already used)*/
-               bool isToBePaid()const;
-               
-               /**returns the event for this ticket (queries DB once)*/
-               MEvent event()const;
-               
-               /**returns the ticket status as string*/
-               QString statusString()const;
-               
-               /**payment state of the order*/
-               enum PaymentStatus{
-                       /**yet unknown, need to retrieve it*/
-                       PSUnknown,
-                       /**no order state (no order)*/
-                       PSNone,
-                       /**order has been paid ok*/
-                       PSOk,
-                       /**order is cancelled*/
-                       PSCancelled,
-                       /**order needs payment*/
-                       PSNeedPayment,
-                       /**order needs refund*/
-                       PSNeedRefund
-               };
-               
-               /**returns the payment state of the order (may check database)*/
-               PaymentStatus paymentStatus();
-               
-               /**marks the ticket as used in the database; returns empty string on success, error on failure*/
-               QString markUsed();
-               
-               /**updates the price of this ticket, calls DB*/
-               void updatePrice(int);
-               
-               /**attempts to return the ticket; returns empty string on success, error message on failure*/
-               QString ticketReturn();
-               
-       private:
-               PaymentStatus m_paystate;
-               mutable MEvent m_event;
-};
-
-/**this class represents a voucher*/
-class MVoucher:public MOVoucher
-{
-       public:
-               /**create empty/invalid voucher*/
-               MVoucher(){}
-               MVoucher(QString);
-               /**copy voucher*/
-               MVoucher(const MVoucher&v):MOVoucher(v){}
-               MVoucher(const MOVoucher&v):MOVoucher(v){}
-               
-               /**copy voucher*/
-               MVoucher& operator=(const MVoucher&v){MOVoucher::operator=(v);return *this;}
-               MVoucher& operator=(const MOVoucher&v){MOVoucher::operator=(v);return *this;}
-               
-               /**returns the price of the voucher as string*/
-               QString priceString(int off=0)const;
-               /**returns the remaining value of the voucher as string*/
-               QString valueString(int off=0)const;
-               
-               /**returns whether this is a valid voucher object*/
-               bool isValid()const;
-               
-               /**returns whether the voucher is cancelled*/
-               bool isCancelled()const;
-               
-               /**returns whether the voucher is empty, ie. its remaining value is zero*/
-               bool isEmpty()const;
-               
-               /**returns a status string for the voucher for displaying*/
-               QString statusString()const;
-               
-               /**attempts to return the voucher; returns empty string on success, error message on failure*/
-               QString voucherReturn();
-};
-
-/**this class represents a complete order*/
-class MOrder:public MOOrder
-{
-       public:
-               /**create invalid order*/
-               MOrder(){}
-               /**create order by id*/
-               MOrder(qint64);
-               /**copy order*/
-               MOrder(const MOrder&o):MOOrder(o){}
-               MOrder(const MOOrder&o):MOOrder(o){}
-               
-               /**copies the order*/
-               MOrder& operator=(const MOrder&o){MOOrder::operator=(o);return *this;}
-               MOrder& operator=(const MOOrder&o){MOOrder::operator=(o);return *this;}
-               
-               /**returns whether the order is valid (it comes from the DB and it has been understood by the parser)*/
-               bool isValid()const;
-               
-               /**returns a customer object (calls database!)*/
-               MCustomer customer_()const;
-               
-               /**returns whether this order is a reservation*/
-               bool isReservation()const;
-               
-               /**returns whether this order object can be used to generate an order (to be delivered later)*/
-               bool canOrder()const;
-               
-               /**returns whether this order object can be used to generate a reservation (same rules as for canOrder)*/
-               bool canReserve()const;
-               
-               /**returns whether this order object can be used to generate a sale (delivered and paid immediately)*/
-               bool canSell()const;
-               
-               /**returns the status of the order as localized string*/
-               QString orderStatusString()const;
-               
-               /**returns how much money needs to be paid in total for this order, in cents*/
-               QString totalPriceString(int offsetvalue=0)const;
-               
-               /**returns how much money has already been paid for this order, in cents*/
-               QString amountPaidString(int offsetvalue=0)const;
-               
-               /**returns whether there is anything left to pay*/
-               bool needsPayment()const;
-               
-               /**returns whether there is anything left to refund*/
-               bool needsRefund()const;
-               
-               /**returns how much there is to be paid, in cents*/
-               int amountToPay()const;
-               
-               /**returns how much there is to be paid, as localized string*/
-               QString amountToPayStr(int offsetvalue=0)const;
-               
-               /**returns how much there is to be refunded, in cents*/
-               int amountToRefund()const;
-               
-               /**returns how much there is to be refunded, as localized string*/
-               QString amountToRefundStr(int offsetvalue=0)const;
-               
-               /**returns whether the tickets of this order have already been shipped*/
-               bool isSent()const;
-               
-               /**returns the order date+time as string*/
-               QString orderDateTimeStr();
-               
-               /**returns the order date only*/
-               QDate orderDate();
-               
-               /**returns the order date only as string*/
-               QString orderDateStr();
-               
-               /**returns the shipping date+time*/
-               QDateTime sentDateTime();
-               
-               /**returns the shipping date+time as string*/
-               QString sentDateTimeStr();
-               
-               /**returns the shipping date only*/
-               QDate sentDate();
-               
-               /**returns the shipping date only as string*/
-               QString sentDateStr();
-               
-               /**create a new order in the DB; returns it*/
-               MOrder createOrder();
-               
-               /**create a sale in the DB; returns it*/
-               MOrder createSale();
-               
-               /**create a reservation in the DB; returns it*/
-               MOrder createReservation();
-               
-               /**change a reservation into an order*/
-               bool reservationToOrder(QString cmd="reservationtoorder");
-               
-               /**change a reservation into a sale*/
-               bool reservationToSale();
-               
-               /**cancel the order; queries DB; returns true on success*/
-               bool cancelOrder();
-               
-               /**mark the order as shipped; queries DB; returns true on success*/
-               bool shipOrder(QDateTime tm=QDateTime::currentDateTime());
-               
-               /**set a new comment and immediately send it to the server (will not set the comment if the server rejects it); returns whether setting was successful*/
-               bool sendComment(QString);
-               
-               /**if the order is in check state yet: prune invalid objects*/
-               void pruneInvalid();
-};
-
-#endif
index c0507e6..854733e 100644 (file)
@@ -25,8 +25,6 @@
 #include <QStandardItemModel>
 #include <QTableView>
 
-#define req (MSInterface::instance())
-
 MUserTab::MUserTab(QString pk)
 {
        profilekey=pk;
index 2ab2287..5eeda29 100644 (file)
@@ -32,8 +32,6 @@
 #include <QTableView>
 #include <QTextEdit>
 
-#define req (MSInterface::instance())
-
 MCartTab::MCartTab(QString pk)
 {
        profilekey=pk;
@@ -82,8 +80,11 @@ MCartTab::MCartTab(QString pk)
        frm->setFrameShape(QFrame::HLine);
        vl->addLayout(hl=new QHBoxLayout,0);
        hl->addStretch(10);
-       hl->addWidget(p=new QPushButton(tr("Check Order")));
-       p->setEnabled(req->hasRole("checkorder"));
+       hl->addWidget(p=new QPushButton(tr("Order")));
+       p->setEnabled(req->hasRight(req->RCreateOrder));
+       connect(p,SIGNAL(clicked()),this,SLOT(cartOrder()));
+       hl->addWidget(p=new QPushButton(tr("Reserve")));
+       p->setEnabled(req->hasRight(req->RCreateReservation));
        connect(p,SIGNAL(clicked()),this,SLOT(cartOrder()));
        hl->addWidget(p=new QPushButton(tr("Clear")));
        connect(p,SIGNAL(clicked()),this,SLOT(initCart()));
index 7236839..e65b7a2 100644 (file)
@@ -24,8 +24,6 @@
 #include <QSettings>
 #include <QStandardItemModel>
 
-#define req (MSInterface::instance())
-
 MEntranceTab::MEntranceTab(QString pk)
 {
        profilekey=pk;
index 071b851..dfd0eed 100644 (file)
@@ -36,8 +36,6 @@
 #include <QTableView>
 #include <QTextEdit>
 
-#define req (MSInterface::instance())
-
 MEventsTab::MEventsTab(QString pk)
 {
        profilekey=pk;
index 0cb316f..120a7cd 100644 (file)
@@ -38,8 +38,6 @@
 #define ORDERUNSENT    4
 #define ORDERRESERVE   8
 
-#define req (MSInterface::instance())
-
 MOrdersTab::MOrdersTab(QString pk)
 {
        profilekey=pk;
index d70cd2a..c979702 100644 (file)
@@ -38,8 +38,6 @@
 #include <QStatusBar>
 #include <QTabWidget>
 
-#define req (MSInterface::instance())
-
 MOverview::MOverview(QString pk)
 {
        profilekey=pk;
@@ -146,7 +144,7 @@ MOverview::MOverview(QString pk)
                eventtab->setEnabled(false);
                tab->setTabEnabled(tab->indexOf(eventtab),false);
        }
-       if(!req->hasRight(req->RCreateOrder)&&!req->hasRight(req->RCreateSale)){
+       if(!req->hasRight(req->RCreateOrder)){
                tab->setTabEnabled(tab->indexOf(carttab),false);
        }
        if(!req->hasRight(req->RGetOrderList)){
index c4e952f..3bd99c6 100644 (file)
@@ -1,5 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="de">
+<!DOCTYPE TS>
+<TS version="2.0" language="de">
+<context>
+    <name>MAppStyleDialog</name>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="563"/>
+        <source>Application Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="566"/>
+        <source>GUI Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="568"/>
+        <source>System Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="576"/>
+        <source>Stylesheet:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="587"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="590"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="596"/>
+        <source>Select Stylesheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MApplication</name>
     <message>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="97"/>
-        <source>&lt;h3&gt;MagicSmoke %3&lt;/h3&gt;&amp;copy; Konrad Rosenbaum, Peter Keller, 2007-9&lt;br&gt;protected under the GNU GPL v.3 or at your option any newer&lt;p&gt;See also the &lt;a href=&quot;http://smoke.silmor.de&quot;&gt;MagicSmoke Homepage&lt;/a&gt;.&lt;p&gt;This version was compiled from repository &apos;%1&apos; revision &apos;%2&apos;.</source>
+        <location filename="main.cpp" line="92"/>
+        <source>&lt;h3&gt;MagicSmoke %3&lt;/h3&gt;&amp;copy; Konrad Rosenbaum, 2007-2010&lt;br&gt;&amp;copy; Peter Keller, 2007-2008&lt;br&gt;protected under the GNU GPL v.3 or at your option any newer&lt;p&gt;See also the &lt;a href=&quot;http://smoke.silmor.de&quot;&gt;MagicSmoke Homepage&lt;/a&gt;.&lt;p&gt;This version was compiled from repository &apos;%1&apos; revision &apos;%2&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MBackupDialog</name>
     <message>
-        <location filename="overview.cpp" line="1624"/>
+        <location filename="mwin/overview.cpp" line="560"/>
         <source>Backup Settings</source>
         <translation>Einstellungen Sicherungskopie</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1629"/>
+        <location filename="mwin/overview.cpp" line="565"/>
         <source>Backup File:</source>
         <translation>Sicherungskopie Datei:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1631"/>
+        <location filename="mwin/overview.cpp" line="567"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1634"/>
+        <location filename="mwin/overview.cpp" line="570"/>
         <source>Generations to keep:</source>
         <translation>Anzahl Generationen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1639"/>
+        <location filename="mwin/overview.cpp" line="575"/>
         <source>Automatic Backup:</source>
         <translation>Automatische Sicherung:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1643"/>
+        <location filename="mwin/overview.cpp" line="579"/>
         <source>Interval in days:</source>
         <translation>Intervall in Tagen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1651"/>
+        <location filename="mwin/overview.cpp" line="587"/>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1654"/>
+        <location filename="mwin/overview.cpp" line="590"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1660"/>
+        <location filename="mwin/overview.cpp" line="596"/>
         <source>Backup File</source>
         <translation>Sicherungsdatei</translation>
     </message>
 </context>
 <context>
+    <name>MCartTab</name>
+    <message>
+        <location filename="mwin/carttab.cpp" line="56"/>
+        <source>Add Ticket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="58"/>
+        <source>Add Voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="60"/>
+        <source>Remove Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="66"/>
+        <source>Customer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="72"/>
+        <source>Shipping Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="75"/>
+        <source>Delivery Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="78"/>
+        <source>Comments:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="85"/>
+        <source>Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="88"/>
+        <source>Reserve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="91"/>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="105"/>
+        <source>C&amp;art</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="106"/>
+        <source>Add &amp;Ticket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="107"/>
+        <source>Add &amp;Voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="108"/>
+        <source>&amp;Remove Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="109"/>
+        <source>&amp;Abort Shopping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="111"/>
+        <source>&amp;Update Shipping Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="122"/>
+        <source>(No Shipping)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="133"/>
+        <source>Amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="133"/>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="133"/>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="166"/>
+        <source>Select Event to order Ticket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="179"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="182"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MCentDialog</name>
     <message>
         <location filename="widgets/centbox.cpp" line="105"/>
 <context>
     <name>MCheckDialog</name>
     <message>
-        <location filename="widgets/checkdlg.cpp" line="33"/>
+        <location filename="dialogs/checkdlg.cpp" line="33"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="widgets/checkdlg.cpp" line="35"/>
+        <location filename="dialogs/checkdlg.cpp" line="35"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
+    <name>MConfigDialog</name>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="49"/>
+        <source>Magic Smoke Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="60"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="61"/>
+        <source>&amp;New Profile...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="62"/>
+        <source>&amp;Delete Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="63"/>
+        <source>&amp;Rename Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="64"/>
+        <source>C&amp;lone Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="65"/>
+        <source>&amp;Make Default Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="67"/>
+        <source>&amp;Export Host Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="68"/>
+        <source>&amp;Import Host Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="69"/>
+        <source>&amp;Generate Host Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="71"/>
+        <source>&amp;Close Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="72"/>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="73"/>
+        <source>&amp;Language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="74"/>
+        <source>&amp;OpenOffice.org Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="75"/>
+        <source>Set &amp;Default Label Font...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="76"/>
+        <source>Set &amp;Application Style...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="90"/>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="95"/>
+        <source>Server URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="100"/>
+        <source>Proxy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="108"/>
+        <source>Proxy Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="111"/>
+        <source>Proxy Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="118"/>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="121"/>
+        <source>Hostname:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="124"/>
+        <source>Hostkey:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="127"/>
+        <source>Default Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="133"/>
+        <source>SSL Exceptions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="135"/>
+        <source>List of non-fatal SSL exceptions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="143"/>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="145"/>
+        <source>Probe Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="252"/>
+        <location filename="dialogs/configdialog.cpp" line="328"/>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="252"/>
+        <location filename="dialogs/configdialog.cpp" line="287"/>
+        <location filename="dialogs/configdialog.cpp" line="328"/>
+        <source>Please enter a profile name. It must be non-empty and must not be used yet:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="287"/>
+        <source>Rename Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="294"/>
+        <location filename="dialogs/configdialog.cpp" line="402"/>
+        <location filename="dialogs/configdialog.cpp" line="417"/>
+        <location filename="dialogs/configdialog.cpp" line="429"/>
+        <location filename="dialogs/configdialog.cpp" line="437"/>
+        <location filename="dialogs/configdialog.cpp" line="441"/>
+        <location filename="dialogs/configdialog.cpp" line="446"/>
+        <location filename="dialogs/configdialog.cpp" line="451"/>
+        <location filename="dialogs/configdialog.cpp" line="456"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="294"/>
+        <source>This profile name is already in use.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="378"/>
+        <source>Generate Hostkey</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="378"/>
+        <source>Do you really want to generate a new host key for this profile? This may disable all accounts from this host.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="393"/>
+        <source>Export Key to File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="402"/>
+        <source>Unable to open file %1 for writing: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="417"/>
+        <source>Importing a key overwrites the host key that is currently used by this profile. This may disable your accounts. Do you still want to continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="420"/>
+        <source>Import Key from File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="429"/>
+        <source>Unable to open file %1 for reading: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="437"/>
+        <location filename="dialogs/configdialog.cpp" line="441"/>
+        <source>This is not a host key file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="446"/>
+        <source>This host key file does not contain a valid host name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="451"/>
+        <source>This host key file does not contain a valid key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="456"/>
+        <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="477"/>
+        <source>Chose Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="477"/>
+        <source>Please chose a default font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="510"/>
+        <location filename="dialogs/configdialog.cpp" line="512"/>
+        <source>Server Probe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="510"/>
+        <source>The request finished without errors.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="512"/>
+        <source>The request finished with an error: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="523"/>
+        <source>SSL Errors encountered:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="526"/>
+        <source>Certificate &quot;%1&quot;
+  Fingerprint (sha1): %2
+  Error: %3
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="531"/>
+        <source>Accept connection anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="532"/>
+        <source>SSL Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="550"/>
+        <source>Common Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="550"/>
+        <source>SHA-1 Digest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="550"/>
+        <source>Error Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MCustomerDialog</name>
     <message>
-        <location filename="customer.cpp" line="254"/>
+        <location filename="dialogs/customerdlg.cpp" line="206"/>
         <source>Customer %1</source>
         <translation>Kunde %1</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="256"/>
+        <location filename="dialogs/customerdlg.cpp" line="208"/>
         <source>New Customer</source>
         <translation>Neuer Kunde</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="262"/>
+        <location filename="dialogs/customerdlg.cpp" line="214"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="264"/>
+        <location filename="dialogs/customerdlg.cpp" line="216"/>
         <source>Address:</source>
         <translation>Rechnungsadresse:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="267"/>
+        <location filename="dialogs/customerdlg.cpp" line="219"/>
         <source>Contact Information:</source>
         <translation>Kontaktinformationen:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="272"/>
+        <location filename="dialogs/customerdlg.cpp" line="224"/>
         <source>Web-Login/eMail:</source>
         <translation>Web-Login/eMail:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="275"/>
+        <location filename="dialogs/customerdlg.cpp" line="227"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="283"/>
+        <location filename="dialogs/customerdlg.cpp" line="235"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="286"/>
+        <location filename="dialogs/customerdlg.cpp" line="238"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
 <context>
     <name>MCustomerListDialog</name>
     <message>
-        <location filename="customer.cpp" line="73"/>
+        <location filename="dialogs/customerdlg.cpp" line="37"/>
         <source>Select a Customer</source>
         <translation>Kunde auswählen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="75"/>
+        <location filename="dialogs/customerdlg.cpp" line="39"/>
         <source>Customers</source>
         <translation>Kunden</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="96"/>
+        <location filename="dialogs/customerdlg.cpp" line="60"/>
         <source>Details...</source>
         <translation>Details...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="98"/>
+        <location filename="dialogs/customerdlg.cpp" line="62"/>
         <source>Create new...</source>
         <translation>Neu...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="101"/>
+        <location filename="dialogs/customerdlg.cpp" line="65"/>
         <source>Delete...</source>
         <translation>Löschen...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="109"/>
+        <location filename="dialogs/customerdlg.cpp" line="73"/>
         <source>Select</source>
         <translation>Auswählen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="112"/>
+        <location filename="dialogs/customerdlg.cpp" line="76"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="115"/>
+        <location filename="dialogs/customerdlg.cpp" line="79"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="202"/>
+        <location filename="dialogs/customerdlg.cpp" line="165"/>
         <source>Delete Customer</source>
         <translation>Kunden Löschen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="205"/>
+        <location filename="dialogs/customerdlg.cpp" line="168"/>
         <source>Really delete this customer (%1)?</source>
         <translation>Diesen Kunden (%1) wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="208"/>
+        <location filename="dialogs/customerdlg.cpp" line="171"/>
         <source>merge with other entry:</source>
         <translation>mit anderem Eintrag vereinen:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="220"/>
+        <location filename="dialogs/customerdlg.cpp" line="183"/>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="222"/>
+        <location filename="dialogs/customerdlg.cpp" line="185"/>
         <source>&amp;No</source>
         <translation>&amp;Nein</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="360"/>
+        <location filename="dialogs/customerdlg.cpp" line="192"/>
         <source>Error</source>
-        <translation type="obsolete">Fehler</translation>
+        <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="356"/>
         <source>Failed to delete customer.</source>
         <translation type="obsolete">Kann Kunden nicht löschen.</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="360"/>
-        <source>Failed to delete customer: %1</source>
-        <translation type="obsolete">Kann Kunden nicht löschen: %1</translation>
+        <location filename="dialogs/customerdlg.cpp" line="192"/>
+        <source>Failed to delete customer: %1</source>
+        <translation type="unfinished">Kann Kunden nicht löschen: %1</translation>
+    </message>
+</context>
+<context>
+    <name>MEntranceTab</name>
+    <message>
+        <location filename="mwin/entrancetab.cpp" line="40"/>
+        <source>Enter or scan Ticket-ID:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MEvent</name>
     <message>
-        <location filename="event.cpp" line="186"/>
         <source>Event is not complete, cannot save.</source>
         <translation type="obsolete">Veranstaltung ist nicht komplett. Kann nicht speichern.</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="31"/>
+        <location filename="iface/event.cpp" line="31"/>
         <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="61"/>
+        <location filename="iface/event.cpp" line="38"/>
+        <location filename="iface/event.cpp" line="61"/>
         <source>.</source>
         <comment>price decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="56"/>
+        <location filename="iface/event.cpp" line="46"/>
+        <location filename="iface/event.cpp" line="56"/>
         <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="51"/>
+        <location filename="iface/event.cpp" line="51"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation>d.M.yyyy</translation>
 <context>
     <name>MEventEditor</name>
     <message>
-        <location filename="eventedit.cpp" line="46"/>
+        <location filename="dialogs/eventedit.cpp" line="46"/>
         <source>Event Editor</source>
         <translation>Veranstaltungseditor</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="63"/>
+        <location filename="dialogs/eventedit.cpp" line="63"/>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="68"/>
+        <location filename="dialogs/eventedit.cpp" line="68"/>
         <source>Artist:</source>
         <translation>Künstler:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="73"/>
+        <location filename="dialogs/eventedit.cpp" line="73"/>
         <source>Description:</source>
         <translation>Beschreibung:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="78"/>
+        <location filename="dialogs/eventedit.cpp" line="78"/>
         <source>Start Time:</source>
         <translation>Startzeit:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="89"/>
+        <location filename="dialogs/eventedit.cpp" line="81"/>
+        <location filename="dialogs/eventedit.cpp" line="89"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="86"/>
+        <location filename="dialogs/eventedit.cpp" line="86"/>
         <source>End Time:</source>
         <translation>Endzeit:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="94"/>
+        <location filename="dialogs/eventedit.cpp" line="94"/>
         <source>Room/Place:</source>
         <translation>Raum/Ort:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="103"/>
+        <location filename="dialogs/eventedit.cpp" line="103"/>
         <source>Capacity:</source>
         <translation>Sitzplätze:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="109"/>
+        <location filename="dialogs/eventedit.cpp" line="109"/>
         <source>Default Price:</source>
         <translation>Kartenpreis:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="115"/>
+        <location filename="dialogs/eventedit.cpp" line="115"/>
         <source>Event Cancelled:</source>
         <translation>Veranstaltung absagen:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="127"/>
+        <location filename="dialogs/eventedit.cpp" line="127"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="177"/>
+        <location filename="dialogs/eventedit.cpp" line="130"/>
+        <location filename="dialogs/eventedit.cpp" line="177"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="39"/>
+        <location filename="dialogs/eventedit.cpp" line="39"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="39"/>
+        <location filename="dialogs/eventedit.cpp" line="39"/>
         <source>Unable to load event from server.</source>
         <translation>Veranstaltung kann nicht vom Server geladen werden.</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="145"/>
         <source>Problem while uploading event: %s</source>
         <translation type="obsolete">Problem beim anlegen der Veranstaltung: %s</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="161"/>
+        <location filename="dialogs/eventedit.cpp" line="161"/>
         <source>Select a Room</source>
         <translation>Raum auswählen</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="172"/>
+        <location filename="dialogs/eventedit.cpp" line="172"/>
         <source>New...</source>
         <comment>new room</comment>
         <translation>Neu...</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="175"/>
+        <location filename="dialogs/eventedit.cpp" line="175"/>
         <source>Select</source>
         <comment>select room</comment>
         <translation>Auswählen</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="181"/>
         <source>New Room</source>
         <translation type="obsolete">Neuer Raum</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="181"/>
         <source>Name of new room:</source>
         <translation type="obsolete">Name des Raumes:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="58"/>
+        <location filename="dialogs/eventedit.cpp" line="58"/>
         <source>ID:</source>
         <translation>ID:</translation>
     </message>
 <context>
     <name>MEventSummary</name>
     <message>
-        <location filename="eventsummary.cpp" line="39"/>
+        <location filename="dialogs/eventsummary.cpp" line="39"/>
         <source>Summary for Event %1</source>
         <translation>Ãœbersicht zu Veranstaltung %1</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="49"/>
+        <location filename="dialogs/eventsummary.cpp" line="49"/>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="51"/>
+        <location filename="dialogs/eventsummary.cpp" line="51"/>
         <source>Artist:</source>
         <translation>Künstler:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="53"/>
+        <location filename="dialogs/eventsummary.cpp" line="53"/>
         <source>Start:</source>
         <translation>Beginn:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>Date+Time format for displaying event start time</comment>
         <translation type="obsolete">ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="55"/>
+        <location filename="dialogs/eventsummary.cpp" line="55"/>
         <source>Capacity:</source>
         <translation>Sitzplätze:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="57"/>
+        <location filename="dialogs/eventsummary.cpp" line="57"/>
         <source>Tickets currently reserved:</source>
         <translation>Momentan reservierte Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="59"/>
+        <location filename="dialogs/eventsummary.cpp" line="59"/>
         <source>Tickets currently cancelled:</source>
         <translation>Momentan abgesagte Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="61"/>
+        <location filename="dialogs/eventsummary.cpp" line="61"/>
         <source>Tickets currently usable:</source>
         <translation>Momentan nutzbare Karten:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="63"/>
+        <location filename="dialogs/eventsummary.cpp" line="63"/>
         <source>Total Income:</source>
         <translation>erwarteter Umsatz:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Price</source>
         <translation>Preis</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Bought</source>
         <translation>Gekauft</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Used</source>
         <translation>Benutzt</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Unused</source>
         <translation>Unbenutzt</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="102"/>
+        <location filename="dialogs/eventsummary.cpp" line="102"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="104"/>
+        <location filename="dialogs/eventsummary.cpp" line="104"/>
         <source>Save as...</source>
         <translation>Speichern unter...</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="107"/>
+        <location filename="dialogs/eventsummary.cpp" line="107"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="186"/>
         <source>Warning</source>
         <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (eventsummary.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="45"/>
+        <location filename="dialogs/eventsummary.cpp" line="45"/>
         <source>Summary</source>
         <translation>Zusammenfassung</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="68"/>
+        <location filename="dialogs/eventsummary.cpp" line="68"/>
         <source>Tickets</source>
         <translation>Karten</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="84"/>
+        <location filename="dialogs/eventsummary.cpp" line="84"/>
         <source>Comments</source>
         <translation>Kommentare</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="90"/>
+        <location filename="dialogs/eventsummary.cpp" line="90"/>
         <source>Order: </source>
         <translation>Bestellung:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="dialogs/eventsummary.cpp" line="92"/>
         <source>Customer: </source>
         <translation>Kunde:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="186"/>
         <source>Unable to get template file (eventsummary). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (eventsummary) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="193"/>
         <source>Open Document File (*.%1)</source>
         <translation type="obsolete">ODF Datei (*.%1)</translation>
     </message>
 </context>
 <context>
+    <name>MEventsTab</name>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="56"/>
+        <source>New Event...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="59"/>
+        <source>Details...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="63"/>
+        <source>Order Ticket...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="67"/>
+        <source>Event Summary...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="71"/>
+        <source>Cancel Event...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="85"/>
+        <source>&amp;Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="86"/>
+        <source>&amp;Update Event List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="88"/>
+        <source>&amp;Show/Edit details...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="90"/>
+        <source>&amp;New Event...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="92"/>
+        <source>Show &amp;old Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Reserved</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Sold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Capacity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="134"/>
+        <source>ddd MMMM d yyyy, h:mm ap</source>
+        <comment>time format</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="196"/>
+        <source>Cancel Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="196"/>
+        <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="200"/>
+        <source>Event Cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="200"/>
+        <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="202"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="202"/>
+        <source>Unable to cancel event &quot;%1&quot;: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MHostTab</name>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="235"/>
+        <source>New Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="238"/>
+        <source>Add This Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="241"/>
+        <source>Delete Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="245"/>
+        <source>Generate New Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="248"/>
+        <source>Import...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="251"/>
+        <source>Export...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="274"/>
+        <source>Host Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="274"/>
+        <source>Host Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MKeyGen</name>
     <message numerus="yes">
-        <location filename="keygen.cpp" line="88"/>
+        <location filename="crypto/keygen.cpp" line="59"/>
+        <location filename="crypto/keygen.cpp" line="89"/>
         <source>Current random buffer: %n Bits</source>
         <translation>
             <numerusform>Aktueller Zufallspuffer: %n Bit</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="42"/>
+        <location filename="crypto/keygen.cpp" line="43"/>
         <source>Magic Smoke Key Generator</source>
         <translation>Magic Smoke Schlüsselgenerator</translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="53"/>
+        <location filename="crypto/keygen.cpp" line="54"/>
         <source>&lt;html&gt;&lt;h1&gt;Key Generation&lt;/h1&gt;
 I am currently collecting random bits in order to generate a host key for this installation. Please use mouse and keyboard to generate more random. Alternatively you can load a key from an external medium.&lt;p&gt;
 At least %1 Bits of random are required.</source>
         <translation>&lt;html&gt;&lt;h1&gt;Schlüsselgenerierung&lt;/h1&gt;Das Programm sammelt gerade Zufallsbits für diese Installation. Bitte benutzen Sie Maus und Tastatur, um mehr Zufall zu generieren. Alternativ können Sie auch einen fertigen Schlüssel von einem externen Medium laden.&lt;p&gt;Mindestens %1 Zufallsbits werden gebraucht.</translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="69"/>
+        <location filename="crypto/keygen.cpp" line="70"/>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="71"/>
+        <location filename="crypto/keygen.cpp" line="72"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
@@ -547,656 +1173,858 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MLabelDialog</name>
     <message>
-        <location filename="labeldlg.cpp" line="40"/>
+        <location filename="templates/labeldlg.cpp" line="40"/>
         <source>Label Printing Setup</source>
         <translation>Etikettendruck einrichten</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="49"/>
+        <location filename="templates/labeldlg.cpp" line="49"/>
         <source>mm</source>
         <comment>defaultmetric: mm, in, cm</comment>
         <translation>mm</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="75"/>
+        <location filename="templates/labeldlg.cpp" line="75"/>
         <source>Label offset:</source>
         <translation>Seitenrand:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="81"/>
+        <location filename="templates/labeldlg.cpp" line="81"/>
         <source>Label size:</source>
         <translation>Etikettengröße:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="87"/>
+        <location filename="templates/labeldlg.cpp" line="87"/>
         <source>Unit:</source>
         <translation>Einheit:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="89"/>
+        <location filename="templates/labeldlg.cpp" line="89"/>
         <source>Millimeter</source>
         <translation>Millimeter</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="90"/>
+        <location filename="templates/labeldlg.cpp" line="90"/>
         <source>Centimeter</source>
         <translation>Zentimeter</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="91"/>
+        <location filename="templates/labeldlg.cpp" line="91"/>
         <source>Inch</source>
         <translation>Zoll</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="99"/>
+        <location filename="templates/labeldlg.cpp" line="99"/>
         <source>Page usage:</source>
         <translation>Seitennutzung:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="102"/>
+        <location filename="templates/labeldlg.cpp" line="102"/>
         <source>Page %1</source>
         <translation>Seite %1</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="146"/>
+        <location filename="templates/labeldlg.cpp" line="146"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="150"/>
+        <location filename="templates/labeldlg.cpp" line="150"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="303"/>
+        <location filename="templates/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>MLogin</name>
+    <message>
+        <location filename="dialogs/login.cpp" line="34"/>
+        <source>Magic Smoke Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="40"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="41"/>
+        <source>&amp;Exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="42"/>
+        <source>&amp;Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="43"/>
+        <source>&amp;Configuration...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="51"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="55"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="58"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="69"/>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="111"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="111"/>
+        <source>Unable to log in.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MMainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="71"/>
         <source>Profile:</source>
-        <translation>Profil:</translation>
+        <translation type="obsolete">Profil:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="75"/>
         <source>Alternate Hostname:</source>
-        <translation>ALternativer Hostname:</translation>
+        <translation type="obsolete">ALternativer Hostname:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="78"/>
         <source>Server URL:</source>
-        <translation>Server-URL:</translation>
+        <translation type="obsolete">Server-URL:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="81"/>
         <source>Proxy:</source>
-        <translation>Proxy:</translation>
+        <translation type="obsolete">Proxy:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="102"/>
         <source>Username:</source>
-        <translation>Benutzername:</translation>
+        <translation type="obsolete">Benutzername:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="105"/>
         <source>Password:</source>
-        <translation>Passwort:</translation>
+        <translation type="obsolete">Passwort:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="196"/>
         <source>New Profile</source>
-        <translation>Neues Profil</translation>
+        <translation type="obsolete">Neues Profil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="196"/>
         <source>Please enter a profile name. It must be non-empty and must not be used yet:</source>
-        <translation>Bitte geben Sie einen Profilnamen ein (mind. 1 Zeichen):</translation>
+        <translation type="obsolete">Bitte geben Sie einen Profilnamen ein (mind. 1 Zeichen):</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
         <source>Proxy Username:</source>
-        <translation>Nutzername Proxy:</translation>
+        <translation type="obsolete">Nutzername Proxy:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="93"/>
         <source>Proxy Password:</source>
-        <translation>Passwort Proxy:</translation>
+        <translation type="obsolete">Passwort Proxy:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="336"/>
         <source>Warning</source>
-        <translation>Warnung</translation>
+        <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="216"/>
         <source>Unable to log in. Error: %1</source>
         <translation type="obsolete">Login fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="48"/>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="49"/>
         <source>&amp;New Profile...</source>
-        <translation>&amp;Neues Profil</translation>
+        <translation type="obsolete">&amp;Neues Profil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="50"/>
         <source>&amp;Save Profile</source>
-        <translation>Profil &amp;speichern</translation>
+        <translation type="obsolete">Profil &amp;speichern</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="52"/>
         <source>&amp;Close Window</source>
-        <translation>&amp;Fenster schließen</translation>
+        <translation type="obsolete">&amp;Fenster schließen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="53"/>
         <source>&amp;Configure</source>
-        <translation>&amp;Konfigurieren</translation>
+        <translation type="obsolete">&amp;Konfigurieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="114"/>
         <source>new Profile</source>
-        <translation>Neues Profil</translation>
+        <translation type="obsolete">Neues Profil</translation>
+    </message>
+    <message>
+        <source>save Profile</source>
+        <translation type="obsolete">Profil speichern</translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="obsolete">Login</translation>
+    </message>
+    <message>
+        <source>&amp;Language...</source>
+        <translation type="obsolete">&amp;Sprache</translation>
+    </message>
+    <message>
+        <source>&amp;Export Host Key...</source>
+        <translation type="obsolete">Hostkey &amp;exportieren...</translation>
+    </message>
+    <message>
+        <source>&amp;Import Host Key...</source>
+        <translation type="obsolete">Hostkey &amp;importieren...</translation>
+    </message>
+    <message>
+        <source>&amp;Generate Host Key...</source>
+        <translation type="obsolete">Hostkey &amp;generieren...</translation>
+    </message>
+    <message>
+        <source>Export Key to File</source>
+        <translation type="obsolete">Key als Datei speichern</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1 for writing: %2</source>
+        <translation type="obsolete">Datei %1 kann zum Schreiben nicht geöffnet werden: %2</translation>
+    </message>
+    <message>
+        <source>Importing a key overwrites the host key that is currently used by this program. This may disable your accounts. Do you still want to continue?</source>
+        <translation type="obsolete">Der Import eines Keys Ã¼berschreibt den aktuellen Key des Programms. Dies könnte Ihre Accounts unbenutzbar machen. Trotzdem fortfahren?</translation>
+    </message>
+    <message>
+        <source>Import Key from File</source>
+        <translation type="obsolete">Key aus Datei importieren</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1 for reading: %2</source>
+        <translation type="obsolete">Datei %1 kann zum Lesen nicht geöffnet werden: %2</translation>
+    </message>
+    <message>
+        <source>This is not a host key file.</source>
+        <translation type="obsolete">Dies ist keine Hostkeydatei.</translation>
+    </message>
+    <message>
+        <source>This host key file does not contain a valid key.</source>
+        <translation type="obsolete">Diese Datei enthält keinen gültigen Hostkey.</translation>
+    </message>
+    <message>
+        <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
+        <translation type="obsolete">Die Checksumme dieser Datei ist fehlgeschlagen. Bitte besorgen Sie eine neue Kopie der Datei.</translation>
+    </message>
+    <message>
+        <source>New Host Name</source>
+        <translation type="obsolete">Neuer Hostname</translation>
+    </message>
+    <message>
+        <source>Please enter a name for the new host:</source>
+        <translation type="obsolete">Bitte geben Sie einen Hostnamen ein:</translation>
+    </message>
+    <message>
+        <source>The host name must only consist of letters, digits and underscore. It must start with a letter.</source>
+        <translation type="obsolete">Der Hostname darf nur aus Buchstaben, Ziffern und Unterstrich bestehen.</translation>
+    </message>
+    <message>
+        <source>This host key file does not contain a valid host name.</source>
+        <translation type="obsolete">Die Hostkeydatei enthält keinen gültigen Hostnamen.</translation>
+    </message>
+    <message>
+        <source>&amp;OpenOffice.org Settings...</source>
+        <translation type="obsolete">OpenOffice Einstellungen...</translation>
+    </message>
+</context>
+<context>
+    <name>MMoneyLog</name>
+    <message>
+        <location filename="dialogs/moneylog.cpp" line="27"/>
+        <source>Money Log of %1 %2</source>
+        <translation>Geldtransfers von %1 %2</translation>
+    </message>
+    <message>
+        <location filename="dialogs/moneylog.cpp" line="40"/>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+</context>
+<context>
+    <name>MOCartOrder</name>
+    <message>
+        <location filename="wob/MOCartOrder.cpp" line="28"/>
+        <location filename="wob/MOCartOrder.cpp" line="37"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="116"/>
-        <source>save Profile</source>
-        <translation>Profil speichern</translation>
+        <location filename="wob/MOCartOrder.cpp" line="29"/>
+        <location filename="wob/MOCartOrder.cpp" line="38"/>
+        <source>SaleOnly</source>
+        <oldsource>saleonly</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="119"/>
-        <source>Login</source>
-        <translation>Login</translation>
+        <location filename="wob/MOCartOrder.cpp" line="30"/>
+        <location filename="wob/MOCartOrder.cpp" line="39"/>
+        <source>OrderOnly</source>
+        <oldsource>orderonly</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="54"/>
-        <source>&amp;Language...</source>
-        <translation>&amp;Sprache</translation>
+        <location filename="wob/MOCartOrder.cpp" line="31"/>
+        <location filename="wob/MOCartOrder.cpp" line="40"/>
+        <source>Invalid</source>
+        <oldsource>invalid</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="56"/>
-        <source>&amp;Export Host Key...</source>
-        <translation>Hostkey &amp;exportieren...</translation>
+        <location filename="wob/MOCartOrder.cpp" line="28"/>
+        <location filename="wob/MOCartOrder.cpp" line="37"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="57"/>
-        <source>&amp;Import Host Key...</source>
-        <translation>Hostkey &amp;importieren...</translation>
+        <location filename="wob/MOCartOrder.cpp" line="29"/>
+        <location filename="wob/MOCartOrder.cpp" line="38"/>
+        <source>SaleOnly</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="58"/>
-        <source>&amp;Generate Host Key...</source>
-        <translation>Hostkey &amp;generieren...</translation>
+        <location filename="wob/MOCartOrder.cpp" line="30"/>
+        <location filename="wob/MOCartOrder.cpp" line="39"/>
+        <source>OrderOnly</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="277"/>
-        <source>Export Key to File</source>
-        <translation>Key als Datei speichern</translation>
+        <location filename="wob/MOCartOrder.cpp" line="31"/>
+        <location filename="wob/MOCartOrder.cpp" line="40"/>
+        <source>Invalid</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOCartTicket</name>
     <message>
-        <location filename="mainwindow.cpp" line="286"/>
-        <source>Unable to open file %1 for writing: %2</source>
-        <translation>Datei %1 kann zum Schreiben nicht geöffnet werden: %2</translation>
+        <location filename="wob/MOCartTicket.cpp" line="30"/>
+        <location filename="wob/MOCartTicket.cpp" line="40"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="297"/>
-        <source>Importing a key overwrites the host key that is currently used by this program. This may disable your accounts. Do you still want to continue?</source>
-        <translation>Der Import eines Keys Ã¼berschreibt den aktuellen Key des Programms. Dies könnte Ihre Accounts unbenutzbar machen. Trotzdem fortfahren?</translation>
+        <location filename="wob/MOCartTicket.cpp" line="31"/>
+        <location filename="wob/MOCartTicket.cpp" line="41"/>
+        <source>TooLate</source>
+        <oldsource>toolate</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="300"/>
-        <source>Import Key from File</source>
-        <translation>Key aus Datei importieren</translation>
+        <location filename="wob/MOCartTicket.cpp" line="32"/>
+        <location filename="wob/MOCartTicket.cpp" line="42"/>
+        <source>Exhausted</source>
+        <oldsource>exhausted</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="309"/>
-        <source>Unable to open file %1 for reading: %2</source>
-        <translation>Datei %1 kann zum Lesen nicht geöffnet werden: %2</translation>
+        <location filename="wob/MOCartTicket.cpp" line="33"/>
+        <location filename="wob/MOCartTicket.cpp" line="43"/>
+        <source>SaleOnly</source>
+        <oldsource>saleonly</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="321"/>
-        <source>This is not a host key file.</source>
-        <translation>Dies ist keine Hostkeydatei.</translation>
+        <location filename="wob/MOCartTicket.cpp" line="34"/>
+        <location filename="wob/MOCartTicket.cpp" line="44"/>
+        <source>OrderOnly</source>
+        <oldsource>orderonly</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="331"/>
-        <source>This host key file does not contain a valid key.</source>
-        <translation>Diese Datei enthält keinen gültigen Hostkey.</translation>
+        <location filename="wob/MOCartTicket.cpp" line="30"/>
+        <location filename="wob/MOCartTicket.cpp" line="40"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="336"/>
-        <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>
+        <location filename="wob/MOCartTicket.cpp" line="31"/>
+        <location filename="wob/MOCartTicket.cpp" line="41"/>
+        <source>TooLate</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
-        <source>New Host Name</source>
-        <translation>Neuer Hostname</translation>
+        <location filename="wob/MOCartTicket.cpp" line="32"/>
+        <location filename="wob/MOCartTicket.cpp" line="42"/>
+        <source>Exhausted</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
-        <source>Please enter a name for the new host:</source>
-        <translation>Bitte geben Sie einen Hostnamen ein:</translation>
+        <location filename="wob/MOCartTicket.cpp" line="33"/>
+        <location filename="wob/MOCartTicket.cpp" line="43"/>
+        <source>SaleOnly</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="265"/>
-        <source>The host name must only consist of letters, digits and underscore. It must start with a letter.</source>
-        <translation>Der Hostname darf nur aus Buchstaben, Ziffern und Unterstrich bestehen.</translation>
+        <location filename="wob/MOCartTicket.cpp" line="34"/>
+        <location filename="wob/MOCartTicket.cpp" line="44"/>
+        <source>OrderOnly</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOCartVoucher</name>
     <message>
-        <location filename="mainwindow.cpp" line="326"/>
-        <source>This host key file does not contain a valid host name.</source>
-        <translation>Die Hostkeydatei enthält keinen gültigen Hostnamen.</translation>
+        <location filename="wob/MOCartVoucher.cpp" line="26"/>
+        <location filename="wob/MOCartVoucher.cpp" line="34"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="60"/>
-        <source>&amp;OpenOffice.org Settings...</source>
-        <translation>OpenOffice Einstellungen...</translation>
+        <location filename="wob/MOCartVoucher.cpp" line="27"/>
+        <location filename="wob/MOCartVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
+        <oldsource>invalidvalue</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="61"/>
-        <source>Set &amp;Default Label Font...</source>
+        <location filename="wob/MOCartVoucher.cpp" line="28"/>
+        <location filename="wob/MOCartVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
+        <oldsource>invalidprice</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="224"/>
-        <source>Unable to log in.</source>
+        <location filename="wob/MOCartVoucher.cpp" line="26"/>
+        <location filename="wob/MOCartVoucher.cpp" line="34"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="353"/>
-        <source>Chose Default Font</source>
+        <location filename="wob/MOCartVoucher.cpp" line="27"/>
+        <location filename="wob/MOCartVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="353"/>
-        <source>Please chose a default font:</source>
+        <location filename="wob/MOCartVoucher.cpp" line="28"/>
+        <location filename="wob/MOCartVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MMoneyLog</name>
+    <name>MOOrderAbstract</name>
     <message>
-        <location filename="moneylog.cpp" line="27"/>
-        <source>Money Log of %1 %2</source>
-        <translation>Geldtransfers von %1 %2</translation>
+        <location filename="wob/MOOrderAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="43"/>
+        <source>Placed</source>
+        <oldsource>placed</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="moneylog.cpp" line="40"/>
-        <source>Close</source>
-        <translation>Schließen</translation>
+        <location filename="wob/MOOrderAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="44"/>
+        <source>Sent</source>
+        <oldsource>sent</oldsource>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOAddress</name>
     <message>
-        <location filename="wob/MOAddress.cpp" line="108"/>
-        <source>Class MOAddress property addressid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="45"/>
+        <source>Sold</source>
+        <oldsource>sold</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOAddress.cpp" line="114"/>
-        <source>Class MOAddress property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
+        <oldsource>cancelled</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOArtist</name>
     <message>
-        <location filename="wob/MOArtist.cpp" line="60"/>
-        <source>Class MOArtist property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="47"/>
+        <source>Reserved</source>
+        <oldsource>reserved</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCartOrder</name>
     <message>
-        <location filename="wob/MOCartOrder.cpp" line="72"/>
-        <source>Class MOCartOrder property status is enum, invalid value was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="48"/>
+        <source>Closed</source>
+        <oldsource>closed</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartOrder.cpp" line="78"/>
-        <source>Class MOCartOrder property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="43"/>
+        <source>Placed</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCartTicket</name>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="79"/>
-        <source>Class MOCartTicket property eventid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="44"/>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="85"/>
-        <source>Class MOCartTicket property amount is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="45"/>
+        <source>Sold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="91"/>
-        <source>Class MOCartTicket property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="97"/>
-        <source>Class MOCartTicket property status is enum, invalid value was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="47"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="103"/>
-        <source>Class MOCartTicket property maxamount is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="48"/>
+        <source>Closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MOCartVoucher</name>
-    <message>
-        <location filename="wob/MOCartVoucher.cpp" line="65"/>
-        <source>Class MOCartVoucher property value is integer, but non-integer was found.</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>MOOrderInfoAbstract</name>
     <message>
-        <location filename="wob/MOCartVoucher.cpp" line="71"/>
-        <source>Class MOCartVoucher property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="43"/>
+        <source>Placed</source>
+        <oldsource>placed</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartVoucher.cpp" line="77"/>
-        <source>Class MOCartVoucher property status is enum, invalid value was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="44"/>
+        <source>Sent</source>
+        <oldsource>sent</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOContact</name>
     <message>
-        <location filename="wob/MOContact.cpp" line="61"/>
-        <source>Class MOContact property contactid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="45"/>
+        <source>Sold</source>
+        <oldsource>sold</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOContact.cpp" line="67"/>
-        <source>Class MOContact property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
+        <oldsource>cancelled</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOContact.cpp" line="73"/>
-        <source>Class MOContact property contacttypeid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="47"/>
+        <source>Reserved</source>
+        <oldsource>reserved</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOContactType</name>
     <message>
-        <location filename="wob/MOContactType.cpp" line="53"/>
-        <source>Class MOContactType property contacttypeid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="48"/>
+        <source>Closed</source>
+        <oldsource>closed</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCustomer</name>
     <message>
-        <location filename="wob/MOCustomer.cpp" line="77"/>
-        <source>Class MOCustomer property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="43"/>
+        <source>Placed</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCustomerShort</name>
     <message>
-        <location filename="wob/MOCustomerShort.cpp" line="46"/>
-        <source>Class MOCustomerShort property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="44"/>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOEvent</name>
     <message>
-        <location filename="wob/MOEvent.cpp" line="112"/>
-        <source>Class MOEvent property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="45"/>
+        <source>Sold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="118"/>
-        <source>Class MOEvent property start is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="124"/>
-        <source>Class MOEvent property end is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="47"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="130"/>
-        <source>Class MOEvent property capacity is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="48"/>
+        <source>Closed</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOTicketAbstract</name>
     <message>
-        <location filename="wob/MOEvent.cpp" line="161"/>
-        <source>Class MOEvent property amountSold is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="38"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="52"/>
+        <source>Reserved</source>
+        <oldsource>reserved</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="167"/>
-        <source>Class MOEvent property amountReserved is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="39"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="53"/>
+        <source>Ordered</source>
+        <oldsource>ordered</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="177"/>
-        <source>Class MOEvent property tax is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="40"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="54"/>
+        <source>Used</source>
+        <oldsource>used</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOOrder</name>
     <message>
-        <location filename="wob/MOOrder.cpp" line="111"/>
-        <source>Class MOOrder property orderid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="41"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="55"/>
+        <source>Cancelled</source>
+        <oldsource>cancelled</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="117"/>
-        <source>Class MOOrder property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="42"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="56"/>
+        <source>Refund</source>
+        <oldsource>refund</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="138"/>
-        <source>Class MOOrder property amountpaid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="43"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="57"/>
+        <source>MaskBlock</source>
+        <oldsource>maskblock</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="144"/>
-        <source>Class MOOrder property state is enum, invalid value was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="44"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="58"/>
+        <source>MaskPay</source>
+        <oldsource>maskpay</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="150"/>
-        <source>Class MOOrder property amountdue is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="45"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="59"/>
+        <source>MaskUsable</source>
+        <oldsource>maskusable</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="156"/>
-        <source>Class MOOrder property totalprice is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="46"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="60"/>
+        <source>MaskReturnable</source>
+        <oldsource>maskreturnable</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="162"/>
-        <source>Class MOOrder property ordertime is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="38"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="52"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="168"/>
-        <source>Class MOOrder property senttime is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="39"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="53"/>
+        <source>Ordered</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOPrice</name>
     <message>
-        <location filename="wob/MOPrice.cpp" line="61"/>
-        <source>Class MOPrice property eventid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="40"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="54"/>
+        <source>Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOPrice.cpp" line="67"/>
-        <source>Class MOPrice property pricecategoryid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="41"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="55"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOPrice.cpp" line="73"/>
-        <source>Class MOPrice property maxavailable is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="42"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="56"/>
+        <source>Refund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOPrice.cpp" line="79"/>
-        <source>Class MOPrice property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="43"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="57"/>
+        <source>MaskBlock</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MORoom</name>
     <message>
-        <location filename="wob/MORoom.cpp" line="57"/>
-        <source>Class MORoom property capacity is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="44"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="58"/>
+        <source>MaskPay</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOShipping</name>
     <message>
-        <location filename="wob/MOShipping.cpp" line="61"/>
-        <source>Class MOShipping property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="45"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="59"/>
+        <source>MaskUsable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOShipping.cpp" line="67"/>
-        <source>Class MOShipping property cost is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="46"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="60"/>
+        <source>MaskReturnable</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MOTicket</name>
-    <message>
-        <location filename="wob/MOTicket.cpp" line="90"/>
-        <source>Class MOTicket property eventid is integer, but non-integer was found.</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>MOVoucher</name>
     <message>
-        <location filename="wob/MOTicket.cpp" line="96"/>
-        <source>Class MOTicket property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="26"/>
+        <location filename="wob/MOVoucher.cpp" line="34"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOTicket.cpp" line="102"/>
-        <source>Class MOTicket property status is enum, invalid value was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="27"/>
+        <location filename="wob/MOVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
+        <oldsource>invalidvalue</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOTicket.cpp" line="108"/>
-        <source>Class MOTicket property orderid is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="28"/>
+        <location filename="wob/MOVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
+        <oldsource>invalidprice</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOVoucher</name>
     <message>
-        <location filename="wob/MOVoucher.cpp" line="78"/>
-        <source>Class MOVoucher property value is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="26"/>
+        <location filename="wob/MOVoucher.cpp" line="34"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOVoucher.cpp" line="84"/>
-        <source>Class MOVoucher property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="27"/>
+        <location filename="wob/MOVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOVoucher.cpp" line="90"/>
-        <source>Class MOVoucher property status is enum, invalid value was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="28"/>
+        <location filename="wob/MOVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MOfficeConfig</name>
     <message>
-        <location filename="office.cpp" line="102"/>
+        <location filename="templates/office.cpp" line="102"/>
         <source>Configure OpenOffice.org Access</source>
         <translation>Zugriff auf OpenOffice Konfigurieren</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="112"/>
+        <location filename="templates/office.cpp" line="112"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="114"/>
+        <location filename="templates/office.cpp" line="114"/>
         <source>Path to Executable:</source>
         <translation>Pfad zum Programm:</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="116"/>
+        <location filename="templates/office.cpp" line="116"/>
         <source>...</source>
         <comment>select OpenOffice path button</comment>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="119"/>
+        <location filename="templates/office.cpp" line="119"/>
         <source>Printing ODF</source>
         <translation>ODF Drucken</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="122"/>
+        <location filename="templates/office.cpp" line="122"/>
         <source>Printer:</source>
         <translation>Drucker:</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="125"/>
+        <location filename="templates/office.cpp" line="125"/>
         <source>(Default Printer)</source>
         <translation>(Standarddrucker)</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="135"/>
+        <location filename="templates/office.cpp" line="135"/>
         <source>Always confirm printer when printing ODF</source>
         <translation>Drucker bestägen, wenn ODF gedruckt wird.</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="137"/>
+        <location filename="templates/office.cpp" line="137"/>
         <source>Save printed files</source>
         <translation>Gedruckte Dateien auch speichern</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="140"/>
+        <location filename="templates/office.cpp" line="140"/>
         <source>Opening ODF</source>
         <translation>ODF Ã–ffnen</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="142"/>
+        <location filename="templates/office.cpp" line="142"/>
         <source>Always open as Read-Only</source>
         <translation>Immer im Nur-Lese-Modus Ã¶ffnen</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="144"/>
+        <location filename="templates/office.cpp" line="144"/>
         <source>Automatically open all newly created files</source>
         <translation>Alle neuen Dateien automatisch Ã¶ffnen</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="150"/>
+        <location filename="templates/office.cpp" line="150"/>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="153"/>
+        <location filename="templates/office.cpp" line="153"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="173"/>
+        <location filename="templates/office.cpp" line="173"/>
         <source>Select OpenOffice.org executable</source>
         <translation>OpenOffice.org Programm wählen</translation>
     </message>
@@ -1204,115 +2032,99 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrder</name>
     <message>
-        <location filename="order.cpp" line="122"/>
         <source>placed</source>
         <comment>state</comment>
         <translation type="obsolete">bestellt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="123"/>
         <source>sent</source>
         <comment>state</comment>
         <translation type="obsolete">versandt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="124"/>
         <source>cancelled</source>
         <comment>state</comment>
         <translation type="obsolete">storniert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="125"/>
         <source>closed</source>
         <comment>state</comment>
         <translation type="obsolete">geschlossen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="127"/>
         <source>check: ok</source>
         <comment>state</comment>
         <translation type="obsolete">Prüfung: ok</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="128"/>
         <source>check: sale only</source>
         <comment>state</comment>
         <translation type="obsolete">Prüfung: nur verkaufen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="129"/>
         <source>check: order only</source>
         <comment>state</comment>
         <translation type="obsolete">Prüfung: nur bestellen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="130"/>
         <source>check: failed</source>
         <comment>state</comment>
         <translation type="obsolete">Prüfung: nicht möglich</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="131"/>
         <source>invalid</source>
         <comment>state</comment>
         <translation type="obsolete">ungültig</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="181"/>
+        <location filename="iface/order.cpp" line="159"/>
+        <location filename="iface/order.cpp" line="181"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
         <translation>ddd, dd.MM.yyyy hh:mm &apos;Uhr&apos;</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="192"/>
+        <location filename="iface/order.cpp" line="170"/>
+        <location filename="iface/order.cpp" line="192"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation>d.M.yyyy</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="445"/>
         <source>This ticket is not part of this order.</source>
         <translation type="obsolete">Dieses Ticket ist in keiner Bestellung enthalten.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="531"/>
         <source>Error</source>
         <translation type="obsolete">Fehler</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="527"/>
         <source>The request failed.</source>
         <translation type="obsolete">Anfrage ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="531"/>
         <source>A problem occurred during the order: %1</source>
         <translation type="obsolete">Die Bestellung ist fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="126"/>
         <source>reserved</source>
         <comment>state</comment>
         <translation type="obsolete">reserviert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="454"/>
         <source>Cannot query DB, don&apos;t know it.</source>
         <translation type="obsolete">Interner Fehler: Kann die Datenbank nicht abfragen.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="466"/>
         <source>Cannot update shipping: error while sending.</source>
         <translation type="obsolete">Kann Versandinformationen nicht senden: Sendefehler.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="486"/>
         <source>This voucher is not part of this order.</source>
         <translation type="obsolete">Dieser Gutschein ist nicht Teil der Bestellung.</translation>
     </message>
@@ -1320,17 +2132,17 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrderItemView</name>
     <message>
-        <location filename="orderwin.cpp" line="988"/>
+        <location filename="dialogs/orderwin.cpp" line="978"/>
         <source>Preview Tickets</source>
         <translation>Karten-Vorschau</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="996"/>
+        <location filename="dialogs/orderwin.cpp" line="986"/>
         <source>Ticket: </source>
         <translation>Eintrittskarte:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="998"/>
+        <location filename="dialogs/orderwin.cpp" line="988"/>
         <source>Voucher: </source>
         <translation>Gutschein:</translation>
     </message>
@@ -1338,816 +2150,879 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrderWindow</name>
     <message>
-        <location filename="orderwin.cpp" line="52"/>
+        <location filename="dialogs/orderwin.cpp" line="52"/>
         <source>Order Details</source>
         <translation>Bestelldetails</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="57"/>
+        <location filename="dialogs/orderwin.cpp" line="57"/>
         <source>&amp;Order</source>
         <translation>&amp;Bestellung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="58"/>
+        <location filename="dialogs/orderwin.cpp" line="58"/>
         <source>&amp;Order...</source>
         <translation>&amp;Bestellung...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="61"/>
         <source>&amp;Sell...</source>
-        <translation>&amp;Verkauf...</translation>
+        <translation type="obsolete">&amp;Verkauf...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="69"/>
+        <location filename="dialogs/orderwin.cpp" line="60"/>
         <source>C&amp;ancel Order...</source>
         <translation>Bestellung &amp;Stornieren...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="89"/>
+        <location filename="dialogs/orderwin.cpp" line="79"/>
         <source>&amp;Close</source>
         <translation>S&amp;chließen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="91"/>
+        <location filename="dialogs/orderwin.cpp" line="81"/>
         <source>&amp;Payment</source>
         <translation>&amp;Bezahlung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="93"/>
+        <location filename="dialogs/orderwin.cpp" line="83"/>
         <source>Receive &amp;Payment...</source>
         <translation>&amp;bezahlen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="95"/>
+        <location filename="dialogs/orderwin.cpp" line="85"/>
         <source>&amp;Refund...</source>
         <translation>&amp;zurückgeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="100"/>
+        <location filename="dialogs/orderwin.cpp" line="90"/>
         <source>P&amp;rinting</source>
         <translation>&amp;Druck</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="102"/>
+        <location filename="dialogs/orderwin.cpp" line="92"/>
         <source>Print &amp;Bill...</source>
         <translation>&amp;Rechnung drucken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="103"/>
+        <location filename="dialogs/orderwin.cpp" line="93"/>
         <source>Save Bill &amp;as file...</source>
         <translation>Rechnung &amp;speichern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="105"/>
+        <location filename="dialogs/orderwin.cpp" line="95"/>
         <source>Print &amp;Tickets...</source>
         <translation>&amp;Eintrittskarten drucken...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Print &amp;Current Ticket...</source>
         <translation type="obsolete">markierte Eintrittskarte drucken</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;View Tickets...</source>
         <translation type="obsolete">Eintrittskarten &amp;ansehen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="119"/>
+        <location filename="dialogs/orderwin.cpp" line="109"/>
         <source>Order ID:</source>
         <translation>Bestell-Nr.:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="121"/>
+        <location filename="dialogs/orderwin.cpp" line="111"/>
         <source>Order Date:</source>
         <translation>Bestelldatum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="123"/>
+        <location filename="dialogs/orderwin.cpp" line="113"/>
         <source>Shipping Date:</source>
         <translation>Versandtdatum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="125"/>
+        <location filename="dialogs/orderwin.cpp" line="115"/>
         <source>Customer:</source>
         <translation>Kunde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="130"/>
+        <location filename="dialogs/orderwin.cpp" line="120"/>
         <source>Sold by:</source>
         <translation>Verkauft durch:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="132"/>
+        <location filename="dialogs/orderwin.cpp" line="122"/>
         <source>Total Price:</source>
         <translation>Gesamtpreis:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="134"/>
+        <location filename="dialogs/orderwin.cpp" line="124"/>
         <source>Already Paid:</source>
         <translation>bereits bezahlt:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="136"/>
+        <location filename="dialogs/orderwin.cpp" line="126"/>
         <source>Order State:</source>
         <translation>Bestellstatus:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ticket ID</source>
         <translation type="obsolete">Karten-Nr.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Event</source>
         <translation type="obsolete">Veranstaltung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Start Time</source>
         <translation type="obsolete">Anfangszeit</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Status</source>
         <translation type="obsolete">Status</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Price</source>
         <translation type="obsolete">Preis</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="72"/>
+        <location filename="dialogs/orderwin.cpp" line="62"/>
         <source>&amp;Mark Order as Shipped...</source>
         <translation>Bestellung als versandt markieren...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ch&amp;ange Ticket-Price...</source>
         <translation type="obsolete">Kartenpreis Ã¤ndern...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Return Ticket...</source>
         <translation type="obsolete">Karte zurückgeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="979"/>
+        <location filename="dialogs/orderwin.cpp" line="969"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="275"/>
         <source>Unable to get template file (ticket.xtt). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (ticket.xtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (bill.odtt). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (bill.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="878"/>
         <source>Mark as shipped?</source>
         <translation type="obsolete">Als versandt markieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="878"/>
         <source>Mark this order as shipped now?</source>
         <translation type="obsolete">Diese Bestellung jetzt als versandt markieren?</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (eventsummary.odtt) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="649"/>
         <source>Enter Payment</source>
         <translation type="obsolete">Zahlbetrag eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="649"/>
         <source>Please enter the amount that has been paid:</source>
         <translation type="obsolete">Bitte geben Sie den Betrag ein, der bezahlt wurde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="682"/>
         <source>Unable to submit payment request.</source>
         <translation type="obsolete">Kann Bestellung nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="686"/>
         <source>Error while trying to pay: %1</source>
         <translation type="obsolete">Fehler während der Bezahlung: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="704"/>
         <source>Enter Refund</source>
         <translation type="obsolete">Rückgabe eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="704"/>
         <source>Please enter the amount that will be refunded:</source>
         <translation type="obsolete">Bitte geben Sie den Betrag ein, der zurückgegeben wird:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="710"/>
         <source>Unable to submit refund request.</source>
         <translation type="obsolete">Kann Rückgabe nicht Ã¼bermitteln.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="714"/>
         <source>Error whily trying to refund: %1</source>
         <translation type="obsolete">Fehler während der Rückgabe: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="774"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation type="obsolete">Diese Karte kann nicht zurückgegeben werden: sie wurde bereits verwendet.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="778"/>
         <source>Return Ticket</source>
         <translation type="obsolete">Karte zurückgeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="778"/>
         <source>Do you really want to return this ticket?</source>
         <translation type="obsolete">Wollen Sie diese Karte wirklich zurückgeben?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="811"/>
         <source>Cancel Order?</source>
         <translation type="obsolete">Bestellung stornieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="811"/>
         <source>Cancel this order now?</source>
         <translation type="obsolete">Diese Bestellung jetzt stornieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="813"/>
         <source>Cannot cancel this order: it is in the wrong state.</source>
         <translation type="obsolete">Diese Bestellung kann nicht: sie ist im falschen Zustand.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="817"/>
         <source>Failed to cancel this order.</source>
         <translation type="obsolete">Kann diese Bestellung nicht stornieren. Schade.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="127"/>
+        <location filename="dialogs/orderwin.cpp" line="117"/>
         <source>Delivery Address:</source>
         <translation>Lieferadresse:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="dialogs/orderwin.cpp" line="133"/>
         <source>Order Comment:</source>
         <translation>Bestellkommentar:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="79"/>
+        <location filename="dialogs/orderwin.cpp" line="69"/>
         <source>Change Commen&amp;t...</source>
         <translation>Kommen&amp;tar Ã¤ndern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="912"/>
         <source>Set comment: order %1</source>
         <translation type="obsolete">Kommentar Ã¤ndern: Bestellung %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="923"/>
         <source>&amp;Save</source>
         <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="925"/>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="66"/>
         <source>&amp;Prune and recheck...</source>
-        <translation>Ungültige Einträge entfernen und erneut checken...</translation>
+        <translation type="obsolete">Ungültige Einträge entfernen und erneut checken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="64"/>
         <source>Ma&amp;ke Reservation...</source>
-        <translation>Reservierung durchführen...</translation>
+        <translation type="obsolete">Reservierung durchführen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="75"/>
+        <location filename="dialogs/orderwin.cpp" line="65"/>
         <source>Ch&amp;ange Item-Price...</source>
         <translation>Artikelpreis Ã¤ndern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="77"/>
+        <location filename="dialogs/orderwin.cpp" line="67"/>
         <source>&amp;Return Item...</source>
         <translation>Artikel zurückgeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="81"/>
+        <location filename="dialogs/orderwin.cpp" line="71"/>
         <source>Change Sh&amp;ipping Method...</source>
         <translation>Versandoption Ã¤ndern...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="106"/>
+        <location filename="dialogs/orderwin.cpp" line="96"/>
         <source>Print V&amp;ouchers...</source>
         <translation>Gutscheine drucken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="107"/>
+        <location filename="dialogs/orderwin.cpp" line="97"/>
         <source>Print &amp;Current Item...</source>
         <translation>Aktuellen Artikel drucken...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="108"/>
+        <location filename="dialogs/orderwin.cpp" line="98"/>
         <source>&amp;View Items...</source>
         <translation>Artikel ansehen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="dialogs/orderwin.cpp" line="128"/>
         <source>Shipping Method:</source>
         <translation>Versandoption:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="141"/>
+        <location filename="dialogs/orderwin.cpp" line="131"/>
         <source>Shipping Costs:</source>
         <translation>Versandkosten:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Item ID</source>
         <translation type="obsolete">Artikelnummer:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Description</source>
         <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="194"/>
         <source>Voucher (current value: %1)</source>
         <translation type="obsolete">Gutschein (aktueller Wert: %1)</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="269"/>
         <source>There are no tickets left to print.</source>
         <translation type="obsolete">Es gibt keine Eintrittskarten zu drucken.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="310"/>
         <source>There are no vouchers left to print.</source>
         <translation type="obsolete">Es gibt keine Gutscheine zu drucken.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="316"/>
         <source>Unable to get template file (voucher.xtt). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (voucher) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="414"/>
         <source>Unable to get template file (bill). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (bill) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (eventsummary). Giving up.</source>
         <translation type="obsolete">Kann Vorlage (eventsummary) nicht finden. Gebe auf.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="422"/>
         <source>Open Document File (*.%1)</source>
         <translation type="obsolete">ODF Datei (*.%1)</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="741"/>
-        <source>Enter Price</source>
-        <translation type="obsolete">Bitte Preis eingeben</translation>
+        <source>Enter Price</source>
+        <translation type="obsolete">Bitte Preis eingeben</translation>
+    </message>
+    <message>
+        <source>Please enter the new price for the ticket:</source>
+        <translation type="obsolete">Bitte neuen Preis für die Eintrittskarte eingeben:</translation>
+    </message>
+    <message>
+        <source>Cannot change this item type.</source>
+        <translation type="obsolete">Diese Artikelart kann nicht geändert werden.</translation>
+    </message>
+    <message>
+        <source>This voucher cannot be returned, it has already been used.</source>
+        <translation type="obsolete">Diese Karte kann nicht zurückgegeben werden: sie wurde bereits verwendet.</translation>
+    </message>
+    <message>
+        <source>Return Voucher</source>
+        <translation type="obsolete">Gutschein zurückgeben</translation>
+    </message>
+    <message>
+        <source>Do you really want to return this voucher?</source>
+        <translation type="obsolete">Wollen Sie diesen Gutschein wirklich zurückgeben?</translation>
+    </message>
+    <message>
+        <source>Cannot return this item type.</source>
+        <translation type="obsolete">Diese Artikelart kann nicht zurückgegeben werden.</translation>
+    </message>
+    <message>
+        <source>Set shipping time</source>
+        <translation type="obsolete">Versandzeit setzen</translation>
+    </message>
+    <message>
+        <source>Enter the shipping time:</source>
+        <translation type="obsolete">Bitte geben Sie die Versandzeit ein:</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="obsolete">Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="obsolete">Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="dialogs/orderwin.cpp" line="74"/>
+        <source>MoneyLog for Order...</source>
+        <translation>Geldtransfers von Bestellung...</translation>
+    </message>
+    <message>
+        <location filename="dialogs/orderwin.cpp" line="76"/>
+        <source>MoneyLog for selected Voucher...</source>
+        <translation>Geldtransfers des selektierten Gutscheins...</translation>
+    </message>
+    <message>
+        <source>Enter Voucher</source>
+        <translation type="obsolete">Gutschein eingeben</translation>
+    </message>
+    <message>
+        <source>Please enter the ID of the voucher you want to use:</source>
+        <translation type="obsolete">Bitte geben Sie die Nummer des Gutscheins ein, den Sie verwenden wollen:</translation>
+    </message>
+    <message>
+        <source>This voucher is not valid.</source>
+        <translation type="obsolete">Dieser Gutschein ist nicht gültig.</translation>
+    </message>
+    <message>
+        <source>Voucher Info</source>
+        <translation type="obsolete">Gutscheininformation</translation>
+    </message>
+    <message>
+        <source>Remaining value of this voucher: %1</source>
+        <translation type="obsolete">Verbleibender Wert auf dem Gutschein: %1</translation>
+    </message>
+    <message>
+        <location filename="dialogs/orderwin.cpp" line="969"/>
+        <source>This is not a voucher, cannot show the money log.</source>
+        <translation>Dies ist kein Gutschein, kann keine Geldtransfers anzeigen.</translation>
+    </message>
+    <message>
+        <location filename="dialogs/orderwin.cpp" line="87"/>
+        <source>Pay with &amp;Voucher...</source>
+        <translation>Mit Gutschein bezahlen...</translation>
+    </message>
+</context>
+<context>
+    <name>MOrdersTab</name>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="53"/>
+        <source>-select mode-</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="54"/>
+        <source>All Orders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="55"/>
+        <source>Open Orders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="56"/>
+        <source>Open Reservations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="57"/>
+        <source>Outstanding Payments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="58"/>
+        <source>Outstanding Refunds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="59"/>
+        <source>Undelivered Orders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="61"/>
+        <source>-search result-</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="69"/>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="72"/>
+        <source>Details...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="76"/>
+        <source>Find by Ticket...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="79"/>
+        <source>Find by Event...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="82"/>
+        <source>Find by Customer...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="741"/>
-        <source>Please enter the new price for the ticket:</source>
-        <translation type="obsolete">Bitte neuen Preis für die Eintrittskarte eingeben:</translation>
+        <location filename="mwin/orderstab.cpp" line="85"/>
+        <source>Find by Order ID...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="747"/>
-        <source>Cannot change this item type.</source>
-        <translation type="obsolete">Diese Artikelart kann nicht geändert werden.</translation>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="795"/>
-        <source>This voucher cannot be returned, it has already been used.</source>
-        <translation type="obsolete">Diese Karte kann nicht zurückgegeben werden: sie wurde bereits verwendet.</translation>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Total</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="799"/>
-        <source>Return Voucher</source>
-        <translation type="obsolete">Gutschein zurückgeben</translation>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Paid</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="799"/>
-        <source>Do you really want to return this voucher?</source>
-        <translation type="obsolete">Wollen Sie diesen Gutschein wirklich zurückgeben?</translation>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Customer</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="806"/>
-        <source>Cannot return this item type.</source>
-        <translation type="obsolete">Diese Artikelart kann nicht zurückgegeben werden.</translation>
+        <location filename="mwin/orderstab.cpp" line="157"/>
+        <location filename="mwin/orderstab.cpp" line="181"/>
+        <location filename="mwin/orderstab.cpp" line="198"/>
+        <location filename="mwin/orderstab.cpp" line="202"/>
+        <location filename="mwin/orderstab.cpp" line="251"/>
+        <location filename="mwin/orderstab.cpp" line="279"/>
+        <location filename="mwin/orderstab.cpp" line="300"/>
+        <location filename="mwin/orderstab.cpp" line="304"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="882"/>
-        <source>Set shipping time</source>
-        <translation type="obsolete">Versandzeit setzen</translation>
+        <location filename="mwin/orderstab.cpp" line="157"/>
+        <location filename="mwin/orderstab.cpp" line="251"/>
+        <source>There was a problem retrieving the order list: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="888"/>
-        <source>Enter the shipping time:</source>
-        <translation type="obsolete">Bitte geben Sie die Versandzeit ein:</translation>
+        <location filename="mwin/orderstab.cpp" line="181"/>
+        <location filename="mwin/orderstab.cpp" line="300"/>
+        <source>Error while retrieving order: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="894"/>
-        <source>OK</source>
-        <translation type="obsolete">Ok</translation>
+        <location filename="mwin/orderstab.cpp" line="193"/>
+        <source>Enter Ticket</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="896"/>
-        <source>Cancel</source>
-        <translation type="obsolete">Abbrechen</translation>
+        <location filename="mwin/orderstab.cpp" line="193"/>
+        <source>Please enter the ID of one of the tickets of the order you seek:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="84"/>
-        <source>MoneyLog for Order...</source>
-        <translation>Geldtransfers von Bestellung...</translation>
+        <location filename="mwin/orderstab.cpp" line="198"/>
+        <source>Error while searching for order: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="86"/>
-        <source>MoneyLog for selected Voucher...</source>
-        <translation>Geldtransfers des selektierten Gutscheins...</translation>
+        <location filename="mwin/orderstab.cpp" line="202"/>
+        <source>Order for barcode &apos;%1&apos; not found.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="671"/>
-        <source>Enter Voucher</source>
-        <translation type="obsolete">Gutschein eingeben</translation>
+        <location filename="mwin/orderstab.cpp" line="215"/>
+        <source>Select Event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="671"/>
-        <source>Please enter the ID of the voucher you want to use:</source>
-        <translation type="obsolete">Bitte geben Sie die Nummer des Gutscheins ein, den Sie verwenden wollen:</translation>
+        <location filename="mwin/orderstab.cpp" line="228"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="676"/>
-        <source>This voucher is not valid.</source>
-        <translation type="obsolete">Dieser Gutschein ist nicht gültig.</translation>
+        <location filename="mwin/orderstab.cpp" line="230"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="695"/>
-        <source>Voucher Info</source>
-        <translation type="obsolete">Gutscheininformation</translation>
+        <location filename="mwin/orderstab.cpp" line="279"/>
+        <source>Error while retrieving order list: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="695"/>
-        <source>Remaining value of this voucher: %1</source>
-        <translation type="obsolete">Verbleibender Wert auf dem Gutschein: %1</translation>
+        <location filename="mwin/orderstab.cpp" line="295"/>
+        <source>Enter Order ID</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="979"/>
-        <source>This is not a voucher, cannot show the money log.</source>
-        <translation>Dies ist kein Gutschein, kann keine Geldtransfers anzeigen.</translation>
+        <location filename="mwin/orderstab.cpp" line="295"/>
+        <source>Please enter the ID of the order you want to display:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="97"/>
-        <source>Pay with &amp;Voucher...</source>
-        <translation>Mit Gutschein bezahlen...</translation>
+        <location filename="mwin/orderstab.cpp" line="304"/>
+        <source>This order does not exist.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MOverview</name>
     <message>
-        <location filename="overview.cpp" line="86"/>
+        <location filename="mwin/overview.cpp" line="67"/>
         <source>&amp;Session</source>
         <translation>&amp;Session</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="87"/>
+        <location filename="mwin/overview.cpp" line="68"/>
         <source>&amp;Re-Login</source>
         <translation>&amp;Login wiederholen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="94"/>
+        <location filename="mwin/overview.cpp" line="75"/>
         <source>&amp;Close Session</source>
         <translation>Session &amp;schließen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="96"/>
         <source>&amp;Event</source>
-        <translation>&amp;Veranstaltung</translation>
+        <translation type="obsolete">&amp;Veranstaltung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="108"/>
+        <location filename="mwin/overview.cpp" line="113"/>
         <source>&amp;Customer</source>
         <translation>&amp;Kunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="147"/>
+        <location filename="mwin/overview.cpp" line="86"/>
         <source>Events</source>
         <translation>Veranstaltungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1578"/>
+        <location filename="mwin/overview.cpp" line="186"/>
+        <location filename="mwin/overview.cpp" line="196"/>
+        <location filename="mwin/overview.cpp" line="489"/>
+        <location filename="mwin/overview.cpp" line="493"/>
+        <location filename="mwin/overview.cpp" line="514"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="411"/>
         <source>I was unable to renew the login at the server, the error was: %1</source>
         <translation type="obsolete">Der erneute Login ist fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="82"/>
         <source>&amp;Offline mode</source>
         <translation type="obsolete">&amp;Offlinemodus</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="101"/>
         <source>&amp;New Event...</source>
-        <translation>&amp;Neue Veranstaltung...</translation>
+        <translation type="obsolete">&amp;Neue Veranstaltung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="109"/>
+        <location filename="mwin/overview.cpp" line="114"/>
         <source>&amp;Show all customers</source>
         <translation>&amp;Alle Kunden anzeigen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="111"/>
         <source>C&amp;art</source>
-        <translation>&amp;Einkaufswagen</translation>
+        <translation type="obsolete">&amp;Einkaufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="112"/>
         <source>Add &amp;Ticket</source>
-        <translation>Eintrittskarte &amp;hinzufügen</translation>
+        <translation type="obsolete">Eintrittskarte &amp;hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="113"/>
         <source>Add &amp;Voucher</source>
-        <translation>&amp;Gutschein hinzufügen</translation>
+        <translation type="obsolete">&amp;Gutschein hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="114"/>
         <source>&amp;Remove Item</source>
-        <translation>&amp;Entfernen</translation>
+        <translation type="obsolete">&amp;Entfernen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="115"/>
         <source>&amp;Abort Shopping</source>
-        <translation>&amp;Einkauf abbrechen</translation>
+        <translation type="obsolete">&amp;Einkauf abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="157"/>
         <source>New Event...</source>
-        <translation>Neue Veranstaltung...</translation>
+        <translation type="obsolete">Neue Veranstaltung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="249"/>
         <source>Details...</source>
-        <translation>Details...</translation>
+        <translation type="obsolete">Details...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="164"/>
         <source>Order Ticket...</source>
-        <translation>Bestellen...</translation>
+        <translation type="obsolete">Bestellen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="178"/>
+        <location filename="mwin/overview.cpp" line="90"/>
         <source>Shopping Cart</source>
         <translation>Einkaufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="190"/>
         <source>Add Ticket</source>
-        <translation>Eintrittskarte hinzufügen</translation>
+        <translation type="obsolete">Eintrittskarte hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="192"/>
         <source>Add Voucher</source>
-        <translation>Gutschein hinzufügen</translation>
+        <translation type="obsolete">Gutschein hinzufügen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="194"/>
         <source>Remove Item</source>
-        <translation>Entfernen</translation>
+        <translation type="obsolete">Entfernen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="200"/>
         <source>Customer:</source>
-        <translation>Kunde</translation>
+        <translation type="obsolete">Kunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="209"/>
         <source>Delivery Address:</source>
-        <translation>Lieferadresse:</translation>
+        <translation type="obsolete">Lieferadresse:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="212"/>
         <source>Comments:</source>
-        <translation>Kommentare:</translation>
+        <translation type="obsolete">Kommentare:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="222"/>
         <source>Clear</source>
-        <translation>Zurücksetzen</translation>
+        <translation type="obsolete">Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="804"/>
         <source>Start Time</source>
-        <translation>Anfangszeit</translation>
+        <translation type="obsolete">Anfangszeit</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="804"/>
         <source>Title</source>
-        <translation>Titel</translation>
+        <translation type="obsolete">Titel</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="399"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
-        <translation>ddd, d.M.yyyy hh:mm</translation>
+        <translation type="obsolete">ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="97"/>
         <source>&amp;Update Event List</source>
-        <translation>&amp;Veranstaltungsliste auffrischen</translation>
+        <translation type="obsolete">&amp;Veranstaltungsliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="99"/>
         <source>&amp;Show/Edit details...</source>
-        <translation>&amp;Details anzeigen/editieren...</translation>
+        <translation type="obsolete">&amp;Details anzeigen/editieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="284"/>
+        <location filename="mwin/overview.cpp" line="107"/>
         <source>Users</source>
         <translation>Nutzer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="292"/>
         <source>New User...</source>
-        <translation>Neuer Nutzer...</translation>
+        <translation type="obsolete">Neuer Nutzer...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="295"/>
         <source>Delete User...</source>
-        <translation>Nutzer löschen...</translation>
+        <translation type="obsolete">Nutzer löschen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="299"/>
         <source>Description...</source>
-        <translation>Beschreibung.,.</translation>
+        <translation type="obsolete">Beschreibung.,.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="302"/>
         <source>Hosts...</source>
-        <translation>Hosts...</translation>
+        <translation type="obsolete">Hosts...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="305"/>
         <source>Roles...</source>
-        <translation>Rechte...</translation>
+        <translation type="obsolete">Rechte...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="314"/>
+        <location filename="mwin/overview.cpp" line="110"/>
         <source>Hosts</source>
         <translation>Hosts</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="506"/>
         <source>Login Name</source>
-        <translation>Loginname</translation>
+        <translation type="obsolete">Loginname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="506"/>
         <source>Description</source>
-        <translation>Beschreibung</translation>
+        <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="520"/>
         <source>New User</source>
-        <translation>Neuer Nutzer</translation>
+        <translation type="obsolete">Neuer Nutzer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="520"/>
         <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
-        <translation>Neuen Nutzernamen eingeben (Kleinbuchstaben, Ziffern, Unterstrich, Minus):</translation>
+        <translation type="obsolete">Neuen Nutzernamen eingeben (Kleinbuchstaben, Ziffern, Unterstrich, Minus):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="971"/>
         <source>Error</source>
-        <translation>Fehler</translation>
+        <translation type="obsolete">Fehler</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="570"/>
         <source>Edit Description</source>
-        <translation>Beschreibung Ã¤ndern</translation>
+        <translation type="obsolete">Beschreibung Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="570"/>
         <source>Descriptionof user %1:</source>
-        <translation>Beschreibung von Nutzer %1:</translation>
+        <translation type="obsolete">Beschreibung von Nutzer %1:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="88"/>
+        <location filename="mwin/overview.cpp" line="69"/>
         <source>Change my &amp;Password</source>
         <translation>Mein &amp;Passwort Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="308"/>
         <source>Set Password...</source>
-        <translation>Passwort setzen...</translation>
+        <translation type="obsolete">Passwort setzen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="322"/>
         <source>New Host...</source>
-        <translation>Neuer Host...</translation>
+        <translation type="obsolete">Neuer Host...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="325"/>
         <source>Add This Host...</source>
-        <translation>Diesen Host hinzufügen...</translation>
+        <translation type="obsolete">Diesen Host hinzufügen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="328"/>
         <source>Delete Host...</source>
-        <translation>Host löschen...</translation>
+        <translation type="obsolete">Host löschen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="332"/>
         <source>Generate New Key...</source>
-        <translation>Neuen Schlüssel anlegen...</translation>
+        <translation type="obsolete">Neuen Schlüssel anlegen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="335"/>
         <source>Import...</source>
-        <translation>Importieren...</translation>
+        <translation type="obsolete">Importieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="338"/>
         <source>Export...</source>
-        <translation>Exportieren...</translation>
+        <translation type="obsolete">Exportieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="529"/>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="529"/>
         <source>Please enter an initial password for the user:</source>
-        <translation>Bitte geben Sie ein intiales Passwort ein:</translation>
+        <translation type="obsolete">Bitte geben Sie ein intiales Passwort ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="544"/>
         <source>Delete User?</source>
-        <translation>Nutzer löschen?</translation>
+        <translation type="obsolete">Nutzer löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="544"/>
         <source>Really delete user &apos;%1&apos;?</source>
-        <translation>Nutzer &apos;%1&apos; wirklich löschen?</translation>
+        <translation type="obsolete">Nutzer &apos;%1&apos; wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="613"/>
+        <location filename="mwin/overview.cpp" line="196"/>
         <source>Error setting password: %1</source>
         <translation>Passwort kann nicht gesetzt werden: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="604"/>
         <source>The password must be non-empty and both lines must match</source>
         <translation type="obsolete">Das Passwort darf nicht leer sein und beide Zeilen müssen Ã¼bereinstimmen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="620"/>
         <source>Host Name</source>
         <translation type="obsolete">Hostname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="620"/>
         <source>Host Key</source>
         <translation type="obsolete">Hostkey</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="637"/>
         <source>Create New Host</source>
         <translation type="obsolete">Neuen Host anlegen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="637"/>
         <source>Please enter a host name:</source>
         <translation type="obsolete">Bitte geben Sie einen neuen Hostnamen ein:</translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="645"/>
         <source>The key of this new host could only be generated with %n bits entropy. Store anyway?</source>
         <translation type="obsolete">
             <numerusform>Der Key dieses Hosts konnte nur mit %n Bit Entropie angelegt werden. Trotzdem speichern?</numerusform>
@@ -2155,27 +3030,22 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="668"/>
         <source>Delete this Host?</source>
         <translation type="obsolete">Diesen Host löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="668"/>
         <source>Really delete host &apos;%1&apos;?</source>
         <translation type="obsolete">Den Host &apos;%1&apos; wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="682"/>
         <source>Change Host Key?</source>
         <translation type="obsolete">Hostkey Ã¤ndern?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="682"/>
         <source>Really change the key of host &apos;%1&apos;?</source>
         <translation type="obsolete">Den Key von Host &apos;%1&apos; wirklich Ã¤ndern?</translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="687"/>
         <source>The new key of this host could only be generated with %n bits entropy. Store anyway?</source>
         <translation type="obsolete">
             <numerusform>Der Key dieses Hosts konnte nur mit %n Bit Entropie angelegt werden. Trotzdem speichern?</numerusform>
@@ -2183,746 +3053,655 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="698"/>
         <source>Import Key from File</source>
         <translation type="obsolete">Key aus Datei importieren</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="707"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation type="obsolete">Datei %1 kann nicht zum Lesen geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="719"/>
         <source>This is not a host key file.</source>
         <translation type="obsolete">Dies ist keine Hostkeydatei.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="724"/>
         <source>This host key file does not contain a valid host name.</source>
         <translation type="obsolete">Die Hostkeydatei enthält keinen gültigen Hostnamen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="729"/>
         <source>This host key file does not contain a valid key.</source>
         <translation type="obsolete">Diese Datei enthält keinen gültigen Hostkey.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="734"/>
         <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
         <translation type="obsolete">Die Checksumme dieser Datei ist fehlgeschlagen. Bitte besorgen Sie eine neue Kopie der Datei.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="752"/>
         <source>This host cannot be exported.</source>
         <translation type="obsolete">Dieser Host kann nicht exportiert werden.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="757"/>
         <source>Export Key to File</source>
         <translation type="obsolete">Hostkey als Datei speichern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="766"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation type="obsolete">Datei %1 kann nicht zum Schreiben geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="219"/>
         <source>Check Order</source>
-        <translation>Bestellung prüfen</translation>
+        <translation type="obsolete">Bestellung prüfen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="226"/>
+        <location filename="mwin/overview.cpp" line="100"/>
         <source>Order List</source>
         <translation>Bestellungsliste</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="230"/>
         <source>-select mode-</source>
-        <translation>-Modus auswählen-</translation>
+        <translation type="obsolete">-Modus auswählen-</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="231"/>
         <source>All Orders</source>
-        <translation>Alle Bestellungen</translation>
+        <translation type="obsolete">Alle Bestellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="232"/>
         <source>Open Orders</source>
-        <translation>Offene Bestellungen</translation>
+        <translation type="obsolete">Offene Bestellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="234"/>
         <source>Outstanding Payments</source>
-        <translation>Noch nicht bezahlt</translation>
+        <translation type="obsolete">Noch nicht bezahlt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="235"/>
         <source>Outstanding Refunds</source>
-        <translation>Offene Rückerstattungen</translation>
+        <translation type="obsolete">Offene Rückerstattungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="804"/>
         <source>Amount</source>
-        <translation>Anzahl</translation>
+        <translation type="obsolete">Anzahl</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="835"/>
         <source>Select Event to order Ticket</source>
-        <translation>Bitte wählen Sie eine Verstaltung aus, um zu bestellen</translation>
+        <translation type="obsolete">Bitte wählen Sie eine Verstaltung aus, um zu bestellen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="848"/>
         <source>Select</source>
-        <translation>Auswählen</translation>
+        <translation type="obsolete">Auswählen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="851"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="967"/>
         <source>There is nothing in the order. Ignoring it.</source>
-        <translation>Bestellung ist leer. Vorgang abgebrochen.</translation>
+        <translation type="obsolete">Bestellung ist leer. Vorgang abgebrochen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="971"/>
         <source>Please chose a customer first!</source>
-        <translation>Bitte wählen Sie zunächst einen Kunden aus!</translation>
+        <translation type="obsolete">Bitte wählen Sie zunächst einen Kunden aus!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1004"/>
         <source>The request failed.</source>
         <translation type="obsolete">Anfrage ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1008"/>
         <source>A problem occurred during the order: %1</source>
         <translation type="obsolete">Die Bestellung ist fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="268"/>
+        <location filename="mwin/overview.cpp" line="104"/>
         <source>Entrance</source>
         <translation>Einlasskontrolle</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="168"/>
         <source>Event Summary...</source>
-        <translation>Veranstaltungsübersicht...</translation>
+        <translation type="obsolete">Veranstaltungsübersicht...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="236"/>
         <source>Undelivered Orders</source>
-        <translation>Nicht ausgelieferte Bestellungen</translation>
+        <translation type="obsolete">Nicht ausgelieferte Bestellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="246"/>
         <source>Update</source>
-        <translation>Auffrischen</translation>
+        <translation type="obsolete">Auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Status</source>
         <translation type="obsolete">Status</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Total</source>
         <translation type="obsolete">Gesamt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Paid</source>
         <translation type="obsolete">bezahlt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Customer</source>
         <translation type="obsolete">Kunde</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Upload Template...</source>
         <translation type="obsolete">Vorlage &amp;hochladen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="119"/>
+        <location filename="mwin/overview.cpp" line="116"/>
         <source>&amp;Misc</source>
         <translation>&amp;Verschiedenes</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Return ticket...</source>
         <translation type="obsolete">&amp;Karte zurückgeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="172"/>
         <source>Cancel Event...</source>
-        <translation>Veranstaltung absagen...</translation>
+        <translation type="obsolete">Veranstaltung absagen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="253"/>
         <source>Find by Ticket...</source>
-        <translation>Mit Kartennummer suchen...</translation>
+        <translation type="obsolete">Mit Kartennummer suchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="478"/>
         <source>Cancel Event</source>
-        <translation>Veranstaltung absagen</translation>
+        <translation type="obsolete">Veranstaltung absagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="478"/>
         <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>
+        <translation type="obsolete">Bitte geben Sie einen Grund für die Absage der Veranstaltung &quot;%1&quot; ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="482"/>
         <source>Event Cancelled</source>
-        <translation>Veranstaltung abgesagt</translation>
+        <translation type="obsolete">Veranstaltung abgesagt</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="482"/>
         <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>
+        <translation type="obsolete">Die Veranstaltung &quot;%1&quot; wurde abgesagt. Bitte informieren Sie alle Kunden.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="463"/>
         <source>Unable to cancel event &quot;%1&quot;.</source>
         <translation type="obsolete">Kann Veranstaltung &quot;%1&quot; nicht absagen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1082"/>
         <source>Ticket &quot;%1&quot; Not Valid</source>
         <translation type="obsolete">Karte &quot;%1&quot; ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1090"/>
         <source>Ticket &quot;%1&quot; has already been used</source>
         <translation type="obsolete">Karte &quot;%1&quot; wurde bereits verwendet.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1094"/>
         <source>Ticket &quot;%1&quot; has not been bought.</source>
         <translation type="obsolete">Karte &quot;%1&quot; wurde nicht gekauft.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1098"/>
         <source>Ticket &quot;%1&quot; Ok</source>
         <translation type="obsolete">Karte &quot;%1&quot; Okay.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1103"/>
         <source>Ticket &quot;%1&quot; Ok; the Order has a refund</source>
         <translation type="obsolete">Karte &quot;%1&quot; Okay.
 Die Bestellung ist Ã¼berbezahlt: es gibt noch Geld zurück.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1108"/>
         <source>Ticket &quot;%1&quot; is not paid for!</source>
         <translation type="obsolete">Karte &quot;%1&quot; ist nicht bezahlt!!!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1111"/>
         <source>Ticket &quot;%1&quot; cannot be accepted, please check the order!</source>
         <translation type="obsolete">Karte &quot;%1&quot; kann nicht akzeptiert werden, bitte prüfen Sie die Bestellung.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1178"/>
         <source>Enter Ticket</source>
         <translation type="obsolete">Bitte Ticket eingeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1178"/>
         <source>Please enter the ID of one of the tickets of the order you seek:</source>
         <translation type="obsolete">Bitte geben Sie die Nr. einer Karte aus der gesuchten Bestellung ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1182"/>
         <source>Unable to query server.</source>
         <translation type="obsolete">Kann Server nicht abfragen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1191"/>
         <source>Server returned an invalid order ID.</source>
         <translation type="obsolete">Server hat eine ungültige Bestellnummer geliefert.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Please select a template file.</source>
         <translation type="obsolete">Bitte wählen Sie eine Vorlage aus.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Enter Template Name</source>
         <translation type="obsolete">Vorlagenname eingeben</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Please enter a name for the template file, it should contain only letters, digits, underscores and dots:</source>
         <translation type="obsolete">Bitte geben Sie einen Namen für die Vorlage ein. Der Name sollte nur Buchstaben, Zahlen und Unterstriche und Punkte enthalten:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The template name must only contain letters, digits, underscores and dots.</source>
         <translation type="obsolete">Der Vorlagenname darf nur Buchstaben, Ziffern, Unterstriche und Punkte enthalten.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Success</source>
         <translation type="obsolete">Erfolg</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Successfully uploaded the template.</source>
         <translation type="obsolete">Vorlage wurde erfolgreich hochgeladen.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to upload the template.</source>
         <translation type="obsolete">Kann Vorlage nicht hochladen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1317"/>
         <source>Return Ticket</source>
         <translation type="obsolete">Karte zurückgeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1317"/>
         <source>Please enter the ticket ID to return:</source>
         <translation type="obsolete">Bitte geben Sie die Karte ein, die zurückgegeben wird:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1321"/>
         <source>This is not a valid ticket.</source>
         <translation type="obsolete">Dies ist keine gültige Karte.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1326"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation type="obsolete">Diese Karte kann nicht zurückgegeben werden: sie wurde bereits benutzt oder befindet sich im falschen Status.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="134"/>
+        <location filename="mwin/overview.cpp" line="132"/>
         <source>&amp;Admin</source>
         <translation>&amp;Administration</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Schedule Backup...</source>
         <translation type="obsolete">&amp;Backupzeit festlegen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="137"/>
+        <location filename="mwin/overview.cpp" line="135"/>
         <source>&amp;Backup now...</source>
         <translation>&amp;Jetzt Backup machen...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Restore...</source>
         <translation type="obsolete">Backup &amp;wiederherstellen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="238"/>
         <source>-search result-</source>
-        <translation>-Suchresultat-</translation>
+        <translation type="obsolete">-Suchresultat-</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="256"/>
         <source>Find by Event...</source>
-        <translation>Nach Veranstaltung suchen...</translation>
+        <translation type="obsolete">Nach Veranstaltung suchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="259"/>
         <source>Find by Customer...</source>
-        <translation>Nach Kunde suchen...</translation>
+        <translation type="obsolete">Nach Kunde suchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="525"/>
         <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 Kleinbuchstaben, Ziffern, Punkte, Bindestriche und Unterstriche enthalten und müssen mindestens ein Zeichen lang sein!</translation>
+        <translation type="obsolete">Nutzernamen dürfen nur Kleinbuchstaben, Ziffern, Punkte, Bindestriche und Unterstriche enthalten und müssen mindestens ein Zeichen lang sein!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1204"/>
         <source>Select Event</source>
         <translation type="obsolete">Veranstaltung auswählen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1216"/>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
         <source>Capacity</source>
-        <translation>Sitzplätze:</translation>
+        <translation type="obsolete">Sitzplätze:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
         <source>Sold</source>
-        <translation>Verkauft</translation>
+        <translation type="obsolete">Verkauft</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
         <source>Reserved</source>
-        <translation>Reserviert</translation>
+        <translation type="obsolete">Reserviert</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
         <source>Free</source>
-        <translation>Frei</translation>
+        <translation type="obsolete">Frei</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="548"/>
         <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>
+        <translation type="obsolete">(Niemand)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="551"/>
         <source>Delete User</source>
-        <translation>Nutzer Löschen</translation>
+        <translation type="obsolete">Nutzer Löschen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="551"/>
         <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>
+        <translation type="obsolete">Bitte wählen Sie einen Nutzer, der die Datenbankobjekte des gelöschten Nutzers erbt:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="556"/>
         <source>Cannot delete user: %1</source>
-        <translation>Kann Nutzer nicht löschen: %1</translation>
+        <translation type="obsolete">Kann Nutzer nicht löschen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="103"/>
         <source>Show &amp;old Events</source>
-        <translation>vergangene Veranstaltungen anzeigen</translation>
+        <translation type="obsolete">vergangene Veranstaltungen anzeigen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="130"/>
+        <location filename="mwin/overview.cpp" line="127"/>
         <source>C&amp;onfigure</source>
         <translation>Konfigurieren</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="131"/>
+        <location filename="mwin/overview.cpp" line="128"/>
         <source>&amp;Auto-Refresh settings...</source>
         <translation>Auto-Auffrisch-Einstellungen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1448"/>
+        <location filename="mwin/overview.cpp" line="130"/>
+        <source>&amp;Display settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="343"/>
         <source>Refresh Settings</source>
         <translation>Auffrischeinstellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1453"/>
+        <location filename="mwin/overview.cpp" line="348"/>
         <source>Refresh Rate (minutes):</source>
         <translation>Auffrischrate (Minuten):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1459"/>
+        <location filename="mwin/overview.cpp" line="354"/>
         <source>refresh &amp;event list</source>
         <translation>Veranstaltungsliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1461"/>
+        <location filename="mwin/overview.cpp" line="356"/>
         <source>refresh &amp;user list</source>
         <translation>Nutzerliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1463"/>
+        <location filename="mwin/overview.cpp" line="358"/>
         <source>refresh &amp;host list</source>
         <translation>Rechnerliste auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1523"/>
+        <location filename="mwin/overview.cpp" line="367"/>
+        <location filename="mwin/overview.cpp" line="418"/>
+        <location filename="mwin/overview.cpp" line="462"/>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1525"/>
+        <location filename="mwin/overview.cpp" line="369"/>
+        <location filename="mwin/overview.cpp" line="420"/>
+        <location filename="mwin/overview.cpp" line="464"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="91"/>
+        <location filename="mwin/overview.cpp" line="443"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="448"/>
+        <source>Maximum event age (days, 0=show all):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="453"/>
+        <source>Maximum order list age (days, 0=show all):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="72"/>
         <source>&amp;Edit Templates...</source>
         <translation>Vorlagen Ã¤ndern...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="92"/>
+        <location filename="mwin/overview.cpp" line="73"/>
         <source>&amp;Update Templates Now</source>
         <translation>Vorlagen jetzt auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="117"/>
         <source>&amp;Update Shipping Options</source>
-        <translation>Versandoptionen auffrischen</translation>
+        <translation type="obsolete">Versandoptionen auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="120"/>
+        <location filename="mwin/overview.cpp" line="117"/>
         <source>Return &amp;ticket...</source>
         <translation>Karte zurückgeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="121"/>
+        <location filename="mwin/overview.cpp" line="118"/>
         <source>Return &amp;voucher...</source>
         <translation>Gutschein zurückgeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="123"/>
+        <location filename="mwin/overview.cpp" line="120"/>
         <source>Edit &amp;Shipping Options...</source>
         <translation>Versandoptionen editieren</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="206"/>
         <source>Shipping Method:</source>
-        <translation>Versandoption:</translation>
+        <translation type="obsolete">Versandoption:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="233"/>
         <source>Open Reservations</source>
-        <translation>Reservierungen</translation>
+        <translation type="obsolete">Reservierungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="491"/>
         <source>(No Shipping)</source>
-        <translation>(Kein Versand)</translation>
+        <translation type="obsolete">(Kein Versand)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="874"/>
         <source>Select Voucher</source>
         <translation type="obsolete">Gutschein wählen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="885"/>
         <source>Select voucher price and value:</source>
         <translation type="obsolete">Bitte Gutschein-Preis und -Wert wählen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="886"/>
         <source>Price:</source>
         <translation type="obsolete">Preis:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="892"/>
         <source>Value:</source>
         <translation type="obsolete">Wert:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="924"/>
         <source>Voucher (price: %1, value %2)</source>
         <translation type="obsolete">Gutschein (Preis: %1, Wert: %2)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1338"/>
         <source>Return Voucher</source>
         <translation type="obsolete">Gutschein zurückgeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1338"/>
         <source>Please enter the voucher ID to return:</source>
         <translation type="obsolete">Bitte geben Sie den Gutschein ein, der zurückgegeben wird:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1342"/>
         <source>This is not a valid voucher.</source>
         <translation type="obsolete">Dies ist kein gültiger Gutschein.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1347"/>
         <source>This voucher cannot be returned, it has already been used.</source>
         <translation type="obsolete">Dieser Gutschein kann nicht zurückgegeben werden, er wurde bereits benutzt.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1465"/>
+        <location filename="mwin/overview.cpp" line="360"/>
         <source>refresh &amp;shipping list</source>
         <translation>Versandoptionen auffrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="262"/>
         <source>Find by Order ID...</source>
-        <translation>Nach Bestellnummer suchen...</translation>
+        <translation type="obsolete">Nach Bestellnummer suchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1301"/>
         <source>Enter Order ID</source>
         <translation type="obsolete">Bestellnummer eingeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1301"/>
         <source>Please enter the ID of the order you want to display:</source>
         <translation type="obsolete">Bitte geben Sie die Bestellnummer der Bestellung ein, die Sie ansehen wollen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1306"/>
         <source>This order does not exist.</source>
         <translation type="obsolete">Diese Bestellung existiert nicht.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="125"/>
+        <location filename="mwin/overview.cpp" line="122"/>
         <source>&amp;Deduct from voucher...</source>
         <translation>Geld von Gutschein abziehen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="127"/>
+        <location filename="mwin/overview.cpp" line="124"/>
         <source>&amp;Money Log for voucher...</source>
         <translation>Geldtransfers von Gutschein...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="128"/>
+        <location filename="mwin/overview.cpp" line="125"/>
         <source>Money Log for &amp;user...</source>
         <translation>Geldtransfers von Nutzer...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="132"/>
+        <location filename="mwin/overview.cpp" line="129"/>
         <source>&amp;Server Access settings...</source>
         <translation>Serverzugriffseinstellungen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="135"/>
+        <location filename="mwin/overview.cpp" line="133"/>
         <source>Backup &amp;Settings...</source>
         <translation>Einstellungen Sicherungskopie...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="273"/>
         <source>Enter or scan Ticket-ID:</source>
-        <translation>Kartennummer eingeben oder scannen:</translation>
+        <translation type="obsolete">Kartennummer eingeben oder scannen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1086"/>
         <source>Ticket &quot;%1&quot; is not for this event.</source>
         <translation type="obsolete">Karte &quot;%1&quot; ist nicht für diese Veranstaltung.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1359"/>
         <source>Deduct from Voucher</source>
         <translation type="obsolete">Von Gutschein abziehen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1362"/>
         <source>Using a voucher to pay outside the system.</source>
         <translation type="obsolete">Einen Gutschein nutzen um außerhalb des Systems zu bezahlen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1366"/>
         <source>Amount to deduct:</source>
         <translation type="obsolete">Abzuziehender Betrag:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1368"/>
         <source>Voucher ID:</source>
         <translation type="obsolete">Gutscheinnummer:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1376"/>
         <source>OK</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1389"/>
         <source>Request failed.</source>
         <translation type="obsolete">Anfrage ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1396"/>
         <source>Deducted from Voucher</source>
         <translation type="obsolete">Von Gutschein abziehen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1396"/>
         <source>Value taken from voucher: %1
 Value remaining on voucher: %2</source>
         <translation type="obsolete">Vom Gutschein abgezogener Betrag: %1
 Verbleibender Betrag: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1499"/>
+        <location filename="mwin/overview.cpp" line="394"/>
         <source>Server Access Settings</source>
         <translation>Serverzugriffseinstellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1503"/>
+        <location filename="mwin/overview.cpp" line="398"/>
         <source>Request Timeout (seconds):</source>
         <translation>max. Anfragezeit (Sekunden):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1509"/>
+        <location filename="mwin/overview.cpp" line="404"/>
         <source>Log Level:</source>
         <translation>Logstufe:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1511"/>
+        <location filename="mwin/overview.cpp" line="406"/>
         <source>Minimal Logging</source>
         <translation>Minimales Log</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1512"/>
+        <location filename="mwin/overview.cpp" line="407"/>
         <source>Log Details on Error</source>
         <translation>Bei Fehlern Details</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1513"/>
+        <location filename="mwin/overview.cpp" line="408"/>
         <source>Always Log Details</source>
         <translation>Immer Details</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1524"/>
         <source>Backup failed with error: %1</source>
         <translation type="obsolete">Sicherung ist fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1574"/>
+        <location filename="mwin/overview.cpp" line="510"/>
         <source>Backup</source>
         <translation>Sicherung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1574"/>
+        <location filename="mwin/overview.cpp" line="510"/>
         <source>The backup was successful.</source>
         <translation>Die Sicherung war erfolgreich.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1578"/>
+        <location filename="mwin/overview.cpp" line="514"/>
         <source>Cannot create backup file.</source>
         <translation>Kann Sicherungsdatei nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1567"/>
         <source>Voucher ID</source>
         <translation type="obsolete">Gutscheinnummer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1567"/>
         <source>Please enter voucher ID to show log:</source>
         <translation type="obsolete">Bitte geben Sie die Gutscheinnummer ein um die Transaktionen zu zeigen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1574"/>
         <source>User</source>
         <translation type="obsolete">Nutzer</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1574"/>
         <source>Please enter login name of user to show log:</source>
         <translation type="obsolete">Bitte den Login-Namen des Nutzers eingeben um die Transaktionen anzuzeigen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="430"/>
+        <location filename="mwin/overview.cpp" line="186"/>
         <source>I was unable to renew the login at the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="484"/>
-        <source>Unable to cancel event &quot;%1&quot;: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="1553"/>
+        <location filename="mwin/overview.cpp" line="489"/>
         <source>Backup failed with error (%2): %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1557"/>
+        <location filename="mwin/overview.cpp" line="493"/>
         <source>Backup returned empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2930,37 +3709,37 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MPasswordChange</name>
     <message>
-        <location filename="overview.cpp" line="1679"/>
+        <location filename="dialogs/passwdchg.cpp" line="26"/>
         <source>Change my password</source>
         <translation>Mein Passwort Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1685"/>
+        <location filename="dialogs/passwdchg.cpp" line="32"/>
         <source>Old Password:</source>
         <translation>Altes Passwort:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1689"/>
+        <location filename="dialogs/passwdchg.cpp" line="36"/>
         <source>New Password:</source>
         <translation>Neues Passwort:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1692"/>
+        <location filename="dialogs/passwdchg.cpp" line="39"/>
         <source>Repeat Password:</source>
         <translation>Paswort wiederholen:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1700"/>
+        <location filename="dialogs/passwdchg.cpp" line="47"/>
         <source>Set Password</source>
         <translation>Passwort setzen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1702"/>
+        <location filename="dialogs/passwdchg.cpp" line="49"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1681"/>
+        <location filename="dialogs/passwdchg.cpp" line="28"/>
         <source>Reset password of user &quot;%1&quot;</source>
         <translation>Passwort des Nutzers &quot;%1&quot; zurücksetzen</translation>
     </message>
@@ -2968,45 +3747,57 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MSInterface</name>
     <message>
-        <location filename="msinterface.cpp" line="35"/>
+        <location filename="iface/msinterface.cpp" line="58"/>
         <source>Warning</source>
         <translation type="unfinished">Warnung</translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="35"/>
+        <location filename="iface/msinterface.cpp" line="58"/>
         <source>Login failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="76"/>
+        <location filename="iface/msinterface.cpp" line="85"/>
+        <location filename="iface/msinterface.cpp" line="89"/>
+        <location filename="iface/msinterface.cpp" line="94"/>
+        <location filename="iface/msinterface.cpp" line="99"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="62"/>
+        <location filename="iface/msinterface.cpp" line="85"/>
         <source>Communication problem while talking to the server, see log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="66"/>
+        <location filename="iface/msinterface.cpp" line="89"/>
         <source>Communication with server was not successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="71"/>
+        <location filename="iface/msinterface.cpp" line="94"/>
         <source>The server implementation is too old for this client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="76"/>
+        <location filename="iface/msinterface.cpp" line="99"/>
         <source>This client is too old for the server, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="iface/msinterface.cpp" line="191"/>
+        <source>Connection Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="iface/msinterface.cpp" line="191"/>
+        <source>There were problems while authenticating the server. Aborting. Check your configuration.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MShipping</name>
     <message>
-        <location filename="" line="0"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="obsolete">,</translation>
@@ -3015,32 +3806,32 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MShippingChange</name>
     <message>
-        <location filename="orderwin.cpp" line="1043"/>
+        <location filename="dialogs/orderwin.cpp" line="1033"/>
         <source>Change Shipping Method</source>
         <translation>Versandoption Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1051"/>
+        <location filename="dialogs/orderwin.cpp" line="1041"/>
         <source>Method:</source>
         <translation>Option:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1053"/>
+        <location filename="dialogs/orderwin.cpp" line="1043"/>
         <source>Price:</source>
         <translation>Preis:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1061"/>
+        <location filename="dialogs/orderwin.cpp" line="1051"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1063"/>
+        <location filename="dialogs/orderwin.cpp" line="1053"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1070"/>
+        <location filename="dialogs/orderwin.cpp" line="1060"/>
         <source>(None)</source>
         <comment>shipping method</comment>
         <translation>(Keine)</translation>
@@ -3049,157 +3840,139 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MShippingEditor</name>
     <message>
-        <location filename="shipping.cpp" line="37"/>
+        <location filename="dialogs/shipping.cpp" line="37"/>
         <source>Edit Shipping Options</source>
         <translation>Versandoptionen editieren</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="49"/>
+        <location filename="dialogs/shipping.cpp" line="49"/>
         <source>Change Description</source>
         <translation>Beschreibung Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="51"/>
+        <location filename="dialogs/shipping.cpp" line="51"/>
         <source>Change Price</source>
         <translation>Preis Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="53"/>
+        <location filename="dialogs/shipping.cpp" line="53"/>
         <source>Change Availability</source>
         <translation>Verfügbarkeit Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="56"/>
+        <location filename="dialogs/shipping.cpp" line="56"/>
         <source>Add Option</source>
         <translation>Option hinzufügen</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="58"/>
+        <location filename="dialogs/shipping.cpp" line="58"/>
         <source>Delete Option</source>
         <translation>Option löschen</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="65"/>
+        <location filename="dialogs/shipping.cpp" line="65"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="67"/>
+        <location filename="dialogs/shipping.cpp" line="67"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Price</source>
         <translation>Preis</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Web</source>
         <translation>Web</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Any User</source>
         <translation>Jeder Nutzer</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="81"/>
         <source>Yes</source>
-        <translation>Ja</translation>
+        <translation type="obsolete">Ja</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="81"/>
         <source>No</source>
-        <translation>Nein</translation>
+        <translation type="obsolete">Nein</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="250"/>
         <source>Shipping Option Description</source>
         <translation type="obsolete">Versandoptionsbeschreibung</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="190"/>
         <source>Please select a new description for this shipping option:</source>
         <translation type="obsolete">Bitte geben Sie eine Beschreibung für diese Versandoption ein:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="288"/>
         <source>Warning</source>
         <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="240"/>
         <source>Could not store the changes.</source>
         <translation type="obsolete">Konnte Ã„nderungen nicht speichern.</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="253"/>
         <source>Shipping Option Price</source>
         <translation type="obsolete">Versandoptionspreis</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="211"/>
         <source>Please select a new price for this shipping option:</source>
         <translation type="obsolete">Bitte geben Sie einen Preis für diese Versandoption ein:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="256"/>
         <source>None</source>
         <translation type="obsolete">Nur privilegierte Nutzer</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="256"/>
         <source>Web Interface</source>
         <translation type="obsolete">Privilegierte Nutzer und Web-Kunden</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="256"/>
         <source>Any User + Web Interface</source>
         <translation type="obsolete">Jeder</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="257"/>
         <source>Shipping Option Availability</source>
         <translation type="obsolete">Versandoptionsverfügbarkeit</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="234"/>
         <source>Please select a new availability for this shipping option:</source>
         <translation type="obsolete">Bitte wählen Sie eine Verfügbarkeit für diese Versandoption:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="250"/>
         <source>Please select a new description for this new shipping option:</source>
         <translation type="obsolete">Bitte geben Sie eine Beschreibung für diese Versandoption ein:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="253"/>
         <source>Please select a new price for this new shipping option:</source>
         <translation type="obsolete">Bitte geben Sie einen Preis für diese Versandoption ein:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="257"/>
         <source>Please select a new availability for this new shipping option:</source>
         <translation type="obsolete">Bitte wählen Sie eine Verfügbarkeit für diese Versandoption:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="268"/>
         <source>Could not create the new option.</source>
         <translation type="obsolete">Konnte die neue Versandoption nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="288"/>
         <source>Unable to delete this option.</source>
         <translation type="obsolete">Kann diese Option nicht löschen.</translation>
     </message>
@@ -3207,23 +3980,23 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MTemplateChoice</name>
     <message>
-        <location filename="templatedlg.cpp" line="29"/>
+        <location filename="templates/templatedlg.cpp" line="29"/>
         <source>Chose Template</source>
         <translation>Vorlage auswählen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="32"/>
+        <location filename="templates/templatedlg.cpp" line="32"/>
         <source>Please chose a variant of template %1:</source>
         <translation>Bitte wählen Sie eine Variante für die Vorlage %1:</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="41"/>
+        <location filename="templates/templatedlg.cpp" line="41"/>
         <source>(default)</source>
         <comment>default template pseudo-variant</comment>
         <translation>(Standard)</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="50"/>
+        <location filename="templates/templatedlg.cpp" line="50"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -3231,72 +4004,75 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MTemplateEditor</name>
     <message>
-        <location filename="templatedlg.cpp" line="72"/>
+        <location filename="templates/templatedlg.cpp" line="72"/>
         <source>Edit Template Directory</source>
         <translation>Vorlagenverzeichnis editieren</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="84"/>
+        <location filename="templates/templatedlg.cpp" line="84"/>
         <source>Update Now</source>
         <translation>Jetzt auffrischen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="86"/>
+        <location filename="templates/templatedlg.cpp" line="86"/>
         <source>Add Variant</source>
         <translation>Variante hinzufügen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="88"/>
+        <location filename="templates/templatedlg.cpp" line="88"/>
         <source>Delete Variant</source>
         <translation>Variante löschen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="95"/>
+        <location filename="templates/templatedlg.cpp" line="95"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
+        <location filename="templates/templatedlg.cpp" line="110"/>
         <source>Template/Variant</source>
         <translation>Vorlage/Variante</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
+        <location filename="templates/templatedlg.cpp" line="110"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
+        <location filename="templates/templatedlg.cpp" line="110"/>
         <source>Checksum</source>
         <translation>Checksumme</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="221"/>
+        <location filename="templates/templatedlg.cpp" line="167"/>
+        <location filename="templates/templatedlg.cpp" line="185"/>
+        <location filename="templates/templatedlg.cpp" line="204"/>
+        <location filename="templates/templatedlg.cpp" line="221"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="167"/>
+        <location filename="templates/templatedlg.cpp" line="167"/>
         <source>Unable to delete this template.</source>
         <translation>Kann diese Vorlage nicht löschen.</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="180"/>
+        <location filename="templates/templatedlg.cpp" line="180"/>
         <source>Select Template File</source>
         <translation>Vorlagendatei wählen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="185"/>
+        <location filename="templates/templatedlg.cpp" line="185"/>
         <source>Files with this extension (%1) are not legal for this template.</source>
         <translation>Dateien mit der Erweiterung %1 sind für diese Vorlage nicht erlaubt.</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="204"/>
+        <location filename="templates/templatedlg.cpp" line="204"/>
         <source>Unable to upload file.</source>
         <translation>Kann Datei nicht hochladen.</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="221"/>
+        <location filename="templates/templatedlg.cpp" line="221"/>
         <source>Unable to send new description to server.</source>
         <translation>Kann die neue Beschreibung nicht speichern.</translation>
     </message>
@@ -3304,7 +4080,6 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MTemplateStore</name>
     <message>
-        <location filename="templates.cpp" line="107"/>
         <source>Retrieving templates from server.</source>
         <translation type="obsolete">Hole Vorlagen vom Server.</translation>
     </message>
@@ -3312,95 +4087,80 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MTicket</name>
     <message>
-        <location filename="order.cpp" line="330"/>
+        <location filename="iface/order.cpp" line="330"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="762"/>
         <source>bought</source>
         <comment>ticket state</comment>
         <translation type="obsolete">gültig</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="763"/>
         <source>to refund</source>
         <comment>ticket state</comment>
         <translation type="obsolete">zurückgegeben</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="764"/>
         <source>used</source>
         <comment>ticket state</comment>
         <translation type="obsolete">benutzt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="765"/>
         <source>reserved</source>
         <comment>ticket state</comment>
         <translation type="obsolete">reserviert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="766"/>
         <source>ok</source>
         <comment>ticket state</comment>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="767"/>
         <source>sale only</source>
         <comment>ticket state</comment>
         <translation type="obsolete">nur zum Verkauf</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="768"/>
         <source>order only</source>
         <comment>ticket state</comment>
         <translation type="obsolete">nur zur Bestellung</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="769"/>
         <source>too late: event over</source>
         <comment>ticket state</comment>
         <translation type="obsolete">zu spät: Veranstaltung ist vorbei</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="770"/>
         <source>no more tickets</source>
         <comment>ticket state</comment>
         <translation type="obsolete">keine Karten mehr verfügbar</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="771"/>
         <source>event cancelled</source>
         <comment>ticket state</comment>
         <translation type="obsolete">Veranstaltung abgesagt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="772"/>
         <source>no such event</source>
         <comment>ticket state</comment>
         <translation type="obsolete">Veranstaltung unbekannt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="773"/>
         <source>invalid</source>
         <comment>ticket state</comment>
         <translation type="obsolete">ungültig</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="792"/>
         <source>Cannot execute request.</source>
         <translation type="obsolete">Kann Anfrage nicht ausführen.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="819"/>
         <source>Ticket is not stored, can&apos;t return it.</source>
         <translation type="obsolete">Karte ist nicht gespeichert, kann sie nicht zurückgeben.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="821"/>
         <source>Failed to execute request</source>
         <translation type="obsolete">Kann Anfrage nicht ausführen.</translation>
     </message>
@@ -3408,7 +4168,6 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MTicketView</name>
     <message>
-        <location filename="" line="0"/>
         <source>Preview Tickets</source>
         <translation type="obsolete">Karten-Vorschau</translation>
     </message>
@@ -3416,45 +4175,180 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MUser</name>
     <message>
-        <location filename="user.cpp" line="58"/>
         <source>User not valid: cannot delete.</source>
-        <translation>Ungültiger Nutzer: kann nicht gelöscht werden.</translation>
+        <translation type="obsolete">Ungültiger Nutzer: kann nicht gelöscht werden.</translation>
+    </message>
+</context>
+<context>
+    <name>MUserTab</name>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="43"/>
+        <source>New User...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="46"/>
+        <source>Delete User...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="50"/>
+        <source>Description...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="53"/>
+        <source>Hosts...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="56"/>
+        <source>Roles...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="59"/>
+        <source>Set Password...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="80"/>
+        <source>Login Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="80"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="94"/>
+        <source>New User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="94"/>
+        <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="99"/>
+        <location filename="mwin/acltabs.cpp" line="130"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="99"/>
+        <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="103"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="103"/>
+        <source>Please enter an initial password for the user:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="118"/>
+        <source>Delete User?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="118"/>
+        <source>Really delete user &apos;%1&apos;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="122"/>
+        <source>(Nobody)</source>
+        <comment>this is a username for no user, the string must contain &apos;(&apos; to distinguish it from the others</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="125"/>
+        <source>Delete User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="125"/>
+        <source>Select which user will inherit this users database objects:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="130"/>
+        <source>Cannot delete user: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="144"/>
+        <source>Edit Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="144"/>
+        <source>Description of user %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="161"/>
+        <location filename="mwin/acltabs.cpp" line="166"/>
+        <location filename="mwin/acltabs.cpp" line="209"/>
+        <location filename="mwin/acltabs.cpp" line="215"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="161"/>
+        <source>Cannot retrieve user roles: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="166"/>
+        <source>Cannot retrieve role descriptions: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="209"/>
+        <source>The password must be non-empty and both lines must match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="215"/>
+        <source>Error while setting password: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MVoucher</name>
     <message>
-        <location filename="order.cpp" line="919"/>
         <source>invalid</source>
         <translation type="obsolete">ungültig</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="921"/>
         <source>cancelled</source>
         <translation type="obsolete">storniert</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="922"/>
         <source>empty</source>
         <translation type="obsolete">leer</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="923"/>
         <source>used</source>
         <translation type="obsolete">benutzt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="924"/>
         <source>unused</source>
         <translation type="obsolete">unbenutzt</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="941"/>
         <source>Voucher is not stored, can&apos;t return it.</source>
         <translation type="obsolete">Gutschein ist nicht gespeichert, kann ihn nicht zurückgeben.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="943"/>
         <source>Failed to execute request</source>
         <translation type="obsolete">Kann Anfrage nicht ausführen.</translation>
     </message>
@@ -3462,97 +4356,78 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>MWebRequest</name>
     <message>
-        <location filename="webrequest.cpp" line="223"/>
         <source>Unable to get server info.</source>
         <translation type="obsolete">Serverdaten können nicht gelesen werden.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="230"/>
         <source>Error while parsing server info (line %1 col %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Serverdaten (Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="235"/>
         <source>Error in server info: missing authentication algorithm info.</source>
         <translation type="obsolete">Fehler in Serverdaten: Authentifikationsalgorithmus fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="240"/>
         <source>The server requested an unsupported hash algorithm: %1.</source>
         <translation type="obsolete">Der Server verlangt einen nicht unterstützten Algorithmus (%1). Kann nicht fortsetzen.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="246"/>
         <source>Unable to get authentication challenge.</source>
         <translation type="obsolete">Authentifikation fehlgeschlagen (es wurde kein Challenge angeboten).</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="250"/>
         <source>Error while parsing session challenge (line %1 col %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Authentifikationsdaten (Challenge; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="256"/>
         <source>Error in session challenge: missing session ID.</source>
         <translation type="obsolete">Fehler in Authentifikationsdaten (Challenge): Session-ID fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="262"/>
         <source>Error in session challenge: missing host challenge.</source>
         <translation type="obsolete">Fehler in Authentifikationsdaten (Challenge): Host-Challenge fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="268"/>
         <source>Error in session challenge: missing user challenge.</source>
         <translation type="obsolete">Fehler in Authentifikationsdaten (Challenge): Nutzer-Challenge fehlt.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="294"/>
         <source>Failed to log in: user/password mismatch, non-allowed host key, or challenge timed out.</source>
         <translation type="obsolete">Authentifikation fehlgeschlagen: Passwort ist falsch, Host ist nicht zugelassen oder Challenge-Timeout.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="298"/>
         <source>Unable to authenticate.</source>
         <translation type="obsolete">Authentifikation fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="390"/>
         <source>Error parsing EventList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der XML-Daten (Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="341"/>
         <source>Cannot change password, old password does not match!</source>
         <translation type="obsolete">Passwort kann nicht geändert werden: altes Passwort ist falsch.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="414"/>
         <source>Error parsing RoomList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Daten (RoomList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="438"/>
         <source>Error parsing UserList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Daten (UserList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="462"/>
         <source>Error parsing HostList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Daten (HostList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="486"/>
         <source>Error parsing CustomerList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Daten (CustomerList; Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="579"/>
         <source>Error parsing OrderList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Parsen der XML-Daten (Zeile %1, Spalte %2): %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="535"/>
         <source>Error parsing ShippingList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Fehler beim Lesen der Daten (ShippingList; Zeile %1, Spalte %2): %3</translation>
     </message>
@@ -3560,39 +4435,32 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>Order</name>
     <message>
-        <location filename="../www/inc/classes/order.php" line="256"/>
         <source>create order</source>
         <translation type="obsolete">Bestellung anlegen</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="407"/>
         <source>invalidvalue</source>
         <comment>voucher state</comment>
         <translation type="obsolete">Gutscheinwert nicht zulässig</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="413"/>
         <source>invalidprice</source>
         <comment>voucher state</comment>
         <translation type="obsolete">Gutscheinpreis nicht zulässig</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="434"/>
         <source>Shipping type not available to user.</source>
         <translation type="obsolete">Diese Versandoption ist privilegierten Nutzern vorbehalten.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="451"/>
         <source>Illegal shipping type.</source>
         <translation type="obsolete">Ungültige Versandoption.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="669"/>
         <source>order cancelled</source>
         <translation type="obsolete">Bestellung storniert</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="707"/>
         <source>reservation to order</source>
         <translation type="obsolete">Reservierung zu Bestellung gewandelt</translation>
     </message>
@@ -3600,37 +4468,30 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>Session</name>
     <message>
-        <location filename="../www/inc/machine/session.php" line="217"/>
         <source>unable to parse XML data</source>
         <translation type="obsolete">Kann XML Daten nicht parsen</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="139"/>
         <source>missing some authentication data</source>
         <translation type="obsolete">Authentifikationsdaten sind unvollständig</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="211"/>
         <source>Not authenticated. Can&apos;t change password.</source>
         <translation type="obsolete">Nicht authentifiziert, Passwort kann nicht geändert werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="222"/>
         <source>expected exactly one passwd element</source>
         <translation type="obsolete">Nur 1 &quot;passwd&quot; Element erwartet.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="230"/>
         <source>cannot set an empty password</source>
         <translation type="obsolete">Leeres Passwort kann nicht gesetzt werden</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="237"/>
         <source>Ooops. Unable to find user. You have been deleted.</source>
         <translation type="obsolete">Ups. Sie wurden gelöscht.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="242"/>
         <source>Wrong password. Session hijacked, terminating it.</source>
         <translation type="obsolete">Falsches Passwort. Session wird beendet.</translation>
     </message>
@@ -3638,17 +4499,14 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>SpecialHost</name>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="41"/>
         <source>_any</source>
         <translation type="obsolete">beliebiger (auch unregistrierter) Host</translation>
     </message>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="42"/>
         <source>_anon</source>
         <translation type="obsolete">Anonym - beliebiger registrierter Host</translation>
     </message>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="43"/>
         <source>_online</source>
         <translation type="obsolete">Web-Präsenz</translation>
     </message>
@@ -3656,27 +4514,22 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>Ticket</name>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="203"/>
         <source>The ticket is not valid.</source>
         <translation type="obsolete">Die Karte ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="207"/>
         <source>The ticket has already been used.</source>
         <translation type="obsolete">Die Karte wurde bereits benutzt.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="211"/>
         <source>The ticket has not been bought or is cancelled.</source>
         <translation type="obsolete">Die Karte wurde nicht gekauft oder ist zurückgegeben.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="216"/>
         <source>The ticket has not been paid.</source>
         <translation type="obsolete">Die Karte ist nicht bezahlt.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="220"/>
         <source>The tickets order is in an invalid state or does not exist.</source>
         <translation type="obsolete">Die Bestellung dieser Karte ist in einem ungültigen Zustand oder existiert nicht.</translation>
     </message>
@@ -3684,362 +4537,290 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>TransactionNames::</name>
     <message>
-        <location filename="../www/machine.php" line="19"/>
         <source>serverinfo</source>
         <translation type="obsolete">Serverinformationen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>startsession</source>
         <translation type="obsolete">Session beginnen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>sessionauth</source>
         <translation type="obsolete">Session authentifizieren</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>closesession</source>
         <translation type="obsolete">Sessen beenden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
         <source>getmyroles</source>
         <translation type="obsolete">meine Rollen herausfinden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getusers</source>
         <translation type="obsolete">Nutzer abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>setuserdescription</source>
         <translation type="obsolete">Nutzerkommentar setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getuseracl</source>
         <translation type="obsolete">Nutzerrechte abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>setuseracl</source>
         <translation type="obsolete">Nutzerrechte setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getuserhosts</source>
         <translation type="obsolete">erlaubte Hosts eines Nutzers abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setuserhosts</source>
         <translation type="obsolete">erlaubte Hosts eines Nutzers setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>adduser</source>
         <translation type="obsolete">neue Nutzer anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>deleteuser</source>
         <translation type="obsolete">Nutzer löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setmypasswd</source>
         <translation type="obsolete">eigenes Passwort Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setpasswd</source>
         <translation type="obsolete">Passwort eines anderen Nutzers Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>gethosts</source>
         <translation type="obsolete">Hosts abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>sethost</source>
         <translation type="obsolete">Hosts anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>addhost</source>
         <translation type="obsolete">Neue Hosts anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>deletehost</source>
         <translation type="obsolete">Hosts löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>geteventlist</source>
         <translation type="obsolete">Liste der Veranstaltungen abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>geteventdata</source>
         <translation type="obsolete">Veranstaltungsdetails abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>seteventdata</source>
         <translation type="obsolete">Veranstaltungsdetails Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>eventsummary</source>
         <translation type="obsolete">Veranstaltungübersicht</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>cancelevent</source>
         <translation type="obsolete">Veranstaltung abbrechen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
         <source>getroomdata</source>
         <translation type="obsolete">Raumdaten abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
         <source>setroomdata</source>
         <translation type="obsolete">Raumdaten setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>getcustomerlist</source>
         <translation type="obsolete">Kundenliste abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>getcustomer</source>
         <translation type="obsolete">Kunde abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>setcustomer</source>
         <translation type="obsolete">Kunde anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>deletecustomer</source>
         <translation type="obsolete">Kunden löschen/ersetzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>checkorder</source>
         <translation type="obsolete">Bestellung testen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createorder</source>
         <translation type="obsolete">Bestellung anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createsale</source>
         <translation type="obsolete">Verkaufen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>getorderlist</source>
         <translation type="obsolete">Liste der Bestellungen abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>getorder</source>
         <translation type="obsolete">Bestellung: Details abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>orderpay</source>
         <translation type="obsolete">Bestellung bezahlen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>orderrefund</source>
         <translation type="obsolete">Bestellung: Geld zurück geben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>ordershipped</source>
         <translation type="obsolete">Bestellung als verschickt markieren</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>cancelorder</source>
         <translation type="obsolete">Bestellung stornieren</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>orderbyticket</source>
         <translation type="obsolete">Bestellung mit Ticket finden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>getordersbyevents</source>
         <translation type="obsolete">Bestellungen finden, die Veranstaltung enthalten</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>setordercomment</source>
         <translation type="obsolete">Bestellkommentar (in angelegter Bestellung) Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>getticket</source>
         <translation type="obsolete">Ticket abrufen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>useticket</source>
         <translation type="obsolete">Ticket entwerten</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>changeticketprice</source>
         <translation type="obsolete">Ticketpreis Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>ticketreturn</source>
         <translation type="obsolete">Ticket zurückgeben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>gettemplatelist</source>
         <translation type="obsolete">Vorlagenliste abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>gettemplate</source>
         <translation type="obsolete">Vorlage abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>settemplate</source>
         <translation type="obsolete">Vorlage erstellen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="60"/>
         <source>_admin</source>
         <translation type="obsolete">Alle Rechte, Administrator</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="61"/>
         <source>_anyshipping</source>
         <translation type="obsolete">Nutzer darf beliebige (auch privilegierte) Versandmethode benutzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="62"/>
         <source>_repriceshipping</source>
         <translation type="obsolete">Beliebigen Versandpreis festlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createreservedorder</source>
         <translation type="obsolete">Reservierung anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>orderchangeshipping</source>
         <translation type="obsolete">Versandoption einer Bestellung Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
         <source>reservationtoorder</source>
         <translation type="obsolete">Reservierung in Bestellung wandeln</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
         <source>reservationtosale</source>
         <translation type="obsolete">Reservierung in Verkauf wandeln</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>getshipping</source>
         <translation type="obsolete">Versandoptionen holen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>setshipping</source>
         <translation type="obsolete">Versandoptionen Ã¤ndern/anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>deleteshipping</source>
         <translation type="obsolete">Versandoptionen löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>getvoucherprices</source>
         <translation type="obsolete">Gutscheinpreise abfragen (zB. für Bestellformular)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>cancelvoucher</source>
         <translation type="obsolete">Gutschein zurückgeben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>emptyvoucher</source>
         <translation type="obsolete">Gutschein ungültig machen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>usevoucher</source>
         <translation type="obsolete">Gutschein benutzen (damit bezahlen)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>getvoucher</source>
         <translation type="obsolete">Gutschein abfragen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>settemplatedescription</source>
         <translation type="obsolete">Vorlagenbeschreibung Ã¤ndern/setzen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="52"/>
         <source>deletetemplate</source>
         <translation type="obsolete">Vorlage löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="63"/>
         <source>_anyvoucher</source>
         <translation type="obsolete">Gutscheine mit beliebigem Wert anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="64"/>
         <source>_anypricevoucher</source>
         <translation type="obsolete">Gutscheine anlegen bei denen Preis und Wert unterschiedlich sind</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="65"/>
         <source>_explicitshipdate</source>
         <translation type="obsolete">eine beliebige Zeit/Datum setzen, wenn Bestellungen versandt werden (statt aktueller Zeit/Datum)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>usevoucheroutside</source>
         <translation type="obsolete">Gutschein außerhalb des Systems nutzen (Geld ohne Bestellung abziehen)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="54"/>
         <source>backup</source>
         <translation type="obsolete">Sicherungskopie anlegen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="56"/>
         <source>moneylog</source>
         <translation type="obsolete">Geldtransfers anzeigen</translation>
     </message>
@@ -4047,84 +4828,220 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>Voucher</name>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="120"/>
         <source>cancel voucher</source>
         <translation type="obsolete">Gutschein zurückgegeben</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="134"/>
         <source>empty voucher</source>
         <translation type="obsolete">Gutschein entleert</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="157"/>
         <source>create voucher</source>
         <translation type="obsolete">Gutschein angelegt</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="221"/>
         <source>pay with voucher</source>
         <translation type="obsolete">mit Gutschein bezahlt</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="257"/>
         <source>pay with voucher outside system</source>
         <translation type="obsolete">mit Gutschein außerhalb des Systems bezahlt</translation>
     </message>
 </context>
 <context>
+    <name>WTransaction</name>
+    <message>
+        <location filename="wbase/WTransaction.cpp" line="78"/>
+        <source>interface not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="wbase/WTransaction.cpp" line="132"/>
+        <source>Web Request timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="wbase/WTransaction.cpp" line="151"/>
+        <source>HTTP Error, return code %1 %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WobTransaction</name>
     <message>
+        <location filename="wob/MTBackup.cpp" line="41"/>
+        <location filename="wob/MTCancelEvent.cpp" line="50"/>
+        <location filename="wob/MTCancelOrder.cpp" line="40"/>
+        <location filename="wob/MTChangeMyPassword.cpp" line="52"/>
+        <location filename="wob/MTChangePassword.cpp" line="50"/>
+        <location filename="wob/MTCreateOrder.cpp" line="40"/>
+        <location filename="wob/MTCreateReservation.cpp" line="40"/>
+        <location filename="wob/MTCreateRole.cpp" line="40"/>
+        <location filename="wob/MTCreateUser.cpp" line="57"/>
+        <location filename="wob/MTDeleteCustomer.cpp" line="48"/>
+        <location filename="wob/MTDeleteHost.cpp" line="44"/>
+        <location filename="wob/MTDeleteUser.cpp" line="48"/>
+        <location filename="wob/MTGetAllCustomerNames.cpp" line="41"/>
+        <location filename="wob/MTGetAllEvents.cpp" line="41"/>
+        <location filename="wob/MTGetAllHostNames.cpp" line="41"/>
+        <location filename="wob/MTGetAllHosts.cpp" line="41"/>
+        <location filename="wob/MTGetAllRoles.cpp" line="41"/>
+        <location filename="wob/MTGetAllRooms.cpp" line="41"/>
+        <location filename="wob/MTGetAllShipping.cpp" line="41"/>
+        <location filename="wob/MTGetAllUsers.cpp" line="41"/>
+        <location filename="wob/MTGetCustomer.cpp" line="45"/>
+        <location filename="wob/MTGetEvent.cpp" line="45"/>
+        <location filename="wob/MTGetLanguage.cpp" line="49"/>
+        <location filename="wob/MTGetMyRights.cpp" line="41"/>
+        <location filename="wob/MTGetMyRoles.cpp" line="41"/>
+        <location filename="wob/MTGetOrder.cpp" line="45"/>
+        <location filename="wob/MTGetOrderByBarcode.cpp" line="47"/>
+        <location filename="wob/MTGetOrderList.cpp" line="46"/>
+        <location filename="wob/MTGetOrdersByCustomer.cpp" line="49"/>
+        <location filename="wob/MTGetOrdersByEvents.cpp" line="54"/>
+        <location filename="wob/MTGetTicket.cpp" line="45"/>
+        <location filename="wob/MTGetUserHosts.cpp" line="45"/>
+        <location filename="wob/MTGetUserRoles.cpp" line="45"/>
+        <location filename="wob/MTGetVoucher.cpp" line="45"/>
+        <location filename="wob/MTLogin.cpp" line="66"/>
+        <location filename="wob/MTLogout.cpp" line="40"/>
+        <location filename="wob/MTReservationToOrder.cpp" line="40"/>
+        <location filename="wob/MTServerInfo.cpp" line="43"/>
+        <location filename="wob/MTSetHost.cpp" line="50"/>
+        <location filename="wob/MTSetUserDescription.cpp" line="50"/>
+        <location filename="wob/MTSetUserHosts.cpp" line="52"/>
         <location filename="wob/MTSetUserRoles.cpp" line="52"/>
         <source>XML result parser error line %1 col %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="wob/MOAddress.cpp" line="106"/>
+        <location filename="wob/MOAddress.cpp" line="112"/>
+        <location filename="wob/MOAddress.cpp" line="118"/>
+        <location filename="wob/MOArtist.cpp" line="60"/>
+        <location filename="wob/MOCartOrder.cpp" line="96"/>
+        <location filename="wob/MOCartTicket.cpp" line="99"/>
+        <location filename="wob/MOCartTicket.cpp" line="105"/>
+        <location filename="wob/MOCartTicket.cpp" line="111"/>
+        <location filename="wob/MOCartTicket.cpp" line="123"/>
+        <location filename="wob/MOCartVoucher.cpp" line="81"/>
+        <location filename="wob/MOCartVoucher.cpp" line="87"/>
+        <location filename="wob/MOContact.cpp" line="61"/>
+        <location filename="wob/MOContact.cpp" line="67"/>
+        <location filename="wob/MOContact.cpp" line="73"/>
+        <location filename="wob/MOContactType.cpp" line="53"/>
+        <location filename="wob/MOCustomer.cpp" line="91"/>
+        <location filename="wob/MOCustomerInfoAbstract.cpp" line="60"/>
+        <location filename="wob/MOEvent.cpp" line="117"/>
+        <location filename="wob/MOEvent.cpp" line="123"/>
+        <location filename="wob/MOEvent.cpp" line="129"/>
+        <location filename="wob/MOEvent.cpp" line="135"/>
+        <location filename="wob/MOEvent.cpp" line="159"/>
+        <location filename="wob/MOEvent.cpp" line="172"/>
+        <location filename="wob/MOEvent.cpp" line="178"/>
+        <location filename="wob/MOEvent.cpp" line="188"/>
+        <location filename="wob/MOItemInfo.cpp" line="66"/>
+        <location filename="wob/MOItemInfo.cpp" line="72"/>
+        <location filename="wob/MOItemInfo.cpp" line="82"/>
+        <location filename="wob/MOItemInfo.cpp" line="88"/>
+        <location filename="wob/MOItemInfo.cpp" line="94"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="185"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="191"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="201"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="211"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="242"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="254"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="260"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="266"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="272"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="282"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="288"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="143"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="149"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="158"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="164"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="170"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="182"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="188"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="194"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="200"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="206"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="212"/>
+        <location filename="wob/MOPrice.cpp" line="61"/>
+        <location filename="wob/MOPrice.cpp" line="67"/>
+        <location filename="wob/MOPrice.cpp" line="73"/>
+        <location filename="wob/MOPrice.cpp" line="79"/>
+        <location filename="wob/MORoom.cpp" line="57"/>
+        <location filename="wob/MOShipping.cpp" line="58"/>
+        <location filename="wob/MOShipping.cpp" line="64"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="118"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="124"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="136"/>
+        <location filename="wob/MOVoucher.cpp" line="99"/>
+        <location filename="wob/MOVoucher.cpp" line="105"/>
+        <location filename="wob/MOVoucher.cpp" line="120"/>
+        <source>Class &apos;%1&apos; property &apos;%2&apos; is integer, but non-integer was found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="wob/MOCartOrder.cpp" line="90"/>
+        <location filename="wob/MOCartTicket.cpp" line="117"/>
+        <location filename="wob/MOCartVoucher.cpp" line="93"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="248"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="176"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="130"/>
+        <location filename="wob/MOVoucher.cpp" line="111"/>
+        <source>Class &apos;%1&apos; property &apos;%2&apos; is enum, invalid value was found.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initkey</name>
     <message>
-        <location filename="main.cpp" line="170"/>
         <source>Warning</source>
-        <translation>Warnung</translation>
+        <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="158"/>
         <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>
+        <translation type="obsolete">MagicSmoke braucht einen Hostkey. Sie müssen einen Hostkey generieren bevor das Programm benutzt werden kann.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="164"/>
         <source>Enter Host Name</source>
-        <translation>Bitte Hostnamen eingeben</translation>
+        <translation type="obsolete">Bitte Hostnamen eingeben</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="165"/>
         <source>Host name:</source>
-        <translation>Hostname:</translation>
+        <translation type="obsolete">Hostname:</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="170"/>
         <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>
+        <translation type="obsolete">MagicSmoke braucht einen Hostnamen. Sie müssen einen Hostnamen eingeben bevor das Programm benutzt werden kann.</translation>
     </message>
 </context>
 <context>
     <name>initprofile</name>
     <message>
-        <location filename="main.cpp" line="179"/>
         <source>default</source>
         <comment>initial profile</comment>
-        <translation>Standardprofil</translation>
+        <translation type="obsolete">Standardprofil</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="180"/>
         <source>Create Initial Profile</source>
-        <translation>Initiales Profil anlegen</translation>
+        <translation type="obsolete">Initiales Profil anlegen</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="180"/>
         <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>
+        <translation type="obsolete">MagicSmoke braucht mindestens ein Profil um benutzt zu werden. Es wird nun eines generieren. Bitte geben Sie einen Namen für das Profil ein:</translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="176"/>
+        <source>Initial Profile Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="176"/>
+        <source>You need a profile to work with Magic Smoke. Please create one now.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4153,37 +5070,37 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>misc</name>
     <message>
-        <location filename="misc.cpp" line="52"/>
+        <location filename="misc/misc.cpp" line="52"/>
         <source>%1.%2</source>
         <comment>price with decimal dot</comment>
         <translation>%1,%2</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="60"/>
+        <location filename="misc/misc.cpp" line="60"/>
         <source>.</source>
         <comment>decimal dot in price</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="86"/>
+        <location filename="misc/misc.cpp" line="86"/>
         <source>[0-9]+\.[0-9]{2}</source>
         <comment>regexp for price</comment>
         <translation>[0-9]+,[0-9]{2}</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="94"/>
+        <location filename="misc/misc.cpp" line="94"/>
         <source>yyyy-MM-dd</source>
         <comment>localized date format</comment>
         <translation>d.M.yyyy</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="102"/>
+        <location filename="misc/misc.cpp" line="102"/>
         <source>hh:mm</source>
         <comment>localized time format</comment>
         <translation>hh:mm</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="110"/>
+        <location filename="misc/misc.cpp" line="110"/>
         <source>yyyy-MM-dd hh:mm</source>
         <comment>localized date + time format</comment>
         <translation>ddd, dd.MM.yyyy hh:mm &apos;Uhr&apos;</translation>
@@ -4192,27 +5109,27 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>office</name>
     <message>
-        <location filename="office.cpp" line="47"/>
+        <location filename="templates/office.cpp" line="47"/>
         <source>Chose Printer</source>
         <translation>Drucker auswählen</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="50"/>
+        <location filename="templates/office.cpp" line="50"/>
         <source>Please chose a printer:</source>
         <translation>Bitte wählen Sie einen Drucker:</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="54"/>
+        <location filename="templates/office.cpp" line="54"/>
         <source>(Default Printer)</source>
         <translation>(Standarddrucker)</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="70"/>
+        <location filename="templates/office.cpp" line="70"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="92"/>
+        <location filename="templates/office.cpp" line="92"/>
         <source>Save current document as...</source>
         <translation>Aktuelles Dokuement speichern unter...</translation>
     </message>
@@ -4220,484 +5137,388 @@ Verbleibender Betrag: %2</translation>
 <context>
     <name>php::</name>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="259"/>
         <source>Unknown Customer</source>
         <translation type="obsolete">Unbekannter Kunde</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="271"/>
         <source>Unable to parse XML.</source>
         <translation type="obsolete">Kann XML Daten nicht parsen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="316"/>
         <source>Cannot find customer ID to delete.</source>
         <translation type="obsolete">Kann zu löschende Kundennummer nicht finden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="322"/>
         <source>Invalid Customer ID, cannot delete.</source>
         <translation type="obsolete">Ungültige Kundennummer kann nicht gelöscht werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="330"/>
         <source>Invalid Customer ID, cannot merge.</source>
         <translation type="obsolete">Ungültige Kundennummer kann nicht vereint werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="348"/>
         <source>Cannot find Customer ID, cannot delete.</source>
         <translation type="obsolete">Kann zu löschende Kundennummer nicht finden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="369"/>
         <source>Cannot merge customers.</source>
         <translation type="obsolete">Kann Kunden-Einträge nicht vereinen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="379"/>
         <source>Cannot delete customer.</source>
         <translation type="obsolete">Kann Kunde nicht löschen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="257"/>
         <source>Malformed request.</source>
         <translation type="obsolete">Fehlerhaftes Anfrageformat.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/event.php" line="424"/>
         <source>The event id must be numeric.</source>
         <translation type="obsolete">Die Veranstaltungsnummer muss numerisch sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/event.php" line="438"/>
         <source>Invalid event id.</source>
         <translation type="obsolete">Ungültige Veranstaltungsnummer.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="800"/>
         <source>Cannot place order, sorry.</source>
         <translation type="obsolete">Kann Bestellung nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="790"/>
         <source>Cannot place sale, sorry.</source>
         <translation type="obsolete">Kann Verkauf nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="805"/>
         <source>Internal Error: unknown action.</source>
         <translation type="obsolete">Interner Fehler: unbekannte Aktion.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="873"/>
         <source>No such orderID in database.</source>
         <translation type="obsolete">Diese Bestellnummer existiert nicht in der Datenbank.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="884"/>
         <source>Expected 2 arguments.</source>
         <translation type="obsolete">2 Argumente erwartet.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="890"/>
         <source>Invalid Order ID</source>
         <translation type="obsolete">Ungültige Bestellnummer.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="896"/>
         <source>Expected positive amount.</source>
         <translation type="obsolete">Die Anzahl muss eine positive Zahl sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="905"/>
         <source>Order does not exist.</source>
         <translation type="obsolete">Bestellung existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="911"/>
         <source>Order cannot be changed, it is closed.</source>
         <translation type="obsolete">Die Bestellung kann nicht geändert werden, da sie bereits geschlossen ist.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="970"/>
         <source>Order ID must be numeric.</source>
         <translation type="obsolete">Bestellnummer muss numerisch sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="980"/>
         <source>Order ID is invalid.</source>
         <translation type="obsolete">Bestellnummer ist ungültig.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="961"/>
         <source>Wrong state, cannot set order to shipped.</source>
         <translation type="obsolete">Kann Bestellung nicht auf &quot;versandt&quot; setzen: sie ist im falschen Ausgangszustand.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="986"/>
         <source>Wrong state, cannot set order to cancelled.</source>
         <translation type="obsolete">Kann Bestellung nicht auf &quot;abgebrochen&quot; setzen: sie ist im falschen Ausgangszustand.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ticket not found.</source>
         <translation type="obsolete">Karte nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ticket has no order.</source>
         <translation type="obsolete">Karte hat keine Bestellung.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The ticket is not valid.</source>
         <translation type="obsolete">Die Karte ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The ticket has already been used.</source>
         <translation type="obsolete">Die Karte wurde bereits benutzt.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The ticket has not been bought or is cancelled.</source>
         <translation type="obsolete">Die Karte wurde nicht gekauft oder ist zurückgegeben.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The ticket has not been paid.</source>
         <translation type="obsolete">Die Karte ist nicht bezahlt.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The tickets order is in an invalid state or does not exist.</source>
         <translation type="obsolete">Die Bestellung dieser Karte ist in einem ungültigen Zustand oder existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="292"/>
         <source>Unable to find this ticket.</source>
         <translation type="obsolete">Kann diese Karte nicht finden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="262"/>
         <source>Price must be a number.</source>
         <translation type="obsolete">Der Preis muss eine Zahl sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="267"/>
         <source>Price must be positive.</source>
         <translation type="obsolete">Der Preis muss positiv sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="297"/>
         <source>Ticket cannot be returned.</source>
         <translation type="obsolete">Karte kann nicht zurückgegeben werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="577"/>
         <source>unable to parse XML data</source>
         <translation type="obsolete">Kann XML Daten nicht parsen</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/host.php" line="91"/>
         <source>Cannot delete special hosts.</source>
         <translation type="obsolete">Spezialhosts können nicht gelöscht werden.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>missing some authentication data</source>
         <translation type="obsolete">Authentifikationsdaten sind unvollständig</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Not authenticated. Can&apos;t change password.</source>
         <translation type="obsolete">Nicht authentifiziert, Passwort kann nicht geändert werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="582"/>
         <source>expected exactly one passwd element</source>
         <translation type="obsolete">Nur 1 &quot;passwd&quot; Element erwartet.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="590"/>
         <source>cannot set an empty password</source>
         <translation type="obsolete">Leeres Passwort kann nicht gesetzt werden</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ooops. Unable to find user. You have been deleted.</source>
         <translation type="obsolete">Ups. Sie wurden gelöscht.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Wrong password. Session hijacked, terminating it.</source>
         <translation type="obsolete">Falsches Passwort. Session wird beendet.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="376"/>
         <source>invalid user name</source>
         <translation type="obsolete">Falscher Nutzername.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="335"/>
         <source>expected exactly 1 ACL element</source>
         <translation type="obsolete">Clientfehler: es wurde nur 1 ACL Element erwartet.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="434"/>
         <source>unknown user name</source>
         <translation type="obsolete">Unbekannter Nutzer.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="418"/>
         <source>expected exactly 1 Hosts element</source>
         <translation type="obsolete">Clientfehler: es wurde nur 1 Hosts Element erwartet.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="522"/>
         <source>Syntax Error</source>
         <translation type="obsolete">Syntaxfehler</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="540"/>
         <source>Cannot remove user: DB error while deleting ACL.</source>
         <translation type="obsolete">Kann Nutzer nicht löschen: Datenbankfehler beim Löschen der Zugriffsrechte.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="549"/>
         <source>Cannot remove user: unable to replace user.</source>
         <translation type="obsolete">Kann Nutzer nicht löschen: kann Nutzer nicht ersetzen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="563"/>
         <source>Cannot remove user: DB error while deleting user.</source>
         <translation type="obsolete">Kann Nutzer nicht löschen: Datenbankfehler beim Löschen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="595"/>
         <source>Unable to change this password.</source>
         <translation type="obsolete">Dieses Passwort kann nicht geändert werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="42"/>
         <source>Template File not found in database</source>
         <translation type="obsolete">Vorlage kann nicht gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="83"/>
         <source>Unable to find file name</source>
         <translation type="obsolete">Dateiname kann nicht gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="91"/>
         <source>Illegal File Name</source>
         <translation type="obsolete">Illegaler Dateiname</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="73"/>
         <source>Invalid Request, please use the MagicSmoke Client with this page.</source>
         <translation type="obsolete">Interner Fehler: Fehlerhafte Anfrage - bitte einen aktuellen MagicSmoke Client benutzen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="127"/>
         <source>Invalid or missing sessionid, or session timed out.</source>
         <translation type="obsolete">Die Session kann nicht benutzt werden. Bitte neu anmelden.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="139"/>
         <source>Session not yet authenticated.</source>
         <translation type="obsolete">Die Session ist noch nicht authentifiziert.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="151"/>
         <source>You do not have the right to execute this transaction.</source>
         <translation type="obsolete">Sie haben nicht das Recht diese Transaktin durchzuführen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="492"/>
         <source>Internal Error: unknown command, hiccup in code structure.</source>
         <translation type="obsolete">Interner Fehler: unbekanntes Kommando, Fehler in Code-Struktur. Bitte melden Sie diesen Fehler und wie es dazu kam dem Programmierer.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>invalidvalue</source>
         <comment>voucher state</comment>
         <translation type="obsolete">Gutscheinwert nicht zulässig</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>invalidprice</source>
         <comment>voucher state</comment>
         <translation type="obsolete">Gutscheinpreis nicht zulässig</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Shipping type not available to user.</source>
         <translation type="obsolete">Diese Versandoption ist privilegierten Nutzern vorbehalten.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Illegal shipping type.</source>
         <translation type="obsolete">Ungültige Versandoption.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="916"/>
         <source>Order cannot be paid for, it is only a reservation. Order or sell it first!</source>
         <translation type="obsolete">Dies ist eine Reservierung: kann keine Bezahlung annehmen solange sie nicht bestellt wurde.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1072"/>
         <source>Unable to update order comment.</source>
         <translation type="obsolete">Kann Bestellkommentar nicht Ã¤ndern.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1217"/>
         <source>Invalid Order.</source>
         <translation type="obsolete">Ungültige Bestellung.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1112"/>
         <source>Invalid Shipping Method.</source>
         <translation type="obsolete">Ungültige Versandoption.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1179"/>
         <source>Unable to create new shipping method.</source>
         <translation type="obsolete">Kann neue Versandoption nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1188"/>
         <source>Unable to change shipping method.</source>
         <translation type="obsolete">Kann Versandoption nicht Ã¤ndern.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1201"/>
         <source>Expected a numeric shipping ID.</source>
         <translation type="obsolete">Erwarte numerische Versandoptionsnummer.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1206"/>
         <source>Unable to delete shipping method.</source>
         <translation type="obsolete">Kann Versandoption nicht löschen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1224"/>
         <source>Cannot change order from reservation.</source>
         <translation type="obsolete">Kann Reservierung nicht wandeln.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="98"/>
         <source>Template file does not exist</source>
         <translation type="obsolete">Vorlage existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="295"/>
         <source>Unable to cancel voucher.</source>
         <translation type="obsolete">Kann Gutschein nicht zurückgeben.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="303"/>
         <source>Invalid voucher, cannot empty it.</source>
         <translation type="obsolete">Ungültiger Gutschein, er kann nicht geleert werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="316"/>
         <source>Expected two arguments: voucher id and order id.</source>
         <translation type="obsolete">Es wurden zwei Argumente erwartet: Gutschein-ID und Bestell-ID.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="350"/>
         <source>Invalid voucher id.</source>
         <translation type="obsolete">Ungültige Gutschein-ID.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="360"/>
         <source>Unable to process payment via voucher.</source>
         <translation type="obsolete">Die Bezahlung per Gutschein kann nicht durchgeführt werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="369"/>
         <source>Invalid voucher ID.</source>
         <translation type="obsolete">Ungültige Gutschein-ID.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>create order</source>
         <translation type="obsolete">Bestellung angelegt</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>order cancelled</source>
         <translation type="obsolete">Bestellung storniert</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>reservation to order</source>
         <translation type="obsolete">Reservierung zu Bestellung gewandelt</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="921"/>
         <source>payment</source>
         <translation type="obsolete">Bezahlung</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="921"/>
         <source>refund</source>
         <translation type="obsolete">Geldrückgabe</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1000"/>
         <source>Ticket or Voucher not found.</source>
         <translation type="obsolete">Karte oder Gutschein nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1005"/>
         <source>Ticket/Voucher has no order.</source>
         <translation type="obsolete">Karte/Gutschein hat keine Bestellung.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1124"/>
         <source>shipping changed</source>
         <translation type="obsolete">Versand geändert</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1244"/>
         <source>Expected 2 arguments: query type and ID.</source>
         <translation type="obsolete">2 Argumente erwartet: Anfragetyp und ID.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1263"/>
         <source>Invalid Query Type.</source>
         <translation type="obsolete">Ungültige Anfrage.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>cancel voucher</source>
         <translation type="obsolete">Gutschein zurückgegeben</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>empty voucher</source>
         <translation type="obsolete">Gutschein entleert</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>create voucher</source>
         <translation type="obsolete">Gutschein angelegt</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>pay with voucher</source>
         <translation type="obsolete">mit Gutschein bezahlt</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>pay with voucher outside system</source>
         <translation type="obsolete">mit Gutschein außerhalb des Systems bezahlt</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/voucher.php" line="344"/>
         <source>Expected two arguments: voucher id and amount to deduct.</source>
         <translation type="obsolete">2 Argumente erwartet: Gutscheinnummer und Betrag.</translation>
     </message>
index 364f93f..9913f00 100644 (file)
@@ -1,5 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="de">
+<!DOCTYPE TS>
+<TS version="2.0" language="de">
+<context>
+    <name>MAppStyleDialog</name>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="563"/>
+        <source>Application Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="566"/>
+        <source>GUI Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="568"/>
+        <source>System Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="576"/>
+        <source>Stylesheet:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="587"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="590"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="596"/>
+        <source>Select Stylesheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MApplication</name>
     <message>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="97"/>
-        <source>&lt;h3&gt;MagicSmoke %3&lt;/h3&gt;&amp;copy; Konrad Rosenbaum, Peter Keller, 2007-9&lt;br&gt;protected under the GNU GPL v.3 or at your option any newer&lt;p&gt;See also the &lt;a href=&quot;http://smoke.silmor.de&quot;&gt;MagicSmoke Homepage&lt;/a&gt;.&lt;p&gt;This version was compiled from repository &apos;%1&apos; revision &apos;%2&apos;.</source>
+        <location filename="main.cpp" line="92"/>
+        <source>&lt;h3&gt;MagicSmoke %3&lt;/h3&gt;&amp;copy; Konrad Rosenbaum, 2007-2010&lt;br&gt;&amp;copy; Peter Keller, 2007-2008&lt;br&gt;protected under the GNU GPL v.3 or at your option any newer&lt;p&gt;See also the &lt;a href=&quot;http://smoke.silmor.de&quot;&gt;MagicSmoke Homepage&lt;/a&gt;.&lt;p&gt;This version was compiled from repository &apos;%1&apos; revision &apos;%2&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MBackupDialog</name>
     <message>
-        <location filename="overview.cpp" line="1624"/>
+        <location filename="mwin/overview.cpp" line="560"/>
         <source>Backup Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1629"/>
+        <location filename="mwin/overview.cpp" line="565"/>
         <source>Backup File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1631"/>
+        <location filename="mwin/overview.cpp" line="567"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1634"/>
+        <location filename="mwin/overview.cpp" line="570"/>
         <source>Generations to keep:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1639"/>
+        <location filename="mwin/overview.cpp" line="575"/>
         <source>Automatic Backup:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1643"/>
+        <location filename="mwin/overview.cpp" line="579"/>
         <source>Interval in days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1651"/>
+        <location filename="mwin/overview.cpp" line="587"/>
         <source>&amp;OK</source>
         <translation type="unfinished">Nu &amp;glar! Nehm&apos;sch.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1654"/>
+        <location filename="mwin/overview.cpp" line="590"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Nee lass mal.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1660"/>
+        <location filename="mwin/overview.cpp" line="596"/>
         <source>Backup File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>MCartTab</name>
+    <message>
+        <location filename="mwin/carttab.cpp" line="56"/>
+        <source>Add Ticket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="58"/>
+        <source>Add Voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="60"/>
+        <source>Remove Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="66"/>
+        <source>Customer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="72"/>
+        <source>Shipping Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="75"/>
+        <source>Delivery Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="78"/>
+        <source>Comments:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="85"/>
+        <source>Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="88"/>
+        <source>Reserve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="91"/>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="105"/>
+        <source>C&amp;art</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="106"/>
+        <source>Add &amp;Ticket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="107"/>
+        <source>Add &amp;Voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="108"/>
+        <source>&amp;Remove Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="109"/>
+        <source>&amp;Abort Shopping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="111"/>
+        <source>&amp;Update Shipping Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="122"/>
+        <source>(No Shipping)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="133"/>
+        <source>Amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="133"/>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="133"/>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="166"/>
+        <source>Select Event to order Ticket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="179"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="182"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MCentDialog</name>
     <message>
         <location filename="widgets/centbox.cpp" line="105"/>
 <context>
     <name>MCheckDialog</name>
     <message>
-        <location filename="widgets/checkdlg.cpp" line="33"/>
+        <location filename="dialogs/checkdlg.cpp" line="33"/>
         <source>Ok</source>
         <translation>Is gud so.</translation>
     </message>
     <message>
-        <location filename="widgets/checkdlg.cpp" line="35"/>
+        <location filename="dialogs/checkdlg.cpp" line="35"/>
         <source>Cancel</source>
         <translation>Abbreschen</translation>
     </message>
 </context>
 <context>
+    <name>MConfigDialog</name>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="49"/>
+        <source>Magic Smoke Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="60"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="61"/>
+        <source>&amp;New Profile...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="62"/>
+        <source>&amp;Delete Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="63"/>
+        <source>&amp;Rename Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="64"/>
+        <source>C&amp;lone Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="65"/>
+        <source>&amp;Make Default Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="67"/>
+        <source>&amp;Export Host Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="68"/>
+        <source>&amp;Import Host Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="69"/>
+        <source>&amp;Generate Host Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="71"/>
+        <source>&amp;Close Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="72"/>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="73"/>
+        <source>&amp;Language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="74"/>
+        <source>&amp;OpenOffice.org Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="75"/>
+        <source>Set &amp;Default Label Font...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="76"/>
+        <source>Set &amp;Application Style...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="90"/>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="95"/>
+        <source>Server URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="100"/>
+        <source>Proxy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="108"/>
+        <source>Proxy Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="111"/>
+        <source>Proxy Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="118"/>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="121"/>
+        <source>Hostname:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="124"/>
+        <source>Hostkey:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="127"/>
+        <source>Default Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="133"/>
+        <source>SSL Exceptions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="135"/>
+        <source>List of non-fatal SSL exceptions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="143"/>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="145"/>
+        <source>Probe Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="252"/>
+        <location filename="dialogs/configdialog.cpp" line="328"/>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="252"/>
+        <location filename="dialogs/configdialog.cpp" line="287"/>
+        <location filename="dialogs/configdialog.cpp" line="328"/>
+        <source>Please enter a profile name. It must be non-empty and must not be used yet:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="287"/>
+        <source>Rename Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="294"/>
+        <location filename="dialogs/configdialog.cpp" line="402"/>
+        <location filename="dialogs/configdialog.cpp" line="417"/>
+        <location filename="dialogs/configdialog.cpp" line="429"/>
+        <location filename="dialogs/configdialog.cpp" line="437"/>
+        <location filename="dialogs/configdialog.cpp" line="441"/>
+        <location filename="dialogs/configdialog.cpp" line="446"/>
+        <location filename="dialogs/configdialog.cpp" line="451"/>
+        <location filename="dialogs/configdialog.cpp" line="456"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="294"/>
+        <source>This profile name is already in use.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="378"/>
+        <source>Generate Hostkey</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="378"/>
+        <source>Do you really want to generate a new host key for this profile? This may disable all accounts from this host.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="393"/>
+        <source>Export Key to File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="402"/>
+        <source>Unable to open file %1 for writing: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="417"/>
+        <source>Importing a key overwrites the host key that is currently used by this profile. This may disable your accounts. Do you still want to continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="420"/>
+        <source>Import Key from File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="429"/>
+        <source>Unable to open file %1 for reading: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="437"/>
+        <location filename="dialogs/configdialog.cpp" line="441"/>
+        <source>This is not a host key file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="446"/>
+        <source>This host key file does not contain a valid host name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="451"/>
+        <source>This host key file does not contain a valid key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="456"/>
+        <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="477"/>
+        <source>Chose Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="477"/>
+        <source>Please chose a default font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="510"/>
+        <location filename="dialogs/configdialog.cpp" line="512"/>
+        <source>Server Probe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="510"/>
+        <source>The request finished without errors.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="512"/>
+        <source>The request finished with an error: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="523"/>
+        <source>SSL Errors encountered:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="526"/>
+        <source>Certificate &quot;%1&quot;
+  Fingerprint (sha1): %2
+  Error: %3
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="531"/>
+        <source>Accept connection anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="532"/>
+        <source>SSL Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="550"/>
+        <source>Common Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="550"/>
+        <source>SHA-1 Digest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="550"/>
+        <source>Error Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MCustomerDialog</name>
     <message>
-        <location filename="customer.cpp" line="254"/>
+        <location filename="dialogs/customerdlg.cpp" line="206"/>
         <source>Customer %1</source>
         <translation>Gunde %1</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="256"/>
+        <location filename="dialogs/customerdlg.cpp" line="208"/>
         <source>New Customer</source>
         <translation>Neier Gunde</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="262"/>
+        <location filename="dialogs/customerdlg.cpp" line="214"/>
         <source>Name:</source>
         <translation>Dor Name:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="264"/>
+        <location filename="dialogs/customerdlg.cpp" line="216"/>
         <source>Address:</source>
         <translation>De Adresse:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="267"/>
+        <location filename="dialogs/customerdlg.cpp" line="219"/>
         <source>Contact Information:</source>
         <translation>Wie mor den erreischen gann:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="272"/>
+        <location filename="dialogs/customerdlg.cpp" line="224"/>
         <source>Web-Login/eMail:</source>
         <translation>Wie er sisch im Web anmelden gann:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="275"/>
+        <location filename="dialogs/customerdlg.cpp" line="227"/>
         <source>Comment:</source>
         <translation>Gommendar:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="283"/>
+        <location filename="dialogs/customerdlg.cpp" line="235"/>
         <source>Save</source>
         <translation>Schbeichorn</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="286"/>
+        <location filename="dialogs/customerdlg.cpp" line="238"/>
         <source>Cancel</source>
         <translation>Doch ni&apos; machen</translation>
     </message>
 <context>
     <name>MCustomerListDialog</name>
     <message>
-        <location filename="customer.cpp" line="73"/>
+        <location filename="dialogs/customerdlg.cpp" line="37"/>
         <source>Select a Customer</source>
         <translation>Gunde auswählen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="75"/>
+        <location filename="dialogs/customerdlg.cpp" line="39"/>
         <source>Customers</source>
         <translation>Gunden</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="96"/>
+        <location filename="dialogs/customerdlg.cpp" line="60"/>
         <source>Details...</source>
         <translation>Dedails anzeichen...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="98"/>
+        <location filename="dialogs/customerdlg.cpp" line="62"/>
         <source>Create new...</source>
         <translation>Neuen anlechen...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="101"/>
+        <location filename="dialogs/customerdlg.cpp" line="65"/>
         <source>Delete...</source>
         <translation>Wechschmeißen...</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="109"/>
+        <location filename="dialogs/customerdlg.cpp" line="73"/>
         <source>Select</source>
         <translation>Auswählen</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="112"/>
+        <location filename="dialogs/customerdlg.cpp" line="76"/>
         <source>Cancel</source>
         <translation>Mach ma ni&apos;</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="115"/>
+        <location filename="dialogs/customerdlg.cpp" line="79"/>
         <source>Close</source>
         <translation>Zumachn</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="202"/>
+        <location filename="dialogs/customerdlg.cpp" line="165"/>
         <source>Delete Customer</source>
         <translation>Gunden Löschn</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="205"/>
+        <location filename="dialogs/customerdlg.cpp" line="168"/>
         <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="208"/>
+        <location filename="dialogs/customerdlg.cpp" line="171"/>
         <source>merge with other entry:</source>
         <translation>Mid &apos;nem andorn Eindrag zusamm&apos;lechn:</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="220"/>
+        <location filename="dialogs/customerdlg.cpp" line="183"/>
         <source>&amp;Yes</source>
         <translation>&amp;Nu glar!</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="222"/>
+        <location filename="dialogs/customerdlg.cpp" line="185"/>
         <source>&amp;No</source>
         <translation>Nee &amp;Lass ma!</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="360"/>
+        <location filename="dialogs/customerdlg.cpp" line="192"/>
         <source>Error</source>
-        <translation type="obsolete">Gans doller falschor Fehler</translation>
+        <translation type="unfinished">Gans doller falschor Fehler</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="356"/>
         <source>Failed to delete customer.</source>
         <translation type="obsolete">Gann den Gunden ni löschen. Gomm&apos;se morchen nochma&apos;.</translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="360"/>
-        <source>Failed to delete customer: %1</source>
-        <translation type="obsolete">Gann den Gunden &quot;%1&quot; ni löschen. Gomm&apos;se morchen nochma&apos;.</translation>
+        <location filename="dialogs/customerdlg.cpp" line="192"/>
+        <source>Failed to delete customer: %1</source>
+        <translation type="unfinished">Gann den Gunden &quot;%1&quot; ni löschen. Gomm&apos;se morchen nochma&apos;.</translation>
+    </message>
+</context>
+<context>
+    <name>MEntranceTab</name>
+    <message>
+        <location filename="mwin/entrancetab.cpp" line="40"/>
+        <source>Enter or scan Ticket-ID:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MEvent</name>
     <message>
-        <location filename="event.cpp" line="186"/>
         <source>Event is not complete, cannot save.</source>
         <translation type="obsolete">De Veranschdaldung is ni gombledd, das gansch so ni abschiggn.</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="31"/>
+        <location filename="iface/event.cpp" line="31"/>
         <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="61"/>
+        <location filename="iface/event.cpp" line="38"/>
+        <location filename="iface/event.cpp" line="61"/>
         <source>.</source>
         <comment>price decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="event.cpp" line="56"/>
+        <location filename="iface/event.cpp" line="46"/>
+        <location filename="iface/event.cpp" line="56"/>
         <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="51"/>
+        <location filename="iface/event.cpp" line="51"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation>d.M.yyyy</translation>
 <context>
     <name>MEventEditor</name>
     <message>
-        <location filename="eventedit.cpp" line="46"/>
+        <location filename="dialogs/eventedit.cpp" line="46"/>
         <source>Event Editor</source>
         <translation>Voranschdaldungsvorwurschdler</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="63"/>
+        <location filename="dialogs/eventedit.cpp" line="63"/>
         <source>Title:</source>
         <translation>Diddel:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="68"/>
+        <location filename="dialogs/eventedit.cpp" line="68"/>
         <source>Artist:</source>
         <translation>Günsdlor:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="73"/>
+        <location filename="dialogs/eventedit.cpp" line="73"/>
         <source>Description:</source>
         <translation>Beschreibung:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="78"/>
+        <location filename="dialogs/eventedit.cpp" line="78"/>
         <source>Start Time:</source>
         <translation>&apos;S fängd an:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="89"/>
+        <location filename="dialogs/eventedit.cpp" line="81"/>
+        <location filename="dialogs/eventedit.cpp" line="89"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="86"/>
+        <location filename="dialogs/eventedit.cpp" line="86"/>
         <source>End Time:</source>
         <translation>&apos;S hörd off:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="94"/>
+        <location filename="dialogs/eventedit.cpp" line="94"/>
         <source>Room/Place:</source>
         <translation>&apos;S bassierd hier:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="103"/>
+        <location filename="dialogs/eventedit.cpp" line="103"/>
         <source>Capacity:</source>
         <translation>Magsimale Gäsde:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="109"/>
+        <location filename="dialogs/eventedit.cpp" line="109"/>
         <source>Default Price:</source>
         <translation>Gardenbreis:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="115"/>
+        <location filename="dialogs/eventedit.cpp" line="115"/>
         <source>Event Cancelled:</source>
         <translation>Voranschaldung absachn:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="127"/>
+        <location filename="dialogs/eventedit.cpp" line="127"/>
         <source>Save</source>
         <translation>Schbeichorn</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="177"/>
+        <location filename="dialogs/eventedit.cpp" line="130"/>
+        <location filename="dialogs/eventedit.cpp" line="177"/>
         <source>Cancel</source>
         <translation>Ne&apos; schbeichorn</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="39"/>
+        <location filename="dialogs/eventedit.cpp" line="39"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="39"/>
+        <location filename="dialogs/eventedit.cpp" line="39"/>
         <source>Unable to load event from server.</source>
         <translation>Gann de Voranschdaldung ni&apos; offm Reschnor findn&apos;.</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="145"/>
         <source>Problem while uploading event: %s</source>
         <translation type="obsolete">Isch gann de Voranschdaldung ni hochladen: %s</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="161"/>
+        <location filename="dialogs/eventedit.cpp" line="161"/>
         <source>Select a Room</source>
         <translation>Raum anlechen</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="172"/>
+        <location filename="dialogs/eventedit.cpp" line="172"/>
         <source>New...</source>
         <comment>new room</comment>
         <translation>Neier Raum...</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="175"/>
+        <location filename="dialogs/eventedit.cpp" line="175"/>
         <source>Select</source>
         <comment>select room</comment>
         <translation>Auswählen</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="181"/>
         <source>New Room</source>
         <translation type="obsolete">Neier Raum</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="181"/>
         <source>Name of new room:</source>
         <translation type="obsolete">Name vom dem Raum:</translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="58"/>
+        <location filename="dialogs/eventedit.cpp" line="58"/>
         <source>ID:</source>
         <translation>Nummor:</translation>
     </message>
 <context>
     <name>MEventSummary</name>
     <message>
-        <location filename="eventsummary.cpp" line="39"/>
+        <location filename="dialogs/eventsummary.cpp" line="39"/>
         <source>Summary for Event %1</source>
         <translation>Zusamm&apos;fassung für de Veranschdaldung %1</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="49"/>
+        <location filename="dialogs/eventsummary.cpp" line="49"/>
         <source>Title:</source>
         <translation>Diddel:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="51"/>
+        <location filename="dialogs/eventsummary.cpp" line="51"/>
         <source>Artist:</source>
         <translation>Günsdlor:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="53"/>
+        <location filename="dialogs/eventsummary.cpp" line="53"/>
         <source>Start:</source>
         <translation>Da gehds los:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>Date+Time format for displaying event start time</comment>
         <translation type="obsolete">ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="55"/>
+        <location filename="dialogs/eventsummary.cpp" line="55"/>
         <source>Capacity:</source>
         <translation>Magsimale Gäsde:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="57"/>
+        <location filename="dialogs/eventsummary.cpp" line="57"/>
         <source>Tickets currently reserved:</source>
         <translation>Garden die resorvierd sind:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="59"/>
+        <location filename="dialogs/eventsummary.cpp" line="59"/>
         <source>Tickets currently cancelled:</source>
         <translation>Garden die zurüggegeben wurd&apos;n:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="61"/>
+        <location filename="dialogs/eventsummary.cpp" line="61"/>
         <source>Tickets currently usable:</source>
         <translation>Garden die genudsd werden gönn&apos;:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="63"/>
+        <location filename="dialogs/eventsummary.cpp" line="63"/>
         <source>Total Income:</source>
         <translation>Summe dor Einnahm&apos;n:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Price</source>
         <translation>Breis</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Bought</source>
         <translation>Gegaufd</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Used</source>
         <translation>Benudsd</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Unused</source>
         <translation>Unbenudsd</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="102"/>
+        <location filename="dialogs/eventsummary.cpp" line="102"/>
         <source>Print</source>
         <translation>Druggn</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="104"/>
+        <location filename="dialogs/eventsummary.cpp" line="104"/>
         <source>Save as...</source>
         <translation>Schbeichorn undor...</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="107"/>
+        <location filename="dialogs/eventsummary.cpp" line="107"/>
         <source>Close</source>
         <translation>Zumachn</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="186"/>
         <source>Warning</source>
         <translation type="obsolete">Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
         <translation type="obsolete">Gann de Vorlache (eventsummary.odtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="45"/>
+        <location filename="dialogs/eventsummary.cpp" line="45"/>
         <source>Summary</source>
         <translation>Zusamm&apos;fassung</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="68"/>
+        <location filename="dialogs/eventsummary.cpp" line="68"/>
         <source>Tickets</source>
         <translation>Garden</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="84"/>
+        <location filename="dialogs/eventsummary.cpp" line="84"/>
         <source>Comments</source>
         <translation>Gommendare</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="90"/>
+        <location filename="dialogs/eventsummary.cpp" line="90"/>
         <source>Order: </source>
         <translation>Beschdellung:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="dialogs/eventsummary.cpp" line="92"/>
         <source>Customer: </source>
         <translation>Gunde:</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="186"/>
         <source>Unable to get template file (eventsummary). Giving up.</source>
         <translation type="obsolete">Gann de Vorlache (eventsummary) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="193"/>
         <source>Open Document File (*.%1)</source>
         <translation type="obsolete">ODF Dadai (*.%1)</translation>
     </message>
 </context>
 <context>
+    <name>MEventsTab</name>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="56"/>
+        <source>New Event...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="59"/>
+        <source>Details...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="63"/>
+        <source>Order Ticket...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="67"/>
+        <source>Event Summary...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="71"/>
+        <source>Cancel Event...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="85"/>
+        <source>&amp;Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="86"/>
+        <source>&amp;Update Event List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="88"/>
+        <source>&amp;Show/Edit details...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="90"/>
+        <source>&amp;New Event...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="92"/>
+        <source>Show &amp;old Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Reserved</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Sold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Capacity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="134"/>
+        <source>ddd MMMM d yyyy, h:mm ap</source>
+        <comment>time format</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="196"/>
+        <source>Cancel Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="196"/>
+        <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="200"/>
+        <source>Event Cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="200"/>
+        <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="202"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="202"/>
+        <source>Unable to cancel event &quot;%1&quot;: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MHostTab</name>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="235"/>
+        <source>New Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="238"/>
+        <source>Add This Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="241"/>
+        <source>Delete Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="245"/>
+        <source>Generate New Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="248"/>
+        <source>Import...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="251"/>
+        <source>Export...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="274"/>
+        <source>Host Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="274"/>
+        <source>Host Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MKeyGen</name>
     <message numerus="yes">
-        <location filename="keygen.cpp" line="88"/>
+        <location filename="crypto/keygen.cpp" line="59"/>
+        <location filename="crypto/keygen.cpp" line="89"/>
         <source>Current random buffer: %n Bits</source>
         <translation>
             <numerusform>Aktueller Füllschdand vom dem Zufallsbuffer: %n Bid</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="42"/>
+        <location filename="crypto/keygen.cpp" line="43"/>
         <source>Magic Smoke Key Generator</source>
         <translation>Mädschig Schmohg Schlüsselgenerador</translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="53"/>
+        <location filename="crypto/keygen.cpp" line="54"/>
         <source>&lt;html&gt;&lt;h1&gt;Key Generation&lt;/h1&gt;
 I am currently collecting random bits in order to generate a host key for this installation. Please use mouse and keyboard to generate more random. Alternatively you can load a key from an external medium.&lt;p&gt;
 At least %1 Bits of random are required.</source>
         <translation>&lt;html&gt;&lt;h1&gt;Schlüsselgenerierung&lt;/h1&gt;Das Brogramm sammeld grade Zufallsbids für diese Inschdalladsion. &lt;br&gt;Das iss im Grunde ne&apos; ganz eefache Sache. Basse off: Du waggelsd Ã¤ bissl an dor Maus und hämmerst wie Ã¤ Beglobbder off de Dasdadur. Dann wenn&apos;s Brogramm genug Zufall had wird de rode Leisde unden grün. Das heesd Du gannst offhörn und Disch wiedor wie&apos;n normaler Mensch benehm&apos;.Wenn Dir das nich bassd gannsde och jemand andres den Schrodd machn&apos; lassn&apos; und &apos;ne Schlüsseldadei laden.&lt;p&gt;Mindeschdens %1 Zufallsbids brauchsde. Geene Sorsche das gehd fix.</translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="69"/>
+        <location filename="crypto/keygen.cpp" line="70"/>
         <source>&amp;OK</source>
         <translation>Nu &amp;glar! Nehm&apos;sch.</translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="71"/>
+        <location filename="crypto/keygen.cpp" line="72"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Nee lass mal.</translation>
     </message>
@@ -547,656 +1173,854 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MLabelDialog</name>
     <message>
-        <location filename="labeldlg.cpp" line="40"/>
+        <location filename="templates/labeldlg.cpp" line="40"/>
         <source>Label Printing Setup</source>
         <translation>Aufglebordruggeinschdellung</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="49"/>
+        <location filename="templates/labeldlg.cpp" line="49"/>
         <source>mm</source>
         <comment>defaultmetric: mm, in, cm</comment>
         <translation>mm</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="75"/>
+        <location filename="templates/labeldlg.cpp" line="75"/>
         <source>Label offset:</source>
         <translation>Aufgleborabschdand:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="81"/>
+        <location filename="templates/labeldlg.cpp" line="81"/>
         <source>Label size:</source>
         <translation>Aufgleborgröße:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="87"/>
+        <location filename="templates/labeldlg.cpp" line="87"/>
         <source>Unit:</source>
         <translation>Einheid:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="89"/>
+        <location filename="templates/labeldlg.cpp" line="89"/>
         <source>Millimeter</source>
         <translation>Millimedor</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="90"/>
+        <location filename="templates/labeldlg.cpp" line="90"/>
         <source>Centimeter</source>
         <translation>Sendimedor</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="91"/>
+        <location filename="templates/labeldlg.cpp" line="91"/>
         <source>Inch</source>
         <translation>Zoll (Insch)</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="99"/>
+        <location filename="templates/labeldlg.cpp" line="99"/>
         <source>Page usage:</source>
         <translation>Seidennudsung:</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="102"/>
+        <location filename="templates/labeldlg.cpp" line="102"/>
         <source>Page %1</source>
         <translation>Seide %1</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="146"/>
+        <location filename="templates/labeldlg.cpp" line="146"/>
         <source>Ok</source>
         <translation>Is gud so.</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="150"/>
+        <location filename="templates/labeldlg.cpp" line="150"/>
         <source>Cancel</source>
         <translation>Abbreschn</translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="303"/>
+        <location filename="templates/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>
+    <name>MLogin</name>
+    <message>
+        <location filename="dialogs/login.cpp" line="34"/>
+        <source>Magic Smoke Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="40"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="41"/>
+        <source>&amp;Exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="42"/>
+        <source>&amp;Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="43"/>
+        <source>&amp;Configuration...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="51"/>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="55"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="58"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="69"/>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="111"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/login.cpp" line="111"/>
+        <source>Unable to log in.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MMainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="71"/>
         <source>Profile:</source>
-        <translation>Brofiel:</translation>
+        <translation type="obsolete">Brofiel:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="75"/>
         <source>Alternate Hostname:</source>
-        <translation>Andror Reschnername:</translation>
+        <translation type="obsolete">Andror Reschnername:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="78"/>
         <source>Server URL:</source>
-        <translation>URL vom diggen Reschnor:</translation>
+        <translation type="obsolete">URL vom diggen Reschnor:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="81"/>
         <source>Proxy:</source>
-        <translation>Web-Broggsie:</translation>
+        <translation type="obsolete">Web-Broggsie:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="102"/>
         <source>Username:</source>
-        <translation>Nudsorname:</translation>
+        <translation type="obsolete">Nudsorname:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="105"/>
         <source>Password:</source>
-        <translation>Gans doll geheimer Gohd:</translation>
+        <translation type="obsolete">Gans doll geheimer Gohd:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="196"/>
         <source>New Profile</source>
-        <translation>Neues Brofiel</translation>
+        <translation type="obsolete">Neues Brofiel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="196"/>
         <source>Please enter a profile name. It must be non-empty and must not be used yet:</source>
-        <translation>Bidde gäben&apos;se &apos;nen Namen für das neue Brofiel ein. Der darf noch ni&apos; benudsd sein und leer darf&apos;or och nedd sein:</translation>
+        <translation type="obsolete">Bidde gäben&apos;se &apos;nen Namen für das neue Brofiel ein. Der darf noch ni&apos; benudsd sein und leer darf&apos;or och nedd sein:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
         <source>Proxy Username:</source>
-        <translation>Nudsername für&apos;n Broggsie:</translation>
+        <translation type="obsolete">Nudsername für&apos;n Broggsie:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="93"/>
         <source>Proxy Password:</source>
-        <translation>Geheimer Gohd für&apos;n Broggsie:</translation>
+        <translation type="obsolete">Geheimer Gohd für&apos;n Broggsie:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="336"/>
         <source>Warning</source>
-        <translation>Dumm gelaufen</translation>
+        <translation type="obsolete">Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="216"/>
         <source>Unable to log in. Error: %1</source>
         <translation type="obsolete">Isch gann nisch off&apos;n gross&apos;n Reschner. Der will nisch weil: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="48"/>
         <source>&amp;File</source>
-        <translation>&amp;Dadai</translation>
+        <translation type="obsolete">&amp;Dadai</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="49"/>
         <source>&amp;New Profile...</source>
-        <translation>&amp;Neues Brofiel</translation>
+        <translation type="obsolete">&amp;Neues Brofiel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="50"/>
         <source>&amp;Save Profile</source>
-        <translation>Brofiel &amp;schbeichorn</translation>
+        <translation type="obsolete">Brofiel &amp;schbeichorn</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="52"/>
         <source>&amp;Close Window</source>
-        <translation>Fänsdor &amp;zumach&apos;n</translation>
+        <translation type="obsolete">Fänsdor &amp;zumach&apos;n</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="53"/>
         <source>&amp;Configure</source>
-        <translation>&amp;Gonfiguriern</translation>
+        <translation type="obsolete">&amp;Gonfiguriern</translation>
+    </message>
+    <message>
+        <source>new Profile</source>
+        <translation type="obsolete">Neues Brofiel</translation>
+    </message>
+    <message>
+        <source>save Profile</source>
+        <translation type="obsolete">Brofiel schbeichorn</translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="obsolete">Droff offn&apos; Reschnor</translation>
+    </message>
+    <message>
+        <source>&amp;Language...</source>
+        <translation type="obsolete">&amp;Schbrache...</translation>
+    </message>
+    <message>
+        <source>&amp;Export Host Key...</source>
+        <translation type="obsolete">Rechnorschlüssel &amp;eggsbordiern...</translation>
+    </message>
+    <message>
+        <source>&amp;Import Host Key...</source>
+        <translation type="obsolete">Reschnorschlüssel &amp;imbordiern...</translation>
+    </message>
+    <message>
+        <source>&amp;Generate Host Key...</source>
+        <translation type="obsolete">Rechnorschlüssel &amp;orzeuchen...</translation>
+    </message>
+    <message>
+        <source>Export Key to File</source>
+        <translation type="obsolete">Schlüssel als Dadei ablechen</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1 for writing: %2</source>
+        <translation type="obsolete">Gann de Dadai %1 nicht zum Schreiben offmachen weil: %2</translation>
+    </message>
+    <message>
+        <source>Importing a key overwrites the host key that is currently used by this program. This may disable your accounts. Do you still want to continue?</source>
+        <translation type="obsolete">Wennsde nen Schlüssel imbordierst wirde abor och den agduellen Schlüssel löschen. Das gönnde Fadal sein - frach&apos; ma&apos; eenen der sisch ausgennd! Willsde das jedsd drodsem machen?</translation>
+    </message>
+    <message>
+        <source>Import Key from File</source>
+        <translation type="obsolete">Schlüssel aus nor Dadai holen</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1 for reading: %2</source>
+        <translation type="obsolete">Gann de Dadai %1 nisch lesen. Des iss jedsd geene Ordografieschwäche, sondern: %2</translation>
+    </message>
+    <message>
+        <source>This is not a host key file.</source>
+        <translation type="obsolete">Das is abor doch gar ge Schlüssel! Willsde misch verarschen?</translation>
+    </message>
+    <message>
+        <source>This host key file does not contain a valid key.</source>
+        <translation type="obsolete">De Dadai is a bissl gabudd. Die mussde nochmal holen, ich gann die so ned lesen.</translation>
+    </message>
+    <message>
+        <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
+        <translation type="obsolete">Isch hab da ma nachgereschned. De Scheggsumme vom Schlüssel is falsch. Das gannsch Dir so ni abnehm.</translation>
+    </message>
+    <message>
+        <source>New Host Name</source>
+        <translation type="obsolete">Neier Reschnorname</translation>
+    </message>
+    <message>
+        <source>Please enter a name for the new host:</source>
+        <translation type="obsolete">Gib ma een Nam&apos; für die Gissde hier ein:</translation>
+    </message>
+    <message>
+        <source>The host name must only consist of letters, digits and underscore. It must start with a letter.</source>
+        <translation type="obsolete">Nee. So ned. Du darfsd nur Buchschdaben, Zifforn 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>
+        <source>This host key file does not contain a valid host name.</source>
+        <translation type="obsolete">De Schlüsseldadai had nen gans seldsamen Reschnornamen da drin. Desdorweschen gannsch die ni nehm.</translation>
+    </message>
+</context>
+<context>
+    <name>MMoneyLog</name>
+    <message>
+        <location filename="dialogs/moneylog.cpp" line="27"/>
+        <source>Money Log of %1 %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/moneylog.cpp" line="40"/>
+        <source>Close</source>
+        <translation type="unfinished">Zumachn</translation>
     </message>
+</context>
+<context>
+    <name>MOCartOrder</name>
     <message>
-        <location filename="mainwindow.cpp" line="114"/>
-        <source>new Profile</source>
-        <translation>Neues Brofiel</translation>
+        <location filename="wob/MOCartOrder.cpp" line="28"/>
+        <location filename="wob/MOCartOrder.cpp" line="37"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="116"/>
-        <source>save Profile</source>
-        <translation>Brofiel schbeichorn</translation>
+        <location filename="wob/MOCartOrder.cpp" line="29"/>
+        <location filename="wob/MOCartOrder.cpp" line="38"/>
+        <source>SaleOnly</source>
+        <oldsource>saleonly</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="119"/>
-        <source>Login</source>
-        <translation>Droff offn&apos; Reschnor</translation>
+        <location filename="wob/MOCartOrder.cpp" line="30"/>
+        <location filename="wob/MOCartOrder.cpp" line="39"/>
+        <source>OrderOnly</source>
+        <oldsource>orderonly</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="54"/>
-        <source>&amp;Language...</source>
-        <translation>&amp;Schbrache...</translation>
+        <location filename="wob/MOCartOrder.cpp" line="31"/>
+        <location filename="wob/MOCartOrder.cpp" line="40"/>
+        <source>Invalid</source>
+        <oldsource>invalid</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="56"/>
-        <source>&amp;Export Host Key...</source>
-        <translation>Rechnorschlüssel &amp;eggsbordiern...</translation>
+        <location filename="wob/MOCartOrder.cpp" line="28"/>
+        <location filename="wob/MOCartOrder.cpp" line="37"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="57"/>
-        <source>&amp;Import Host Key...</source>
-        <translation>Reschnorschlüssel &amp;imbordiern...</translation>
+        <location filename="wob/MOCartOrder.cpp" line="29"/>
+        <location filename="wob/MOCartOrder.cpp" line="38"/>
+        <source>SaleOnly</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="58"/>
-        <source>&amp;Generate Host Key...</source>
-        <translation>Rechnorschlüssel &amp;orzeuchen...</translation>
+        <location filename="wob/MOCartOrder.cpp" line="30"/>
+        <location filename="wob/MOCartOrder.cpp" line="39"/>
+        <source>OrderOnly</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="277"/>
-        <source>Export Key to File</source>
-        <translation>Schlüssel als Dadei ablechen</translation>
+        <location filename="wob/MOCartOrder.cpp" line="31"/>
+        <location filename="wob/MOCartOrder.cpp" line="40"/>
+        <source>Invalid</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOCartTicket</name>
     <message>
-        <location filename="mainwindow.cpp" line="286"/>
-        <source>Unable to open file %1 for writing: %2</source>
-        <translation>Gann de Dadai %1 nicht zum Schreiben offmachen weil: %2</translation>
+        <location filename="wob/MOCartTicket.cpp" line="30"/>
+        <location filename="wob/MOCartTicket.cpp" line="40"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="297"/>
-        <source>Importing a key overwrites the host key that is currently used by this program. This may disable your accounts. Do you still want to continue?</source>
-        <translation>Wennsde nen Schlüssel imbordierst wirde abor och den agduellen Schlüssel löschen. Das gönnde Fadal sein - frach&apos; ma&apos; eenen der sisch ausgennd! Willsde das jedsd drodsem machen?</translation>
+        <location filename="wob/MOCartTicket.cpp" line="31"/>
+        <location filename="wob/MOCartTicket.cpp" line="41"/>
+        <source>TooLate</source>
+        <oldsource>toolate</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="300"/>
-        <source>Import Key from File</source>
-        <translation>Schlüssel aus nor Dadai holen</translation>
+        <location filename="wob/MOCartTicket.cpp" line="32"/>
+        <location filename="wob/MOCartTicket.cpp" line="42"/>
+        <source>Exhausted</source>
+        <oldsource>exhausted</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="309"/>
-        <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>
+        <location filename="wob/MOCartTicket.cpp" line="33"/>
+        <location filename="wob/MOCartTicket.cpp" line="43"/>
+        <source>SaleOnly</source>
+        <oldsource>saleonly</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="321"/>
-        <source>This is not a host key file.</source>
-        <translation>Das is abor doch gar ge Schlüssel! Willsde misch verarschen?</translation>
+        <location filename="wob/MOCartTicket.cpp" line="34"/>
+        <location filename="wob/MOCartTicket.cpp" line="44"/>
+        <source>OrderOnly</source>
+        <oldsource>orderonly</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="331"/>
-        <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>
+        <location filename="wob/MOCartTicket.cpp" line="30"/>
+        <location filename="wob/MOCartTicket.cpp" line="40"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="336"/>
-        <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>
+        <location filename="wob/MOCartTicket.cpp" line="31"/>
+        <location filename="wob/MOCartTicket.cpp" line="41"/>
+        <source>TooLate</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
-        <source>New Host Name</source>
-        <translation>Neier Reschnorname</translation>
+        <location filename="wob/MOCartTicket.cpp" line="32"/>
+        <location filename="wob/MOCartTicket.cpp" line="42"/>
+        <source>Exhausted</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
-        <source>Please enter a name for the new host:</source>
-        <translation>Gib ma een Nam&apos; für die Gissde hier ein:</translation>
+        <location filename="wob/MOCartTicket.cpp" line="33"/>
+        <location filename="wob/MOCartTicket.cpp" line="43"/>
+        <source>SaleOnly</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="265"/>
-        <source>The host name must only consist of letters, digits and underscore. It must start with a letter.</source>
-        <translation>Nee. So ned. Du darfsd nur Buchschdaben, Zifforn 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>
+        <location filename="wob/MOCartTicket.cpp" line="34"/>
+        <location filename="wob/MOCartTicket.cpp" line="44"/>
+        <source>OrderOnly</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOCartVoucher</name>
     <message>
-        <location filename="mainwindow.cpp" line="326"/>
-        <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>
+        <location filename="wob/MOCartVoucher.cpp" line="26"/>
+        <location filename="wob/MOCartVoucher.cpp" line="34"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="60"/>
-        <source>&amp;OpenOffice.org Settings...</source>
+        <location filename="wob/MOCartVoucher.cpp" line="27"/>
+        <location filename="wob/MOCartVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
+        <oldsource>invalidvalue</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="61"/>
-        <source>Set &amp;Default Label Font...</source>
+        <location filename="wob/MOCartVoucher.cpp" line="28"/>
+        <location filename="wob/MOCartVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
+        <oldsource>invalidprice</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="224"/>
-        <source>Unable to log in.</source>
+        <location filename="wob/MOCartVoucher.cpp" line="26"/>
+        <location filename="wob/MOCartVoucher.cpp" line="34"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="353"/>
-        <source>Chose Default Font</source>
+        <location filename="wob/MOCartVoucher.cpp" line="27"/>
+        <location filename="wob/MOCartVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="353"/>
-        <source>Please chose a default font:</source>
+        <location filename="wob/MOCartVoucher.cpp" line="28"/>
+        <location filename="wob/MOCartVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MMoneyLog</name>
+    <name>MOOrderAbstract</name>
     <message>
-        <location filename="moneylog.cpp" line="27"/>
-        <source>Money Log of %1 %2</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="43"/>
+        <source>Placed</source>
+        <oldsource>placed</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="moneylog.cpp" line="40"/>
-        <source>Close</source>
-        <translation type="unfinished">Zumachn</translation>
+        <location filename="wob/MOOrderAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="44"/>
+        <source>Sent</source>
+        <oldsource>sent</oldsource>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOAddress</name>
     <message>
-        <location filename="wob/MOAddress.cpp" line="108"/>
-        <source>Class MOAddress property addressid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="45"/>
+        <source>Sold</source>
+        <oldsource>sold</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOAddress.cpp" line="114"/>
-        <source>Class MOAddress property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
+        <oldsource>cancelled</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOArtist</name>
     <message>
-        <location filename="wob/MOArtist.cpp" line="60"/>
-        <source>Class MOArtist property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="47"/>
+        <source>Reserved</source>
+        <oldsource>reserved</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCartOrder</name>
     <message>
-        <location filename="wob/MOCartOrder.cpp" line="72"/>
-        <source>Class MOCartOrder property status is enum, invalid value was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="48"/>
+        <source>Closed</source>
+        <oldsource>closed</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartOrder.cpp" line="78"/>
-        <source>Class MOCartOrder property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="43"/>
+        <source>Placed</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCartTicket</name>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="79"/>
-        <source>Class MOCartTicket property eventid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="44"/>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="85"/>
-        <source>Class MOCartTicket property amount is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="45"/>
+        <source>Sold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="91"/>
-        <source>Class MOCartTicket property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="97"/>
-        <source>Class MOCartTicket property status is enum, invalid value was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="47"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="103"/>
-        <source>Class MOCartTicket property maxamount is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="48"/>
+        <source>Closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MOCartVoucher</name>
-    <message>
-        <location filename="wob/MOCartVoucher.cpp" line="65"/>
-        <source>Class MOCartVoucher property value is integer, but non-integer was found.</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>MOOrderInfoAbstract</name>
     <message>
-        <location filename="wob/MOCartVoucher.cpp" line="71"/>
-        <source>Class MOCartVoucher property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="43"/>
+        <source>Placed</source>
+        <oldsource>placed</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartVoucher.cpp" line="77"/>
-        <source>Class MOCartVoucher property status is enum, invalid value was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="44"/>
+        <source>Sent</source>
+        <oldsource>sent</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOContact</name>
     <message>
-        <location filename="wob/MOContact.cpp" line="61"/>
-        <source>Class MOContact property contactid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="45"/>
+        <source>Sold</source>
+        <oldsource>sold</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOContact.cpp" line="67"/>
-        <source>Class MOContact property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
+        <oldsource>cancelled</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOContact.cpp" line="73"/>
-        <source>Class MOContact property contacttypeid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="47"/>
+        <source>Reserved</source>
+        <oldsource>reserved</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOContactType</name>
     <message>
-        <location filename="wob/MOContactType.cpp" line="53"/>
-        <source>Class MOContactType property contacttypeid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="48"/>
+        <source>Closed</source>
+        <oldsource>closed</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCustomer</name>
     <message>
-        <location filename="wob/MOCustomer.cpp" line="77"/>
-        <source>Class MOCustomer property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="43"/>
+        <source>Placed</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCustomerShort</name>
     <message>
-        <location filename="wob/MOCustomerShort.cpp" line="46"/>
-        <source>Class MOCustomerShort property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="44"/>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOEvent</name>
     <message>
-        <location filename="wob/MOEvent.cpp" line="112"/>
-        <source>Class MOEvent property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="45"/>
+        <source>Sold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="118"/>
-        <source>Class MOEvent property start is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="124"/>
-        <source>Class MOEvent property end is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="47"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="130"/>
-        <source>Class MOEvent property capacity is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="48"/>
+        <source>Closed</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOTicketAbstract</name>
     <message>
-        <location filename="wob/MOEvent.cpp" line="161"/>
-        <source>Class MOEvent property amountSold is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="38"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="52"/>
+        <source>Reserved</source>
+        <oldsource>reserved</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="167"/>
-        <source>Class MOEvent property amountReserved is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="39"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="53"/>
+        <source>Ordered</source>
+        <oldsource>ordered</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="177"/>
-        <source>Class MOEvent property tax is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="40"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="54"/>
+        <source>Used</source>
+        <oldsource>used</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOOrder</name>
     <message>
-        <location filename="wob/MOOrder.cpp" line="111"/>
-        <source>Class MOOrder property orderid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="41"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="55"/>
+        <source>Cancelled</source>
+        <oldsource>cancelled</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="117"/>
-        <source>Class MOOrder property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="42"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="56"/>
+        <source>Refund</source>
+        <oldsource>refund</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="138"/>
-        <source>Class MOOrder property amountpaid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="43"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="57"/>
+        <source>MaskBlock</source>
+        <oldsource>maskblock</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="144"/>
-        <source>Class MOOrder property state is enum, invalid value was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="44"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="58"/>
+        <source>MaskPay</source>
+        <oldsource>maskpay</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="150"/>
-        <source>Class MOOrder property amountdue is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="45"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="59"/>
+        <source>MaskUsable</source>
+        <oldsource>maskusable</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="156"/>
-        <source>Class MOOrder property totalprice is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="46"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="60"/>
+        <source>MaskReturnable</source>
+        <oldsource>maskreturnable</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="162"/>
-        <source>Class MOOrder property ordertime is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="38"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="52"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="168"/>
-        <source>Class MOOrder property senttime is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="39"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="53"/>
+        <source>Ordered</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOPrice</name>
     <message>
-        <location filename="wob/MOPrice.cpp" line="61"/>
-        <source>Class MOPrice property eventid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="40"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="54"/>
+        <source>Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOPrice.cpp" line="67"/>
-        <source>Class MOPrice property pricecategoryid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="41"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="55"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOPrice.cpp" line="73"/>
-        <source>Class MOPrice property maxavailable is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="42"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="56"/>
+        <source>Refund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOPrice.cpp" line="79"/>
-        <source>Class MOPrice property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="43"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="57"/>
+        <source>MaskBlock</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MORoom</name>
     <message>
-        <location filename="wob/MORoom.cpp" line="57"/>
-        <source>Class MORoom property capacity is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="44"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="58"/>
+        <source>MaskPay</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOShipping</name>
     <message>
-        <location filename="wob/MOShipping.cpp" line="61"/>
-        <source>Class MOShipping property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="45"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="59"/>
+        <source>MaskUsable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOShipping.cpp" line="67"/>
-        <source>Class MOShipping property cost is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="46"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="60"/>
+        <source>MaskReturnable</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MOTicket</name>
-    <message>
-        <location filename="wob/MOTicket.cpp" line="90"/>
-        <source>Class MOTicket property eventid is integer, but non-integer was found.</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>MOVoucher</name>
     <message>
-        <location filename="wob/MOTicket.cpp" line="96"/>
-        <source>Class MOTicket property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="26"/>
+        <location filename="wob/MOVoucher.cpp" line="34"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOTicket.cpp" line="102"/>
-        <source>Class MOTicket property status is enum, invalid value was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="27"/>
+        <location filename="wob/MOVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
+        <oldsource>invalidvalue</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOTicket.cpp" line="108"/>
-        <source>Class MOTicket property orderid is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="28"/>
+        <location filename="wob/MOVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
+        <oldsource>invalidprice</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOVoucher</name>
     <message>
-        <location filename="wob/MOVoucher.cpp" line="78"/>
-        <source>Class MOVoucher property value is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="26"/>
+        <location filename="wob/MOVoucher.cpp" line="34"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOVoucher.cpp" line="84"/>
-        <source>Class MOVoucher property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="27"/>
+        <location filename="wob/MOVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOVoucher.cpp" line="90"/>
-        <source>Class MOVoucher property status is enum, invalid value was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="28"/>
+        <location filename="wob/MOVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MOfficeConfig</name>
     <message>
-        <location filename="office.cpp" line="102"/>
+        <location filename="templates/office.cpp" line="102"/>
         <source>Configure OpenOffice.org Access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="112"/>
+        <location filename="templates/office.cpp" line="112"/>
         <source>OpenOffice.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="114"/>
+        <location filename="templates/office.cpp" line="114"/>
         <source>Path to Executable:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="116"/>
+        <location filename="templates/office.cpp" line="116"/>
         <source>...</source>
         <comment>select OpenOffice path button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="119"/>
+        <location filename="templates/office.cpp" line="119"/>
         <source>Printing ODF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="122"/>
+        <location filename="templates/office.cpp" line="122"/>
         <source>Printer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="125"/>
+        <location filename="templates/office.cpp" line="125"/>
         <source>(Default Printer)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="135"/>
+        <location filename="templates/office.cpp" line="135"/>
         <source>Always confirm printer when printing ODF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="137"/>
+        <location filename="templates/office.cpp" line="137"/>
         <source>Save printed files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="140"/>
+        <location filename="templates/office.cpp" line="140"/>
         <source>Opening ODF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="142"/>
+        <location filename="templates/office.cpp" line="142"/>
         <source>Always open as Read-Only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="144"/>
+        <location filename="templates/office.cpp" line="144"/>
         <source>Automatically open all newly created files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="150"/>
+        <location filename="templates/office.cpp" line="150"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="153"/>
+        <location filename="templates/office.cpp" line="153"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="173"/>
+        <location filename="templates/office.cpp" line="173"/>
         <source>Select OpenOffice.org executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1204,115 +2028,99 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrder</name>
     <message>
-        <location filename="order.cpp" line="122"/>
         <source>placed</source>
         <comment>state</comment>
         <translation type="obsolete">bladsierd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="123"/>
         <source>sent</source>
         <comment>state</comment>
         <translation type="obsolete">abgeschiggd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="124"/>
         <source>cancelled</source>
         <comment>state</comment>
         <translation type="obsolete">abgebroch&apos;n</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="125"/>
         <source>closed</source>
         <comment>state</comment>
         <translation type="obsolete">geschlossn</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="127"/>
         <source>check: ok</source>
         <comment>state</comment>
         <translation type="obsolete">Brüfung: is gud so</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="128"/>
         <source>check: sale only</source>
         <comment>state</comment>
         <translation type="obsolete">Brüfung: nur zum Vergauf</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="129"/>
         <source>check: order only</source>
         <comment>state</comment>
         <translation type="obsolete">Brüfung: nur zur Beschdellung</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="130"/>
         <source>check: failed</source>
         <comment>state</comment>
         <translation type="obsolete">Brüfung: gehd ni. Wirschlich ni.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="131"/>
         <source>invalid</source>
         <comment>state</comment>
         <translation type="obsolete">ungüldsch</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="obsolete">,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="181"/>
+        <location filename="iface/order.cpp" line="159"/>
+        <location filename="iface/order.cpp" line="181"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="192"/>
+        <location filename="iface/order.cpp" line="170"/>
+        <location filename="iface/order.cpp" line="192"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation>d.M.yyyy</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="445"/>
         <source>This ticket is not part of this order.</source>
         <translation type="obsolete">De Garde gehörd ni zu dor Beschdellung. Da mussde was vorwegseld ham!</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="531"/>
         <source>Error</source>
         <translation type="obsolete">Gans doller falschor Fehler</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="527"/>
         <source>The request failed.</source>
         <translation type="obsolete">De Anfrache is schiefgegangen.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="531"/>
         <source>A problem occurred during the order: %1</source>
         <translation type="obsolete">Isch hadde nen Broblem mit dor Beschdellung: %1</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="126"/>
         <source>reserved</source>
         <comment>state</comment>
         <translation type="obsolete">resorvierd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="454"/>
         <source>Cannot query DB, don&apos;t know it.</source>
         <translation type="obsolete">Gann de Dadenbank ni frachn, isch wes im Momend ni so rischdsch wo se iss.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="466"/>
         <source>Cannot update shipping: error while sending.</source>
         <translation type="obsolete">Gann de Versandmedode ni Ã¤ndorn. &apos;S iss was beim Sendn schiefgegang&apos;.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="486"/>
         <source>This voucher is not part of this order.</source>
         <translation type="obsolete">Das isn&apos; rischdsch hübschor Gudschein, abor der gehörd ni in diese Beschdellung nei!</translation>
     </message>
@@ -1320,17 +2128,17 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrderItemView</name>
     <message>
-        <location filename="orderwin.cpp" line="988"/>
+        <location filename="dialogs/orderwin.cpp" line="978"/>
         <source>Preview Tickets</source>
         <translation>Garden anguggn.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="996"/>
+        <location filename="dialogs/orderwin.cpp" line="986"/>
         <source>Ticket: </source>
         <translation>Garde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="998"/>
+        <location filename="dialogs/orderwin.cpp" line="988"/>
         <source>Voucher: </source>
         <translation>Gudschein:</translation>
     </message>
@@ -1338,771 +2146,843 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrderWindow</name>
     <message>
-        <location filename="orderwin.cpp" line="52"/>
+        <location filename="dialogs/orderwin.cpp" line="52"/>
         <source>Order Details</source>
         <translation>Beschdelldedails</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="57"/>
+        <location filename="dialogs/orderwin.cpp" line="57"/>
         <source>&amp;Order</source>
         <translation>&amp;Beschdellen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="58"/>
+        <location filename="dialogs/orderwin.cpp" line="58"/>
         <source>&amp;Order...</source>
         <translation>&amp;Beschdellen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="61"/>
         <source>&amp;Sell...</source>
-        <translation>&amp;Vorgofen...</translation>
+        <translation type="obsolete">&amp;Vorgofen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="69"/>
+        <location filename="dialogs/orderwin.cpp" line="60"/>
         <source>C&amp;ancel Order...</source>
         <translation>Beschdellung &amp;abbreschn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="89"/>
+        <location filename="dialogs/orderwin.cpp" line="79"/>
         <source>&amp;Close</source>
         <translation>&amp;Schließen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="91"/>
+        <location filename="dialogs/orderwin.cpp" line="81"/>
         <source>&amp;Payment</source>
         <translation>Bed&amp;sahlung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="93"/>
+        <location filename="dialogs/orderwin.cpp" line="83"/>
         <source>Receive &amp;Payment...</source>
         <translation>&amp;Bedsahln...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="95"/>
+        <location filename="dialogs/orderwin.cpp" line="85"/>
         <source>&amp;Refund...</source>
         <translation>&amp;Zurüggeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="100"/>
+        <location filename="dialogs/orderwin.cpp" line="90"/>
         <source>P&amp;rinting</source>
         <translation>&amp;Druggn</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="102"/>
+        <location filename="dialogs/orderwin.cpp" line="92"/>
         <source>Print &amp;Bill...</source>
         <translation>&amp;Reschnung druggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="103"/>
+        <location filename="dialogs/orderwin.cpp" line="93"/>
         <source>Save Bill &amp;as file...</source>
         <translation>Reschnung als Dadai &amp;schbeichorn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="105"/>
+        <location filename="dialogs/orderwin.cpp" line="95"/>
         <source>Print &amp;Tickets...</source>
         <translation>&amp;Garden druggn...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Print &amp;Current Ticket...</source>
         <translation type="obsolete">&amp;agduelle Garde druggn...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;View Tickets...</source>
         <translation type="obsolete">Gar&amp;den anguggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="119"/>
+        <location filename="dialogs/orderwin.cpp" line="109"/>
         <source>Order ID:</source>
         <translation>Beschdellnummer:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="121"/>
+        <location filename="dialogs/orderwin.cpp" line="111"/>
         <source>Order Date:</source>
         <translation>Beschdelldadum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="123"/>
+        <location filename="dialogs/orderwin.cpp" line="113"/>
         <source>Shipping Date:</source>
         <translation>Versanddadum:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="125"/>
+        <location filename="dialogs/orderwin.cpp" line="115"/>
         <source>Customer:</source>
         <translation>Gunde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="130"/>
+        <location filename="dialogs/orderwin.cpp" line="120"/>
         <source>Sold by:</source>
         <translation>Vergaufd von:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="132"/>
+        <location filename="dialogs/orderwin.cpp" line="122"/>
         <source>Total Price:</source>
         <translation>Endvorbraucherbreis:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="134"/>
+        <location filename="dialogs/orderwin.cpp" line="124"/>
         <source>Already Paid:</source>
         <translation>Schon bedsahld:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="136"/>
+        <location filename="dialogs/orderwin.cpp" line="126"/>
         <source>Order State:</source>
         <translation>Beschdellschdadus:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ticket ID</source>
         <translation type="obsolete">Gardennummer</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Event</source>
         <translation type="obsolete">Veranschdaldung</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Start Time</source>
         <translation type="obsolete">Anfangszeit</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Status</source>
         <translation type="obsolete">Schdadus</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
         <source>Price</source>
         <translation type="obsolete">Breis</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="72"/>
+        <location filename="dialogs/orderwin.cpp" line="62"/>
         <source>&amp;Mark Order as Shipped...</source>
         <translation>Beschdellung is weschgeschiggd...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ch&amp;ange Ticket-Price...</source>
         <translation type="obsolete">Gardenbreis Ã¤ndorn...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Return Ticket...</source>
         <translation type="obsolete">Garde zurüggeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="979"/>
+        <location filename="dialogs/orderwin.cpp" line="969"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="275"/>
         <source>Unable to get template file (ticket.xtt). Giving up.</source>
         <translation type="obsolete">Gann de Vorlache (ticket.xtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (bill.odtt). Giving up.</source>
         <translation type="obsolete">Gann de Vorlache (bill.xtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="878"/>
         <source>Mark as shipped?</source>
         <translation type="obsolete">Als wechgeschiggd margieren?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="878"/>
         <source>Mark this order as shipped now?</source>
         <translation type="obsolete">Als wechgeschiggd margieren? Also jedsd. Rischdisch weg? Beim Gunden?</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to get template file (eventsummary.odtt). Giving up.</source>
         <translation type="obsolete">Gann de Vorlache (eventsummary.odtt) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="649"/>
         <source>Enter Payment</source>
         <translation type="obsolete">Geldbedrach eingeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="649"/>
         <source>Please enter the amount that has been paid:</source>
         <translation type="obsolete">Bidde den Bedrach eingebn der bedsahld wurde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="682"/>
         <source>Unable to submit payment request.</source>
         <translation type="obsolete">Gann de Bedsahlung nisch schbeischorn. De Gommunisdn wolln das Neds vom Geld frei haldn.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="686"/>
         <source>Error while trying to pay: %1</source>
         <translation type="obsolete">&apos;S is bleede, abor da war&apos;n Fehlor beim bedsahln: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="704"/>
         <source>Enter Refund</source>
         <translation type="obsolete">Rügggabe eingäben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="704"/>
         <source>Please enter the amount that will be refunded:</source>
         <translation type="obsolete">Bidde den Bedrach eingebn der zurüggegebn wurde:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="710"/>
         <source>Unable to submit refund request.</source>
         <translation type="obsolete">Gann de Rügggabe nisch schbeischorn. De Bankengriese hadd uns wiedor.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="714"/>
         <source>Error whily trying to refund: %1</source>
         <translation type="obsolete">&apos;S is bleede, abor da war&apos;n Fehlor beim zurüggeben: %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="774"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation type="obsolete">De Garde gannsch ni zurügnehm. Die wurde schonma benudsd oder so.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="778"/>
         <source>Return Ticket</source>
         <translation type="obsolete">Garde zurüggeben</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="778"/>
         <source>Do you really want to return this ticket?</source>
         <translation type="obsolete">Wolln&apos;se de Garde wirschlisch zurüggeben? S&apos;wär schade drum.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="811"/>
         <source>Cancel Order?</source>
         <translation type="obsolete">Beschdellung abbreschn?</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="811"/>
         <source>Cancel this order now?</source>
         <translation type="obsolete">De Beschdellung jedsd wirschlich abbreschn? S&apos;gibd dann kee zurüg mehr - also ni rumheuln!</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="813"/>
         <source>Cannot cancel this order: it is in the wrong state.</source>
         <translation type="obsolete">Gann de Beschdellung ni abbreschn: die hadd wie&apos;n bissl &apos;n falschn Schdadus.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="817"/>
         <source>Failed to cancel this order.</source>
         <translation type="obsolete">Gann de Beschdellung ni abbreschn.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="127"/>
+        <location filename="dialogs/orderwin.cpp" line="117"/>
         <source>Delivery Address:</source>
         <translation>Adresse wo&apos;s Zeuch hin soll:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="dialogs/orderwin.cpp" line="133"/>
         <source>Order Comment:</source>
         <translation>Beschdellgommendar:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="79"/>
+        <location filename="dialogs/orderwin.cpp" line="69"/>
         <source>Change Commen&amp;t...</source>
         <translation>Gommendar Ã¤ndorn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="912"/>
         <source>Set comment: order %1</source>
         <translation type="obsolete">Gommendar Ã¤ndorn: Beschdellung %1</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="923"/>
         <source>&amp;Save</source>
         <translation type="obsolete">&amp;Schbeichorn</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="925"/>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Nee lass mal.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="66"/>
         <source>&amp;Prune and recheck...</source>
-        <translation>Mist wegschmeißn und nochma&apos; scheggn...</translation>
+        <translation type="obsolete">Mist wegschmeißn und nochma&apos; scheggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="64"/>
         <source>Ma&amp;ke Reservation...</source>
-        <translation>Nu da resorviern wor&apos;s hald ersdma!...</translation>
+        <translation type="obsolete">Nu da resorviern wor&apos;s hald ersdma!...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="75"/>
+        <location filename="dialogs/orderwin.cpp" line="65"/>
         <source>Ch&amp;ange Item-Price...</source>
         <translation>Vom margierden den Breis Ã¤ndorn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="77"/>
+        <location filename="dialogs/orderwin.cpp" line="67"/>
         <source>&amp;Return Item...</source>
         <translation>Das margierde Ding zurüggeben...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="81"/>
+        <location filename="dialogs/orderwin.cpp" line="71"/>
         <source>Change Sh&amp;ipping Method...</source>
         <translation>Versandmedode Ã¤ndorn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="106"/>
+        <location filename="dialogs/orderwin.cpp" line="96"/>
         <source>Print V&amp;ouchers...</source>
         <translation>Gudscheine Druggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="107"/>
+        <location filename="dialogs/orderwin.cpp" line="97"/>
         <source>Print &amp;Current Item...</source>
         <translation>Margierdes druggen...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="108"/>
+        <location filename="dialogs/orderwin.cpp" line="98"/>
         <source>&amp;View Items...</source>
         <translation>Alles ma genau anguggn...</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
-        <source>Shipping Method:</source>
-        <translation>Versandmedode:</translation>
+        <location filename="dialogs/orderwin.cpp" line="128"/>
+        <source>Shipping Method:</source>
+        <translation>Versandmedode:</translation>
+    </message>
+    <message>
+        <location filename="dialogs/orderwin.cpp" line="131"/>
+        <source>Shipping Costs:</source>
+        <translation>Versandgosden:</translation>
+    </message>
+    <message>
+        <source>Item ID</source>
+        <translation type="obsolete">De Nummor</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="obsolete">Beschreibung</translation>
+    </message>
+    <message>
+        <source>Voucher (current value: %1)</source>
+        <translation type="obsolete">Gudschein (agduell issor %1 werd)</translation>
+    </message>
+    <message>
+        <source>There are no tickets left to print.</source>
+        <translation type="obsolete">Eivorbübbschd, da ist gehne Garde, die mor druggn gönn&apos;.</translation>
+    </message>
+    <message>
+        <source>There are no vouchers left to print.</source>
+        <translation type="obsolete">Eivorbübbschd, da ist gehn Gudschein, den mor druggn gönn&apos;.</translation>
+    </message>
+    <message>
+        <source>Unable to get template file (voucher.xtt). Giving up.</source>
+        <translation type="obsolete">Gann de Vorlache (voucher) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+    </message>
+    <message>
+        <source>Unable to get template file (bill). Giving up.</source>
+        <translation type="obsolete">Gann de Vorlache (bill) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+    </message>
+    <message>
+        <source>Unable to get template file (eventsummary). Giving up.</source>
+        <translation type="obsolete">Gann de Vorlache (eventsummary) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+    </message>
+    <message>
+        <source>Open Document File (*.%1)</source>
+        <translation type="obsolete">ODF Dadai (*.%1)</translation>
+    </message>
+    <message>
+        <source>Enter Price</source>
+        <translation type="obsolete">Breis eingäbn</translation>
+    </message>
+    <message>
+        <source>Please enter the new price for the ticket:</source>
+        <translation type="obsolete">Gib ma een Breis ein, und machn hübsch rund:</translation>
+    </message>
+    <message>
+        <source>Cannot change this item type.</source>
+        <translation type="obsolete">Die Ard von Ardiggel gansch&apos; ni Ã¤ndorn.</translation>
+    </message>
+    <message>
+        <source>This voucher cannot be returned, it has already been used.</source>
+        <translation type="obsolete">Den Gudschein gannsch ni zurügnehm. Der wurde schonma benudsd, der iss ja schon angebissn.</translation>
+    </message>
+    <message>
+        <source>Return Voucher</source>
+        <translation type="obsolete">Gudschein zurüggeben</translation>
+    </message>
+    <message>
+        <source>Do you really want to return this voucher?</source>
+        <translation type="obsolete">Wolln&apos;se den Gudschein wirschlisch zurüggeben? S&apos;wär schade drum.</translation>
+    </message>
+    <message>
+        <source>Cannot return this item type.</source>
+        <translation type="obsolete">Die Ard von Ardiggel gansch&apos; ni zurüggnehm. S&apos;duhd mir leid.</translation>
+    </message>
+    <message>
+        <location filename="dialogs/orderwin.cpp" line="74"/>
+        <source>MoneyLog for Order...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/orderwin.cpp" line="76"/>
+        <source>MoneyLog for selected Voucher...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/orderwin.cpp" line="969"/>
+        <source>This is not a voucher, cannot show the money log.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/orderwin.cpp" line="87"/>
+        <source>Pay with &amp;Voucher...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MOrdersTab</name>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="53"/>
+        <source>-select mode-</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="54"/>
+        <source>All Orders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="55"/>
+        <source>Open Orders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="56"/>
+        <source>Open Reservations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="57"/>
+        <source>Outstanding Payments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="58"/>
+        <source>Outstanding Refunds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="59"/>
+        <source>Undelivered Orders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="61"/>
+        <source>-search result-</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="69"/>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="72"/>
+        <source>Details...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="76"/>
+        <source>Find by Ticket...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="141"/>
-        <source>Shipping Costs:</source>
-        <translation>Versandgosden:</translation>
+        <location filename="mwin/orderstab.cpp" line="79"/>
+        <source>Find by Event...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
-        <source>Item ID</source>
-        <translation type="obsolete">De Nummor</translation>
+        <location filename="mwin/orderstab.cpp" line="82"/>
+        <source>Find by Customer...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="174"/>
-        <source>Description</source>
-        <translation type="obsolete">Beschreibung</translation>
+        <location filename="mwin/orderstab.cpp" line="85"/>
+        <source>Find by Order ID...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="194"/>
-        <source>Voucher (current value: %1)</source>
-        <translation type="obsolete">Gudschein (agduell issor %1 werd)</translation>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="269"/>
-        <source>There are no tickets left to print.</source>
-        <translation type="obsolete">Eivorbübbschd, da ist gehne Garde, die mor druggn gönn&apos;.</translation>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Total</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="310"/>
-        <source>There are no vouchers left to print.</source>
-        <translation type="obsolete">Eivorbübbschd, da ist gehn Gudschein, den mor druggn gönn&apos;.</translation>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Paid</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="316"/>
-        <source>Unable to get template file (voucher.xtt). Giving up.</source>
-        <translation type="obsolete">Gann de Vorlache (voucher) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Customer</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="414"/>
-        <source>Unable to get template file (bill). Giving up.</source>
-        <translation type="obsolete">Gann de Vorlache (bill) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+        <location filename="mwin/orderstab.cpp" line="157"/>
+        <location filename="mwin/orderstab.cpp" line="181"/>
+        <location filename="mwin/orderstab.cpp" line="198"/>
+        <location filename="mwin/orderstab.cpp" line="202"/>
+        <location filename="mwin/orderstab.cpp" line="251"/>
+        <location filename="mwin/orderstab.cpp" line="279"/>
+        <location filename="mwin/orderstab.cpp" line="300"/>
+        <location filename="mwin/orderstab.cpp" line="304"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>Unable to get template file (eventsummary). Giving up.</source>
-        <translation type="obsolete">Gann de Vorlache (eventsummary) ni findn&apos;. Isch hab mor Mühe gegebn. Abor jedsd gebsch off.</translation>
+        <location filename="mwin/orderstab.cpp" line="157"/>
+        <location filename="mwin/orderstab.cpp" line="251"/>
+        <source>There was a problem retrieving the order list: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="422"/>
-        <source>Open Document File (*.%1)</source>
-        <translation type="obsolete">ODF Dadai (*.%1)</translation>
+        <location filename="mwin/orderstab.cpp" line="181"/>
+        <location filename="mwin/orderstab.cpp" line="300"/>
+        <source>Error while retrieving order: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="741"/>
-        <source>Enter Price</source>
-        <translation type="obsolete">Breis eingäbn</translation>
+        <location filename="mwin/orderstab.cpp" line="193"/>
+        <source>Enter Ticket</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="741"/>
-        <source>Please enter the new price for the ticket:</source>
-        <translation type="obsolete">Gib ma een Breis ein, und machn hübsch rund:</translation>
+        <location filename="mwin/orderstab.cpp" line="193"/>
+        <source>Please enter the ID of one of the tickets of the order you seek:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="747"/>
-        <source>Cannot change this item type.</source>
-        <translation type="obsolete">Die Ard von Ardiggel gansch&apos; ni Ã¤ndorn.</translation>
+        <location filename="mwin/orderstab.cpp" line="198"/>
+        <source>Error while searching for order: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="795"/>
-        <source>This voucher cannot be returned, it has already been used.</source>
-        <translation type="obsolete">Den Gudschein gannsch ni zurügnehm. Der wurde schonma benudsd, der iss ja schon angebissn.</translation>
+        <location filename="mwin/orderstab.cpp" line="202"/>
+        <source>Order for barcode &apos;%1&apos; not found.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="799"/>
-        <source>Return Voucher</source>
-        <translation type="obsolete">Gudschein zurüggeben</translation>
+        <location filename="mwin/orderstab.cpp" line="215"/>
+        <source>Select Event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="799"/>
-        <source>Do you really want to return this voucher?</source>
-        <translation type="obsolete">Wolln&apos;se den Gudschein wirschlisch zurüggeben? S&apos;wär schade drum.</translation>
+        <location filename="mwin/orderstab.cpp" line="228"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="806"/>
-        <source>Cannot return this item type.</source>
-        <translation type="obsolete">Die Ard von Ardiggel gansch&apos; ni zurüggnehm. S&apos;duhd mir leid.</translation>
+        <location filename="mwin/orderstab.cpp" line="230"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="84"/>
-        <source>MoneyLog for Order...</source>
+        <location filename="mwin/orderstab.cpp" line="279"/>
+        <source>Error while retrieving order list: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="86"/>
-        <source>MoneyLog for selected Voucher...</source>
+        <location filename="mwin/orderstab.cpp" line="295"/>
+        <source>Enter Order ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="979"/>
-        <source>This is not a voucher, cannot show the money log.</source>
+        <location filename="mwin/orderstab.cpp" line="295"/>
+        <source>Please enter the ID of the order you want to display:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="97"/>
-        <source>Pay with &amp;Voucher...</source>
+        <location filename="mwin/orderstab.cpp" line="304"/>
+        <source>This order does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MOverview</name>
     <message>
-        <location filename="overview.cpp" line="86"/>
+        <location filename="mwin/overview.cpp" line="67"/>
         <source>&amp;Session</source>
         <translation>&amp;Sidsung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="87"/>
+        <location filename="mwin/overview.cpp" line="68"/>
         <source>&amp;Re-Login</source>
         <translation>&amp;Noch&apos;ma einloggn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="94"/>
+        <location filename="mwin/overview.cpp" line="75"/>
         <source>&amp;Close Session</source>
         <translation>Sidsung &amp;Zumachn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="96"/>
         <source>&amp;Event</source>
-        <translation>&amp;Veranschdaldung</translation>
+        <translation type="obsolete">&amp;Veranschdaldung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="108"/>
+        <location filename="mwin/overview.cpp" line="113"/>
         <source>&amp;Customer</source>
         <translation>&amp;Gunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="147"/>
+        <location filename="mwin/overview.cpp" line="86"/>
         <source>Events</source>
         <translation>Veranschdaldungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1578"/>
+        <location filename="mwin/overview.cpp" line="186"/>
+        <location filename="mwin/overview.cpp" line="196"/>
+        <location filename="mwin/overview.cpp" line="489"/>
+        <location filename="mwin/overview.cpp" line="493"/>
+        <location filename="mwin/overview.cpp" line="514"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="411"/>
         <source>I was unable to renew the login at the server, the error was: %1</source>
         <translation type="obsolete">Isch gann de&apos; Verbindung off&apos;n gross&apos;n Reschner nisch erneuern. Der will nisch weil: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="82"/>
         <source>&amp;Offline mode</source>
         <translation type="obsolete">&amp;Ohne Neds und Dobbelden Boden</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="101"/>
         <source>&amp;New Event...</source>
-        <translation>Veranschdaldung &amp;absach&apos;n...</translation>
+        <translation type="obsolete">Veranschdaldung &amp;absach&apos;n...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="109"/>
+        <location filename="mwin/overview.cpp" line="114"/>
         <source>&amp;Show all customers</source>
         <translation>&amp;Alle Gunden anzeigen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="111"/>
         <source>C&amp;art</source>
-        <translation>Eing&amp;aufswagen</translation>
+        <translation type="obsolete">Eing&amp;aufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="112"/>
         <source>Add &amp;Ticket</source>
-        <translation>Ein&amp;driddsgarde hinzufüchen</translation>
+        <translation type="obsolete">Ein&amp;driddsgarde hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="113"/>
         <source>Add &amp;Voucher</source>
-        <translation>&amp;Gudschein hinzufüchen</translation>
+        <translation type="obsolete">&amp;Gudschein hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="114"/>
         <source>&amp;Remove Item</source>
-        <translation>Doch &amp;ni&apos; nehm&apos;</translation>
+        <translation type="obsolete">Doch &amp;ni&apos; nehm&apos;</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="115"/>
         <source>&amp;Abort Shopping</source>
-        <translation>&amp;Eingauf Abbrechen</translation>
+        <translation type="obsolete">&amp;Eingauf Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="157"/>
         <source>New Event...</source>
-        <translation>Neue Veranschdaldung...</translation>
+        <translation type="obsolete">Neue Veranschdaldung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="249"/>
         <source>Details...</source>
-        <translation>Dedails anzeichen...</translation>
+        <translation type="obsolete">Dedails anzeichen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="164"/>
         <source>Order Ticket...</source>
-        <translation>Eindriddsgarde beschdellen...</translation>
+        <translation type="obsolete">Eindriddsgarde beschdellen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="178"/>
+        <location filename="mwin/overview.cpp" line="90"/>
         <source>Shopping Cart</source>
         <translation>Eingaufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="190"/>
         <source>Add Ticket</source>
-        <translation>Eindriddsgarde hinzufüchen</translation>
+        <translation type="obsolete">Eindriddsgarde hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="192"/>
         <source>Add Voucher</source>
-        <translation>Gudschein hinzufüchen</translation>
+        <translation type="obsolete">Gudschein hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="194"/>
         <source>Remove Item</source>
-        <translation>Doch ni&apos; nehm&apos;</translation>
+        <translation type="obsolete">Doch ni&apos; nehm&apos;</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="200"/>
         <source>Customer:</source>
-        <translation>Gunde:</translation>
+        <translation type="obsolete">Gunde:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="209"/>
         <source>Delivery Address:</source>
-        <translation>Adresse wo&apos;s Zeuch hin soll:</translation>
+        <translation type="obsolete">Adresse wo&apos;s Zeuch hin soll:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="212"/>
         <source>Comments:</source>
-        <translation>Wischdiches Gelaber und Gerede:</translation>
+        <translation type="obsolete">Wischdiches Gelaber und Gerede:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="222"/>
         <source>Clear</source>
-        <translation>Wechwerfen und von vorne!</translation>
+        <translation type="obsolete">Wechwerfen und von vorne!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="804"/>
         <source>Start Time</source>
-        <translation>Anfangszeit</translation>
+        <translation type="obsolete">Anfangszeit</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="804"/>
         <source>Title</source>
-        <translation>Diddel</translation>
+        <translation type="obsolete">Diddel</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="399"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
-        <translation>ddd, d.M.yyyy hh:mm</translation>
+        <translation type="obsolete">ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="97"/>
         <source>&amp;Update Event List</source>
-        <translation>&amp;Voranschdaldungsliste nochma holen</translation>
+        <translation type="obsolete">&amp;Voranschdaldungsliste nochma holen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="99"/>
         <source>&amp;Show/Edit details...</source>
-        <translation>&amp;Dedails anzeichen...</translation>
+        <translation type="obsolete">&amp;Dedails anzeichen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="284"/>
+        <location filename="mwin/overview.cpp" line="107"/>
         <source>Users</source>
         <translation>Nudsor</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="292"/>
         <source>New User...</source>
-        <translation>Neier Nudsor...</translation>
+        <translation type="obsolete">Neier Nudsor...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="295"/>
         <source>Delete User...</source>
-        <translation>Nudsor löschen...</translation>
+        <translation type="obsolete">Nudsor löschen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="299"/>
         <source>Description...</source>
-        <translation>Beschreibung...</translation>
+        <translation type="obsolete">Beschreibung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="302"/>
         <source>Hosts...</source>
-        <translation>Reschnor...</translation>
+        <translation type="obsolete">Reschnor...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="305"/>
         <source>Roles...</source>
-        <translation>Rollen...</translation>
+        <translation type="obsolete">Rollen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="314"/>
+        <location filename="mwin/overview.cpp" line="110"/>
         <source>Hosts</source>
         <translation>Reschnor</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="506"/>
         <source>Login Name</source>
-        <translation>Name zum Anmelden</translation>
+        <translation type="obsolete">Name zum Anmelden</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="506"/>
         <source>Description</source>
-        <translation>Beschreibung</translation>
+        <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="520"/>
         <source>New User</source>
-        <translation>Neier Nudsor</translation>
+        <translation type="obsolete">Neier Nudsor</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="520"/>
         <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>
+        <translation type="obsolete">Bidde gib ma nen neien Nudsornam&apos; ein (nur Buchschdaben, Ziffern und &quot;_&quot;):</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="971"/>
         <source>Error</source>
-        <translation>Gans doller falschor Fehler</translation>
+        <translation type="obsolete">Gans doller falschor Fehler</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="570"/>
         <source>Edit Description</source>
-        <translation>Beschreibung Ã¤ndorn</translation>
+        <translation type="obsolete">Beschreibung Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="570"/>
         <source>Descriptionof user %1:</source>
-        <translation>Beschreibung vom Nudsor %1:</translation>
+        <translation type="obsolete">Beschreibung vom Nudsor %1:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="88"/>
+        <location filename="mwin/overview.cpp" line="69"/>
         <source>Change my &amp;Password</source>
         <translation>Mei eechnes &amp;Bassword Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="308"/>
         <source>Set Password...</source>
-        <translation>Bassword sedsen...</translation>
+        <translation type="obsolete">Bassword sedsen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="322"/>
         <source>New Host...</source>
-        <translation>Neier Reschnor...</translation>
+        <translation type="obsolete">Neier Reschnor...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="325"/>
         <source>Add This Host...</source>
-        <translation>Die Gisde hier hinzufüchen...</translation>
+        <translation type="obsolete">Die Gisde hier hinzufüchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="328"/>
         <source>Delete Host...</source>
-        <translation>Reschnor löschen...</translation>
+        <translation type="obsolete">Reschnor löschen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="332"/>
         <source>Generate New Key...</source>
-        <translation>Neien Schlüssel erzeuchen...</translation>
+        <translation type="obsolete">Neien Schlüssel erzeuchen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="335"/>
         <source>Import...</source>
-        <translation>Imbordieren...</translation>
+        <translation type="obsolete">Imbordieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="338"/>
         <source>Export...</source>
-        <translation>Eggsbordieren...</translation>
+        <translation type="obsolete">Eggsbordieren...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="529"/>
         <source>Password</source>
-        <translation>Bassword</translation>
+        <translation type="obsolete">Bassword</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="529"/>
         <source>Please enter an initial password for the user:</source>
-        <translation>Bidde gib ma een Bassword für den Nudsor ein:</translation>
+        <translation type="obsolete">Bidde gib ma een Bassword für den Nudsor ein:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="544"/>
         <source>Delete User?</source>
-        <translation>Nudsor löschen?</translation>
+        <translation type="obsolete">Nudsor löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="544"/>
         <source>Really delete user &apos;%1&apos;?</source>
-        <translation>Nudsor &apos;%1&apos; wirklich löschen? Bissde Dir da och gans sischor?</translation>
+        <translation type="obsolete">Nudsor &apos;%1&apos; wirklich löschen? Bissde Dir da och gans sischor?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="613"/>
+        <location filename="mwin/overview.cpp" line="196"/>
         <source>Error setting password: %1</source>
         <translation>Gann Bassword ni sedsen: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="604"/>
         <source>The password must be non-empty and both lines must match</source>
         <translation type="obsolete">Das Bassword darf nisch leer sein und beide Basswordzeilen müssen gleisch sein.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="620"/>
         <source>Host Name</source>
         <translation type="obsolete">Reschnorname</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="620"/>
         <source>Host Key</source>
         <translation type="obsolete">Reschnorschlüssel</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="637"/>
         <source>Create New Host</source>
         <translation type="obsolete">Neien Reschnor anlechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="637"/>
         <source>Please enter a host name:</source>
         <translation type="obsolete">Gib ma nen Nam&apos; für de Gisde ein:</translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="645"/>
         <source>The key of this new host could only be generated with %n bits entropy. Store anyway?</source>
         <translation type="obsolete">
             <numerusform>Dor Schlüssel von der Gisde hat nur %n zufälliges Bid. Das is a bissl wenisch. Drodsdem schbeichorn?</numerusform>
@@ -2110,27 +2990,22 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="668"/>
         <source>Delete this Host?</source>
         <translation type="obsolete">De Gisdge löschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="668"/>
         <source>Really delete host &apos;%1&apos;?</source>
         <translation type="obsolete">De Gisde &apos;%1&apos; wirklisch löschen? Bissde da och sischor?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="682"/>
         <source>Change Host Key?</source>
         <translation type="obsolete">Den Schlüssel von dem Reschnor Ã¤ndorn?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="682"/>
         <source>Really change the key of host &apos;%1&apos;?</source>
         <translation type="obsolete">Wirglich den Schlüssel von dem Reschnor &apos;%1&apos; Ã¤ndorn? Gans sischor?</translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="687"/>
         <source>The new key of this host could only be generated with %n bits entropy. Store anyway?</source>
         <translation type="obsolete">
             <numerusform>Dor Schlüssel von der Gisde hat nur %n zufälliges Bid. Das is a bissl wenisch. Drodsdem schbeichorn?</numerusform>
@@ -2138,658 +3013,576 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="698"/>
         <source>Import Key from File</source>
         <translation type="obsolete">Schlüssel aus nor Dadai holen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="707"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation type="obsolete">Gann de Dadai %1 nisch lesen. Des iss jedsd geene Ordografieschwäche, sondern: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="719"/>
         <source>This is not a host key file.</source>
         <translation type="obsolete">Das is abor doch gar ge Schlüssel! Willsde misch verarschen?</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="724"/>
         <source>This host key file does not contain a valid host name.</source>
         <translation type="obsolete">De Schlüsseldadai had nen gans seldsamen Reschnornamen da drin. Desdorweschen gannsch die ni nehm.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="729"/>
         <source>This host key file does not contain a valid key.</source>
         <translation type="obsolete">De Dadai is a bissl gabudd. Die mussde nochmal holen, ich gann die so ned lesen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="734"/>
         <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
         <translation type="obsolete">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="752"/>
         <source>This host cannot be exported.</source>
         <translation type="obsolete">Den Reschnor gannsch ni schbeichorn.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="757"/>
         <source>Export Key to File</source>
         <translation type="obsolete">Schlüssel als Dadei ablechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="766"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation type="obsolete">Gann de Dadai %1 nicht zum Schreiben offmachen weil: %2</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="219"/>
         <source>Check Order</source>
-        <translation type="unfinished">Ne Beschdellung anlegn.</translation>
+        <translation type="obsolete">Ne Beschdellung anlegn.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="226"/>
+        <location filename="mwin/overview.cpp" line="100"/>
         <source>Order List</source>
         <translation>Beschdelllisde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="230"/>
         <source>-select mode-</source>
-        <translation>-wähl ma was aus-</translation>
+        <translation type="obsolete">-wähl ma was aus-</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="231"/>
         <source>All Orders</source>
-        <translation>Alle Beschdellungen</translation>
+        <translation type="obsolete">Alle Beschdellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="232"/>
         <source>Open Orders</source>
-        <translation>Offene Beschdellungen</translation>
+        <translation type="obsolete">Offene Beschdellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="234"/>
         <source>Outstanding Payments</source>
-        <translation>Wo noch ni bezahld is</translation>
+        <translation type="obsolete">Wo noch ni bezahld is</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="235"/>
         <source>Outstanding Refunds</source>
-        <translation>Wo was zurügerschdadded werden muss</translation>
+        <translation type="obsolete">Wo was zurügerschdadded werden muss</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="804"/>
         <source>Amount</source>
-        <translation>Anzahl</translation>
+        <translation type="obsolete">Anzahl</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="835"/>
         <source>Select Event to order Ticket</source>
-        <translation>Wähl ma ne Voranschdaldung aus um ne Garde zu beschdelln</translation>
+        <translation type="obsolete">Wähl ma ne Voranschdaldung aus um ne Garde zu beschdelln</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="848"/>
         <source>Select</source>
-        <translation>Auswähln</translation>
+        <translation type="obsolete">Auswähln</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="851"/>
         <source>Cancel</source>
-        <translation>Ni machen</translation>
+        <translation type="obsolete">Ni machen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="967"/>
         <source>There is nothing in the order. Ignoring it.</source>
-        <translation>Da is doch gar nischd drin. Isch mach das jedsd ni!</translation>
+        <translation type="obsolete">Da is doch gar nischd drin. Isch mach das jedsd ni!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="971"/>
         <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>
+        <translation type="obsolete">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="1004"/>
         <source>The request failed.</source>
         <translation type="obsolete">De Anfrache is schiefgegangen.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1008"/>
         <source>A problem occurred during the order: %1</source>
         <translation type="obsolete">Isch hadde nen Broblem mit dor Beschdellung: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="268"/>
+        <location filename="mwin/overview.cpp" line="104"/>
         <source>Entrance</source>
         <translation>Einlassgondrolle</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="168"/>
         <source>Event Summary...</source>
-        <translation>Veranschdaldungszusammenfassung...</translation>
+        <translation type="obsolete">Veranschdaldungszusammenfassung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="236"/>
         <source>Undelivered Orders</source>
-        <translation>Beschdellungen die noch ni ausgelieford sind</translation>
+        <translation type="obsolete">Beschdellungen die noch ni ausgelieford sind</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="246"/>
         <source>Update</source>
-        <translation>Auffrischn</translation>
+        <translation type="obsolete">Auffrischn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Status</source>
         <translation type="obsolete">Schdadus</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Total</source>
         <translation type="obsolete">Summe</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Paid</source>
         <translation type="obsolete">Bedsahld</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1275"/>
         <source>Customer</source>
         <translation type="obsolete">Gunde</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Upload Template...</source>
         <translation type="obsolete">Vorlache hochladn...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="119"/>
+        <location filename="mwin/overview.cpp" line="116"/>
         <source>&amp;Misc</source>
         <translation>Vorschiednes</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Return ticket...</source>
         <translation type="obsolete">Garde zurüggeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="172"/>
         <source>Cancel Event...</source>
-        <translation>Veranschdaldung absach&apos;n...</translation>
+        <translation type="obsolete">Veranschdaldung absach&apos;n...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="253"/>
         <source>Find by Ticket...</source>
-        <translation>Mit Garde finden...</translation>
+        <translation type="obsolete">Mit Garde finden...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="478"/>
         <source>Cancel Event</source>
-        <translation>Veranschdaldung absach&apos;n</translation>
+        <translation type="obsolete">Veranschdaldung absach&apos;n</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="478"/>
         <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
-        <translation>Nu&apos; gib mir ma&apos;n rischdsch guden Grund warum Du de Veranschdaldung &quot;%1&quot; absachn willsd oder lass&apos;es sein:</translation>
+        <translation type="obsolete">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="482"/>
         <source>Event Cancelled</source>
-        <translation>Veranschaldung abgesachd</translation>
+        <translation type="obsolete">Veranschaldung abgesachd</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="482"/>
         <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
-        <translation>De Veranschdaldung &quot;%1&quot; wurde abgesacht. Bidde sorsch ma dafür dass och jedor Bescheid wees.</translation>
+        <translation type="obsolete">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="463"/>
         <source>Unable to cancel event &quot;%1&quot;.</source>
         <translation type="obsolete">Gann de Veranschdaldung &quot;%1&quot; ni absachn.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1082"/>
         <source>Ticket &quot;%1&quot; Not Valid</source>
         <translation type="obsolete">De Garde &quot;%1&quot; is ni güldsch.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1090"/>
         <source>Ticket &quot;%1&quot; has already been used</source>
         <translation type="obsolete">De Garde &quot;%1&quot; wurde schonma benudsd.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1094"/>
         <source>Ticket &quot;%1&quot; has not been bought.</source>
         <translation type="obsolete">De Garde &quot;%1&quot; wurde ni gegauft.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1098"/>
         <source>Ticket &quot;%1&quot; Ok</source>
         <translation type="obsolete">De Garde &quot;%1&quot; is in Ordnung.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1103"/>
         <source>Ticket &quot;%1&quot; Ok; the Order has a refund</source>
         <translation type="obsolete">De Garde &quot;%1&quot; is in Ordnung. Dor Gunde griggd sogar noch Geld zurüg.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1108"/>
         <source>Ticket &quot;%1&quot; is not paid for!</source>
         <translation type="obsolete">De Garde &quot;%1&quot; is abor ni bedsahld!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1111"/>
         <source>Ticket &quot;%1&quot; cannot be accepted, please check the order!</source>
         <translation type="obsolete">De Garde &quot;%1&quot; gönnmor so abor ni agsebdiern. Schegg ma&apos; de Beschdellung!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1178"/>
         <source>Enter Ticket</source>
         <translation type="obsolete">Garde eingebn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1178"/>
         <source>Please enter the ID of one of the tickets of the order you seek:</source>
         <translation type="obsolete">Bidde gib de Gennung von nor Garde ein, die Du suchsd:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1182"/>
         <source>Unable to query server.</source>
         <translation type="obsolete">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="1191"/>
         <source>Server returned an invalid order ID.</source>
         <translation type="obsolete">Dor große Reschnor will misch verarschn: der gibd mir ne falsche Beschdellnummer.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Please select a template file.</source>
         <translation type="obsolete">Wähl ma nen Vorlachennam&apos;n.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Enter Template Name</source>
         <translation type="obsolete">Vorlachennam&apos;n eingeben</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Please enter a name for the template file, it should contain only letters, digits, underscores and dots:</source>
         <translation type="obsolete">Bidde gib ma nen neien Vorlachnnam&apos; ein (nur Buchschdaben, Ziffern, Bungde und &quot;_&quot;):</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The template name must only contain letters, digits, underscores and dots.</source>
         <translation type="obsolete">Nee. So ned. Du darfsd nur Buchschdaben, Zifforn, Bungde und &quot;_&quot; verwenden. Umlaude sind och nisch gud. Und es muss mid nem Buchschdaben anfangen. Is a bissl gomblizierd, aber Du schaffsd das schon!</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Success</source>
         <translation type="obsolete">Heuregah! Erfolsch!</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Successfully uploaded the template.</source>
         <translation type="obsolete">Isch graduliere! Dank unermüdlischer Arbeid im Gollegdief hammor de Vorlache erfolgreisch hochgeladn!</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Unable to upload the template.</source>
         <translation type="obsolete">Gann de Vorlache ni hochladn. S&apos; lieschd vielleischd am Weddor.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1317"/>
         <source>Return Ticket</source>
         <translation type="obsolete">Garde zurüggeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1317"/>
         <source>Please enter the ticket ID to return:</source>
         <translation type="obsolete">Bitte die Gennung von dor Garde eingeben die Se&apos; zurüggeben wolln:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1321"/>
         <source>This is not a valid ticket.</source>
         <translation type="obsolete">Das is abor gehne güldsche Garde!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1326"/>
         <source>This ticket cannot be returned, it has already been used or is in the wrong state.</source>
         <translation type="obsolete">De Garde gannsch ni zurügnehm. Die wurde schonma benudsd oder so.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="134"/>
+        <location filename="mwin/overview.cpp" line="132"/>
         <source>&amp;Admin</source>
         <translation>&amp;Adminischdradsion</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Schedule Backup...</source>
         <translation type="obsolete">&amp;Zeit für Sischerungsgobie fesdlechn...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="137"/>
+        <location filename="mwin/overview.cpp" line="135"/>
         <source>&amp;Backup now...</source>
         <translation>Jedsd &amp;Sischorungsgobie anleschn...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>&amp;Restore...</source>
         <translation type="obsolete">&amp;Wiedorherschdelln...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="238"/>
         <source>-search result-</source>
-        <translation>-Suchräsuldahd-</translation>
+        <translation type="obsolete">-Suchräsuldahd-</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="256"/>
         <source>Find by Event...</source>
-        <translation>Nach Veranschdaldung suchn...</translation>
+        <translation type="obsolete">Nach Veranschdaldung suchn...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="259"/>
         <source>Find by Customer...</source>
-        <translation>Nach Gunde suchn...</translation>
+        <translation type="obsolete">Nach Gunde suchn...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="525"/>
         <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
-        <translation>Nee. So ned. Du darfsd nur Buchschdaben, Zifforn, Bungde und &quot;_&quot; verwenden. Umlaude sind och nisch gud. Und es muss mid nem Buchschdaben anfangen. Is a bissl gomblizierd, aber Du schaffsd das schon!</translation>
+        <translation type="obsolete">Nee. So ned. Du darfsd nur Buchschdaben, Zifforn, Bungde und &quot;_&quot; verwenden. Umlaude sind och nisch gud. Und es muss mid nem Buchschdaben anfangen. Is a bissl gomblizierd, aber Du schaffsd das schon!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1204"/>
         <source>Select Event</source>
         <translation type="obsolete">Veranschdaldung auswähln</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1216"/>
         <source>Ok</source>
         <translation type="obsolete">Is gud so.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
         <source>Capacity</source>
-        <translation>Magsimale Gäsde</translation>
+        <translation type="obsolete">Magsimale Gäsde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
         <source>Sold</source>
-        <translation>Vergaufd</translation>
+        <translation type="obsolete">Vergaufd</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
         <source>Reserved</source>
-        <translation>Resorvierd</translation>
+        <translation type="obsolete">Resorvierd</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
         <source>Free</source>
-        <translation>Frei</translation>
+        <translation type="obsolete">Frei</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="548"/>
         <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>
+        <translation type="obsolete">(Gar Geener)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="551"/>
         <source>Delete User</source>
-        <translation>Nudsor Löschn</translation>
+        <translation type="obsolete">Nudsor Löschn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="551"/>
         <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>
+        <translation type="obsolete">Such ma raus wer de Beschdellung&apos;n und so von dem Nudsor erbd:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="556"/>
         <source>Cannot delete user: %1</source>
-        <translation>Gann den Nudsor ni löschn: %1</translation>
+        <translation type="obsolete">Gann den Nudsor ni löschn: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="103"/>
         <source>Show &amp;old Events</source>
-        <translation>Aldes Zeuch zeichen</translation>
+        <translation type="obsolete">Aldes Zeuch zeichen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="130"/>
+        <location filename="mwin/overview.cpp" line="127"/>
         <source>C&amp;onfigure</source>
         <translation>Gonfiguriern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="131"/>
+        <location filename="mwin/overview.cpp" line="128"/>
         <source>&amp;Auto-Refresh settings...</source>
         <translation>Schdändisch-Nachgugg-Einschdellungen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1448"/>
+        <location filename="mwin/overview.cpp" line="130"/>
+        <source>&amp;Display settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="343"/>
         <source>Refresh Settings</source>
         <translation>Schdändisch-Nachgugg-Einschdellungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1453"/>
+        <location filename="mwin/overview.cpp" line="348"/>
         <source>Refresh Rate (minutes):</source>
         <translation>Nachguggfregwens (Minuden)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1459"/>
+        <location filename="mwin/overview.cpp" line="354"/>
         <source>refresh &amp;event list</source>
         <translation>Veranschdaldungslisde nachguggn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1461"/>
+        <location filename="mwin/overview.cpp" line="356"/>
         <source>refresh &amp;user list</source>
         <translation>Nudsorlisde nachguggn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1463"/>
+        <location filename="mwin/overview.cpp" line="358"/>
         <source>refresh &amp;host list</source>
         <translation>Reschnorlisde nachguggn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1523"/>
+        <location filename="mwin/overview.cpp" line="367"/>
+        <location filename="mwin/overview.cpp" line="418"/>
+        <location filename="mwin/overview.cpp" line="462"/>
         <source>&amp;OK</source>
         <translation>Nu &amp;glar! Nehm&apos;sch.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1525"/>
+        <location filename="mwin/overview.cpp" line="369"/>
+        <location filename="mwin/overview.cpp" line="420"/>
+        <location filename="mwin/overview.cpp" line="464"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Nee lass mal.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="91"/>
+        <location filename="mwin/overview.cpp" line="72"/>
         <source>&amp;Edit Templates...</source>
         <translation>Vorlachen bearbeeden...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="92"/>
+        <location filename="mwin/overview.cpp" line="73"/>
         <source>&amp;Update Templates Now</source>
         <translation>Jedsd soford nochmal nachguggen was es neues gibd</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="117"/>
         <source>&amp;Update Shipping Options</source>
-        <translation>Jedsd soford Versandmedoden nachguggn</translation>
+        <translation type="obsolete">Jedsd soford Versandmedoden nachguggn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="120"/>
+        <location filename="mwin/overview.cpp" line="117"/>
         <source>Return &amp;ticket...</source>
         <translation>Eindriddsgarde zurüggeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="121"/>
+        <location filename="mwin/overview.cpp" line="118"/>
         <source>Return &amp;voucher...</source>
         <translation>Gudschein zurüggeben...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="123"/>
+        <location filename="mwin/overview.cpp" line="120"/>
         <source>Edit &amp;Shipping Options...</source>
         <translation>Versandmedoden bearbeeden...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="206"/>
         <source>Shipping Method:</source>
-        <translation>Versandmedode:</translation>
+        <translation type="obsolete">Versandmedode:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="233"/>
         <source>Open Reservations</source>
-        <translation>Offene Resorvierungen</translation>
+        <translation type="obsolete">Offene Resorvierungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="491"/>
         <source>(No Shipping)</source>
-        <translation>(gar gee Vorsand)</translation>
+        <translation type="obsolete">(gar gee Vorsand)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="874"/>
         <source>Select Voucher</source>
         <translation type="obsolete">Gudschein auswähln</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="885"/>
         <source>Select voucher price and value:</source>
         <translation type="obsolete">Beschdimm mal &apos;n Gudscheinpreis und -werd:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="886"/>
         <source>Price:</source>
         <translation type="obsolete">Breis:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="892"/>
         <source>Value:</source>
         <translation type="obsolete">Werd:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="924"/>
         <source>Voucher (price: %1, value %2)</source>
         <translation type="obsolete">Gudschein (gosded %1 und iss noch %2 werd)</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1338"/>
         <source>Return Voucher</source>
         <translation type="obsolete">Gudschein zurüggeben</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1338"/>
         <source>Please enter the voucher ID to return:</source>
         <translation type="obsolete">Bidde gib ma de Nummor von dem Gudschein ein, den De zurüggeben willsd:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1342"/>
         <source>This is not a valid voucher.</source>
         <translation type="obsolete">Das is abor gee güldschor Gudschein. So ni!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1347"/>
         <source>This voucher cannot be returned, it has already been used.</source>
         <translation type="obsolete">Den Gudschein gannsch ni zurügnehm. Der wurde schonma benudsd, der iss ja schon angebissn.</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1465"/>
+        <location filename="mwin/overview.cpp" line="360"/>
         <source>refresh &amp;shipping list</source>
         <translation>Versandmedoden offfrischen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="262"/>
-        <source>Find by Order ID...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="125"/>
+        <location filename="mwin/overview.cpp" line="122"/>
         <source>&amp;Deduct from voucher...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="127"/>
+        <location filename="mwin/overview.cpp" line="124"/>
         <source>&amp;Money Log for voucher...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="128"/>
+        <location filename="mwin/overview.cpp" line="125"/>
         <source>Money Log for &amp;user...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="132"/>
+        <location filename="mwin/overview.cpp" line="129"/>
         <source>&amp;Server Access settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="135"/>
+        <location filename="mwin/overview.cpp" line="133"/>
         <source>Backup &amp;Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="273"/>
-        <source>Enter or scan Ticket-ID:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="1499"/>
+        <location filename="mwin/overview.cpp" line="394"/>
         <source>Server Access Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1503"/>
+        <location filename="mwin/overview.cpp" line="398"/>
         <source>Request Timeout (seconds):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1509"/>
+        <location filename="mwin/overview.cpp" line="404"/>
         <source>Log Level:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1511"/>
+        <location filename="mwin/overview.cpp" line="406"/>
         <source>Minimal Logging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1512"/>
+        <location filename="mwin/overview.cpp" line="407"/>
         <source>Log Details on Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1513"/>
+        <location filename="mwin/overview.cpp" line="408"/>
         <source>Always Log Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1574"/>
+        <location filename="mwin/overview.cpp" line="443"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="448"/>
+        <source>Maximum event age (days, 0=show all):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="453"/>
+        <source>Maximum order list age (days, 0=show all):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="510"/>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1574"/>
+        <location filename="mwin/overview.cpp" line="510"/>
         <source>The backup was successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1578"/>
+        <location filename="mwin/overview.cpp" line="514"/>
         <source>Cannot create backup file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="430"/>
+        <location filename="mwin/overview.cpp" line="186"/>
         <source>I was unable to renew the login at the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="484"/>
-        <source>Unable to cancel event &quot;%1&quot;: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="1553"/>
+        <location filename="mwin/overview.cpp" line="489"/>
         <source>Backup failed with error (%2): %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1557"/>
+        <location filename="mwin/overview.cpp" line="493"/>
         <source>Backup returned empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2797,37 +3590,37 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MPasswordChange</name>
     <message>
-        <location filename="overview.cpp" line="1679"/>
+        <location filename="dialogs/passwdchg.cpp" line="26"/>
         <source>Change my password</source>
         <translation>Mei eechnes Bassword Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1685"/>
+        <location filename="dialogs/passwdchg.cpp" line="32"/>
         <source>Old Password:</source>
         <translation>Aldes Bassword:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1689"/>
+        <location filename="dialogs/passwdchg.cpp" line="36"/>
         <source>New Password:</source>
         <translation>Neies Bassword:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1692"/>
+        <location filename="dialogs/passwdchg.cpp" line="39"/>
         <source>Repeat Password:</source>
         <translation>Nochma neies Bassword:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1700"/>
+        <location filename="dialogs/passwdchg.cpp" line="47"/>
         <source>Set Password</source>
         <translation>Bassword sedsen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1702"/>
+        <location filename="dialogs/passwdchg.cpp" line="49"/>
         <source>Cancel</source>
         <translation>Vorgisses, ni sedsen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1681"/>
+        <location filename="dialogs/passwdchg.cpp" line="28"/>
         <source>Reset password of user &quot;%1&quot;</source>
         <translation>Bassword von Nudsor &quot;%1&quot; zurügsedsen</translation>
     </message>
@@ -2835,45 +3628,57 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MSInterface</name>
     <message>
-        <location filename="msinterface.cpp" line="35"/>
+        <location filename="iface/msinterface.cpp" line="58"/>
         <source>Warning</source>
         <translation type="unfinished">Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="35"/>
+        <location filename="iface/msinterface.cpp" line="58"/>
         <source>Login failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="76"/>
+        <location filename="iface/msinterface.cpp" line="85"/>
+        <location filename="iface/msinterface.cpp" line="89"/>
+        <location filename="iface/msinterface.cpp" line="94"/>
+        <location filename="iface/msinterface.cpp" line="99"/>
         <source>Error</source>
         <translation type="unfinished">Gans doller falschor Fehler</translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="62"/>
+        <location filename="iface/msinterface.cpp" line="85"/>
         <source>Communication problem while talking to the server, see log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="66"/>
+        <location filename="iface/msinterface.cpp" line="89"/>
         <source>Communication with server was not successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="71"/>
+        <location filename="iface/msinterface.cpp" line="94"/>
         <source>The server implementation is too old for this client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="76"/>
+        <location filename="iface/msinterface.cpp" line="99"/>
         <source>This client is too old for the server, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="iface/msinterface.cpp" line="191"/>
+        <source>Connection Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="iface/msinterface.cpp" line="191"/>
+        <source>There were problems while authenticating the server. Aborting. Check your configuration.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MShipping</name>
     <message>
-        <location filename="" line="0"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="obsolete">,</translation>
@@ -2882,32 +3687,32 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MShippingChange</name>
     <message>
-        <location filename="orderwin.cpp" line="1043"/>
+        <location filename="dialogs/orderwin.cpp" line="1033"/>
         <source>Change Shipping Method</source>
         <translation>Versandmedode Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1051"/>
+        <location filename="dialogs/orderwin.cpp" line="1041"/>
         <source>Method:</source>
         <translation>Medode:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1053"/>
+        <location filename="dialogs/orderwin.cpp" line="1043"/>
         <source>Price:</source>
         <translation>Breis:</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1061"/>
+        <location filename="dialogs/orderwin.cpp" line="1051"/>
         <source>Ok</source>
         <translation>Is gud so.</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1063"/>
+        <location filename="dialogs/orderwin.cpp" line="1053"/>
         <source>Cancel</source>
         <translation>Abbreschen</translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1070"/>
+        <location filename="dialogs/orderwin.cpp" line="1060"/>
         <source>(None)</source>
         <comment>shipping method</comment>
         <translation>(Gar Geene)</translation>
@@ -2916,157 +3721,139 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MShippingEditor</name>
     <message>
-        <location filename="shipping.cpp" line="37"/>
+        <location filename="dialogs/shipping.cpp" line="37"/>
         <source>Edit Shipping Options</source>
         <translation>Versandmedoden bearbeeden</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="49"/>
+        <location filename="dialogs/shipping.cpp" line="49"/>
         <source>Change Description</source>
         <translation>Beschreibung Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="51"/>
+        <location filename="dialogs/shipping.cpp" line="51"/>
         <source>Change Price</source>
         <translation>Breis Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="53"/>
+        <location filename="dialogs/shipping.cpp" line="53"/>
         <source>Change Availability</source>
         <translation>Vorfügborgeed Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="56"/>
+        <location filename="dialogs/shipping.cpp" line="56"/>
         <source>Add Option</source>
         <translation>Medode hinzufüschn</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="58"/>
+        <location filename="dialogs/shipping.cpp" line="58"/>
         <source>Delete Option</source>
         <translation>Medode löschn</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="65"/>
+        <location filename="dialogs/shipping.cpp" line="65"/>
         <source>Ok</source>
         <translation>Is gud so.</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="67"/>
+        <location filename="dialogs/shipping.cpp" line="67"/>
         <source>Cancel</source>
         <translation>Doch ni&apos; machen</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>ID</source>
         <translation>Nummor</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Price</source>
         <translation>Breis</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Web</source>
         <translation>Web</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Any User</source>
         <translation>Jedor</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="81"/>
         <source>Yes</source>
-        <translation>Nu!</translation>
+        <translation type="obsolete">Nu!</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="81"/>
         <source>No</source>
-        <translation>Nee!</translation>
+        <translation type="obsolete">Nee!</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="250"/>
         <source>Shipping Option Description</source>
         <translation type="obsolete">Versandmedodenbeschreibung</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="190"/>
         <source>Please select a new description for this shipping option:</source>
         <translation type="obsolete">Und nu&apos; gib ma ne neue Beschreibung für de Versandmedode ein und wenn&apos;de ferdsch bist drüggsde de &quot;Endor&quot;-Dasde:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="288"/>
         <source>Warning</source>
         <translation type="obsolete">Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="240"/>
         <source>Could not store the changes.</source>
         <translation type="obsolete">Gann de Ã„ndorung ni schbeichorn. S&apos; muss was schiefgelofen sein.</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="253"/>
         <source>Shipping Option Price</source>
         <translation type="obsolete">Versandmedodenbreis</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="211"/>
         <source>Please select a new price for this shipping option:</source>
         <translation type="obsolete">Gib&apos; doch och ma ein was&apos;de Dir vorschdellsd dass de Versandmedode gosden soll:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="256"/>
         <source>None</source>
         <translation type="obsolete">Nur de ganz brivilischierden</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="256"/>
         <source>Web Interface</source>
         <translation type="obsolete">och de Nudsor vom Web-Indorfähs</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="256"/>
         <source>Any User + Web Interface</source>
         <translation type="obsolete">Wirschlich jedor.</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="257"/>
         <source>Shipping Option Availability</source>
         <translation type="obsolete">Versandmedodenverfüschbargeed</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="234"/>
         <source>Please select a new availability for this shipping option:</source>
         <translation type="obsolete">Sach&apos; mir ma gans genau wer alles die Medode verwenden darf:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="250"/>
         <source>Please select a new description for this new shipping option:</source>
         <translation type="obsolete">Und nu&apos; gib ma ne neue Beschreibung für de Versandmedode ein und wenn&apos;de ferdsch bist drüggsde de &quot;Endor&quot;-Dasde:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="253"/>
         <source>Please select a new price for this new shipping option:</source>
         <translation type="obsolete">Gib&apos; doch och ma ein was&apos;de Dir vorschdellsd dass de Versandmedode gosden soll:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="257"/>
         <source>Please select a new availability for this new shipping option:</source>
         <translation type="obsolete">Sach&apos; mir ma gans genau wer alles die Medode verwenden darf:</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="268"/>
         <source>Could not create the new option.</source>
         <translation type="obsolete">Gonnde de neue Versandmedode ni anleschn. S&apos; iss schade abor wahr.</translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="288"/>
         <source>Unable to delete this option.</source>
         <translation type="obsolete">Gann de Medode ni löschen.</translation>
     </message>
@@ -3074,23 +3861,23 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MTemplateChoice</name>
     <message>
-        <location filename="templatedlg.cpp" line="29"/>
+        <location filename="templates/templatedlg.cpp" line="29"/>
         <source>Chose Template</source>
         <translation>Vorlache auswähln</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="32"/>
+        <location filename="templates/templatedlg.cpp" line="32"/>
         <source>Please chose a variant of template %1:</source>
         <translation>Such Dir ma&apos; ne Variande von dor Vorlache %1 raus:</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="41"/>
+        <location filename="templates/templatedlg.cpp" line="41"/>
         <source>(default)</source>
         <comment>default template pseudo-variant</comment>
         <translation>(Schdandard)</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="50"/>
+        <location filename="templates/templatedlg.cpp" line="50"/>
         <source>Ok</source>
         <translation>Is gud so.</translation>
     </message>
@@ -3098,72 +3885,75 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MTemplateEditor</name>
     <message>
-        <location filename="templatedlg.cpp" line="72"/>
+        <location filename="templates/templatedlg.cpp" line="72"/>
         <source>Edit Template Directory</source>
         <translation>Vorlachenverzeischnis bearbeeden</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="84"/>
+        <location filename="templates/templatedlg.cpp" line="84"/>
         <source>Update Now</source>
         <translation>Jedsd neu holn</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="86"/>
+        <location filename="templates/templatedlg.cpp" line="86"/>
         <source>Add Variant</source>
         <translation>Variande hinzufüschn</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="88"/>
+        <location filename="templates/templatedlg.cpp" line="88"/>
         <source>Delete Variant</source>
         <translation>Variante löschn</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="95"/>
+        <location filename="templates/templatedlg.cpp" line="95"/>
         <source>Close</source>
         <translation>Zumachn</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
+        <location filename="templates/templatedlg.cpp" line="110"/>
         <source>Template/Variant</source>
         <translation>Vorlache/Variande</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
+        <location filename="templates/templatedlg.cpp" line="110"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
+        <location filename="templates/templatedlg.cpp" line="110"/>
         <source>Checksum</source>
         <translation>Scheggsumme</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="221"/>
+        <location filename="templates/templatedlg.cpp" line="167"/>
+        <location filename="templates/templatedlg.cpp" line="185"/>
+        <location filename="templates/templatedlg.cpp" line="204"/>
+        <location filename="templates/templatedlg.cpp" line="221"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="167"/>
+        <location filename="templates/templatedlg.cpp" line="167"/>
         <source>Unable to delete this template.</source>
         <translation>Gann de Vorlache ni löschn. Da gann mor nüschd machn.</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="180"/>
+        <location filename="templates/templatedlg.cpp" line="180"/>
         <source>Select Template File</source>
         <translation>Vorlachendadei auswähln</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="185"/>
+        <location filename="templates/templatedlg.cpp" line="185"/>
         <source>Files with this extension (%1) are not legal for this template.</source>
         <translation>Gugge ma: Dadein mir dor Erweederung %1 sind hier nisch erloobd. Und Du Droddel mussd genau so eene nehm!</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="204"/>
+        <location filename="templates/templatedlg.cpp" line="204"/>
         <source>Unable to upload file.</source>
         <translation>Gann de Dadei nisch hochladn.</translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="221"/>
+        <location filename="templates/templatedlg.cpp" line="221"/>
         <source>Unable to send new description to server.</source>
         <translation>Isch gann und gann den Sörvor nisch Ã¼berzeuschn dass Deine Beschreibung besser iss. S&apos; iss hald n&apos; aldor Esel!</translation>
     </message>
@@ -3171,7 +3961,6 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MTemplateStore</name>
     <message>
-        <location filename="templates.cpp" line="107"/>
         <source>Retrieving templates from server.</source>
         <translation type="obsolete">Hole Vorlachn vom Sörvor. S&apos; gann Ã¤ bissl dauern.</translation>
     </message>
@@ -3179,95 +3968,80 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MTicket</name>
     <message>
-        <location filename="order.cpp" line="330"/>
+        <location filename="iface/order.cpp" line="330"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="762"/>
         <source>bought</source>
         <comment>ticket state</comment>
         <translation type="obsolete">gegaufd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="763"/>
         <source>to refund</source>
         <comment>ticket state</comment>
         <translation type="obsolete">zurügzugebn</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="764"/>
         <source>used</source>
         <comment>ticket state</comment>
         <translation type="obsolete">benudsd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="765"/>
         <source>reserved</source>
         <comment>ticket state</comment>
         <translation type="obsolete">resorvierd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="766"/>
         <source>ok</source>
         <comment>ticket state</comment>
         <translation type="obsolete">nudsbar</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="767"/>
         <source>sale only</source>
         <comment>ticket state</comment>
         <translation type="obsolete">nur vergaufen</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="768"/>
         <source>order only</source>
         <comment>ticket state</comment>
         <translation type="obsolete">nur beschdelln</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="769"/>
         <source>too late: event over</source>
         <comment>ticket state</comment>
         <translation type="obsolete">zu schbäd: de Veranschdaldung is schon vorbei</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="770"/>
         <source>no more tickets</source>
         <comment>ticket state</comment>
         <translation type="obsolete">geene Garden mehr Ã¼brisch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="771"/>
         <source>event cancelled</source>
         <comment>ticket state</comment>
         <translation type="obsolete">Veranschdaldung abgesachd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="772"/>
         <source>no such event</source>
         <comment>ticket state</comment>
         <translation type="obsolete">de Veranschdaldung egsisdierd nisch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="773"/>
         <source>invalid</source>
         <comment>ticket state</comment>
         <translation type="obsolete">ungüldsch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="792"/>
         <source>Cannot execute request.</source>
         <translation type="obsolete">Gann de Anfrache nisch ausführn. S&apos; is manschma gomisch.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="819"/>
         <source>Ticket is not stored, can&apos;t return it.</source>
         <translation type="obsolete">De Garde is ni geschbeichord, also gannsch se och ni zurüggeben.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="821"/>
         <source>Failed to execute request</source>
         <translation type="obsolete">Gann de Anfrache nisch ausführn. S&apos; is manschma gomisch.</translation>
     </message>
@@ -3275,7 +4049,6 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MTicketView</name>
     <message>
-        <location filename="" line="0"/>
         <source>Preview Tickets</source>
         <translation type="obsolete">Garden anguggn.</translation>
     </message>
@@ -3283,45 +4056,180 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MUser</name>
     <message>
-        <location filename="user.cpp" line="58"/>
         <source>User not valid: cannot delete.</source>
-        <translation>Nudsor is ni güldsch: gann&apos; ni löschn.</translation>
+        <translation type="obsolete">Nudsor is ni güldsch: gann&apos; ni löschn.</translation>
+    </message>
+</context>
+<context>
+    <name>MUserTab</name>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="43"/>
+        <source>New User...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="46"/>
+        <source>Delete User...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="50"/>
+        <source>Description...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="53"/>
+        <source>Hosts...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="56"/>
+        <source>Roles...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="59"/>
+        <source>Set Password...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="80"/>
+        <source>Login Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="80"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="94"/>
+        <source>New User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="94"/>
+        <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="99"/>
+        <location filename="mwin/acltabs.cpp" line="130"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="99"/>
+        <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="103"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="103"/>
+        <source>Please enter an initial password for the user:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="118"/>
+        <source>Delete User?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="118"/>
+        <source>Really delete user &apos;%1&apos;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="122"/>
+        <source>(Nobody)</source>
+        <comment>this is a username for no user, the string must contain &apos;(&apos; to distinguish it from the others</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="125"/>
+        <source>Delete User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="125"/>
+        <source>Select which user will inherit this users database objects:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="130"/>
+        <source>Cannot delete user: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="144"/>
+        <source>Edit Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="144"/>
+        <source>Description of user %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="161"/>
+        <location filename="mwin/acltabs.cpp" line="166"/>
+        <location filename="mwin/acltabs.cpp" line="209"/>
+        <location filename="mwin/acltabs.cpp" line="215"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="161"/>
+        <source>Cannot retrieve user roles: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="166"/>
+        <source>Cannot retrieve role descriptions: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="209"/>
+        <source>The password must be non-empty and both lines must match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="215"/>
+        <source>Error while setting password: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MVoucher</name>
     <message>
-        <location filename="order.cpp" line="919"/>
         <source>invalid</source>
         <translation type="obsolete">ungüldsch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="921"/>
         <source>cancelled</source>
         <translation type="obsolete">abgebroch&apos;n</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="922"/>
         <source>empty</source>
         <translation type="obsolete">leer, dodal leer</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="923"/>
         <source>used</source>
         <translation type="obsolete">benudsd</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="924"/>
         <source>unused</source>
         <translation type="obsolete">gans frisch</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="941"/>
         <source>Voucher is not stored, can&apos;t return it.</source>
         <translation type="obsolete">Dor Gudschein is doch gar ni geschbeichord, da gannsch&apos; den ooch ni löschn.</translation>
     </message>
     <message>
-        <location filename="order.cpp" line="943"/>
         <source>Failed to execute request</source>
         <translation type="obsolete">Gann de Anfrache nisch ausführn. S&apos; is manschma gomisch.</translation>
     </message>
@@ -3329,97 +4237,78 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MWebRequest</name>
     <message>
-        <location filename="webrequest.cpp" line="223"/>
         <source>Unable to get server info.</source>
         <translation type="obsolete">Dor grosse Reschner will mir nischd Ã¼ber sisch sach&apos;n. Dummer Hund der.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="230"/>
         <source>Error while parsing server info (line %1 col %2): %3</source>
         <translation type="obsolete">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="235"/>
         <source>Error in server info: missing authentication algorithm info.</source>
         <translation type="obsolete">Dor grosse Reschnor will mir nedd sach&apos;n wie mor offn&apos; droff gommd. Missd.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="240"/>
         <source>The server requested an unsupported hash algorithm: %1.</source>
         <translation type="obsolete">Dor grosse Reschnor will &apos;ne Bereschnung von mir, die isch nedd gann: %1.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="246"/>
         <source>Unable to get authentication challenge.</source>
         <translation type="obsolete">Dor grosse Reschnor reded nedd mit mir. Isch grich gehn &quot;Schällänsch&quot;.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="250"/>
         <source>Error while parsing session challenge (line %1 col %2): %3</source>
         <translation type="obsolete">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="256"/>
         <source>Error in session challenge: missing session ID.</source>
         <translation type="obsolete">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="262"/>
         <source>Error in session challenge: missing host challenge.</source>
         <translation type="obsolete">Fählor im &quot;Schällänsch&quot;: der had nischd fürn Gombjuder.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="268"/>
         <source>Error in session challenge: missing user challenge.</source>
         <translation type="obsolete">Fählor im &quot;Schällänsch&quot;: der had nischd fürn Nudsor.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="294"/>
         <source>Failed to log in: user/password mismatch, non-allowed host key, or challenge timed out.</source>
         <translation type="obsolete">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="298"/>
         <source>Unable to authenticate.</source>
         <translation type="obsolete">Isch gann misch ned anmälden.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="390"/>
         <source>Error parsing EventList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Isch gann des XML von dor EventList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="341"/>
         <source>Cannot change password, old password does not match!</source>
         <translation type="obsolete">Gann Bassword ni&apos; Ã¤ndorn, das alde war falsch!</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="414"/>
         <source>Error parsing RoomList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Isch gann des XML von dor RoomList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="438"/>
         <source>Error parsing UserList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Isch gann des XML von dor UserList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="462"/>
         <source>Error parsing HostList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Isch gann des XML von dor HostList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="486"/>
         <source>Error parsing CustomerList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Isch gann des XML von dor CustomerList no vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="579"/>
         <source>Error parsing OrderList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Isch gann des XML von dor OrderList ni verschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="535"/>
         <source>Error parsing ShippingList XML data (line %1 column %2): %3</source>
         <translation type="obsolete">Isch gann des XML von dor ShippingList ni vorschdehn (Zeile %1, Schbalde %2) weil: %3</translation>
     </message>
@@ -3427,24 +4316,20 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>Order</name>
     <message>
-        <location filename="../www/inc/classes/order.php" line="407"/>
         <source>invalidvalue</source>
         <comment>voucher state</comment>
         <translation type="obsolete">ungüldschor Werd</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="413"/>
         <source>invalidprice</source>
         <comment>voucher state</comment>
         <translation type="obsolete">ungüldschor Breis</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="434"/>
         <source>Shipping type not available to user.</source>
         <translation type="obsolete">De Versandmedode gannsde nisch benudsen. S&apos; had dor Scheff verboden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="451"/>
         <source>Illegal shipping type.</source>
         <translation type="obsolete">De Versandmedode gibs doch gar nisch!</translation>
     </message>
@@ -3452,37 +4337,30 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>Session</name>
     <message>
-        <location filename="../www/inc/machine/session.php" line="217"/>
         <source>unable to parse XML data</source>
         <translation type="obsolete">Gann de XML Daden nisch verstehn</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="139"/>
         <source>missing some authentication data</source>
         <translation type="obsolete">Isch vormisse a bissl was von dor Audendigadsion.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="211"/>
         <source>Not authenticated. Can&apos;t change password.</source>
         <translation type="obsolete">De bissd nisch angemeldet, also gannsde och gee Bassword Ã¤ndorn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="222"/>
         <source>expected exactly one passwd element</source>
         <translation type="obsolete">Isch hadde eschendlich nur een Bassword erwarded.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="230"/>
         <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>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="237"/>
         <source>Ooops. Unable to find user. You have been deleted.</source>
         <translation type="obsolete">Nanu. Dei Nudsoreindrach is fudsch. Jemand had&apos;sch gelöschd.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="242"/>
         <source>Wrong password. Session hijacked, terminating it.</source>
         <translation type="obsolete">Falsches Bassword. Du bissd wahrscheinlich a böser Birad. Geh wech!</translation>
     </message>
@@ -3490,17 +4368,14 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>SpecialHost</name>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="41"/>
         <source>_any</source>
         <translation type="obsolete">Irschendeen Gombjudor</translation>
     </message>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="42"/>
         <source>_anon</source>
         <translation type="obsolete">Annonühm</translation>
     </message>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="43"/>
         <source>_online</source>
         <translation type="obsolete">De Webseidn</translation>
     </message>
@@ -3508,27 +4383,22 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>Ticket</name>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="203"/>
         <source>The ticket is not valid.</source>
         <translation type="obsolete">De Garde is nisch güldsch. Wollmor uns widder einschmuggeln - hä?</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="207"/>
         <source>The ticket has already been used.</source>
         <translation type="obsolete">De Garde wurde schonma benudsd. Mir sin&apos; hier nisch bei &quot;Nimm Zwei&quot;!</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="211"/>
         <source>The ticket has not been bought or is cancelled.</source>
         <translation type="obsolete">De Garde wurde nisch gegaufd oder wurde schon zurüggegeben. So ni!</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="216"/>
         <source>The ticket has not been paid.</source>
         <translation type="obsolete">De Garde is nisch bezahlt! Kohle her oder zu Hause blei&apos;m!</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="220"/>
         <source>The tickets order is in an invalid state or does not exist.</source>
         <translation type="obsolete">De Beschdellung von dor Garde is ungüldsch! Das müssmer ersdma scheggn eh der rein darf!</translation>
     </message>
@@ -3536,402 +4406,472 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>TransactionNames::</name>
     <message>
-        <location filename="../www/machine.php" line="19"/>
         <source>serverinfo</source>
         <translation type="obsolete">Informadschjon&apos; Ã¼bern Sörvor.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>startsession</source>
         <translation type="obsolete">&apos;Ne Seschon anfang&apos;</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>sessionauth</source>
         <translation type="obsolete">Am Sörvor anmeld&apos;n</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>closesession</source>
         <translation type="obsolete">Dsum Sörvor gude Nachd sachn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
         <source>getmyroles</source>
         <translation type="obsolete">Rausfinden was isch machn darf</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getusers</source>
         <translation type="obsolete">Guggn welche Nudsor es gibd</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>setuserdescription</source>
         <translation type="obsolete">Nen bleeden Gommendar Ã¼ber jemand andres machn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getuseracl</source>
         <translation type="obsolete">Rausfinden was een andror darf</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>setuseracl</source>
         <translation type="obsolete">Dem Andorn was vorbiedn dürfen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getuserhosts</source>
         <translation type="obsolete">Rausfinden von wo Ã¤ Nudsor arbäden darf</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setuserhosts</source>
         <translation type="obsolete">Fesdleechn von wo Ã¤ Nudsor arbäden darf</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>adduser</source>
         <translation type="obsolete">&apos;Nen neuen Nudsor anlechen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>deleteuser</source>
         <translation type="obsolete">&apos;Nen Nudsor löschen. Eefach so.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setmypasswd</source>
         <translation type="obsolete">Des eechne Bassword Ã¤ndorn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setpasswd</source>
         <translation type="obsolete">Des Bassword von jemand gans andors Ã¤ndorn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>gethosts</source>
         <translation type="obsolete">Rausfinden von wo mor alles arbäden gönnde.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>sethost</source>
         <translation type="obsolete">&apos;Ne Arbedsschdelle Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>addhost</source>
         <translation type="obsolete">&apos;Ne neue Arbedsschdelle einrischdn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>deletehost</source>
         <translation type="obsolete">&apos;Ne Arbedsschdelle dichd machn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>geteventlist</source>
         <translation type="obsolete">Lisde dor Veranschdaldungen holen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>geteventdata</source>
         <translation type="obsolete">Dedails zu eener Veranschdaldung holen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>seteventdata</source>
         <translation type="obsolete">Dedails zu eener Veranschdaldung Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>eventsummary</source>
         <translation type="obsolete">Veranschdaltungsdsusamm&apos;nfassung holen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>cancelevent</source>
         <translation type="obsolete">Veranschdaldung absach&apos;n</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
         <source>getroomdata</source>
         <translation type="obsolete">Räumlischgeden anzeichen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
         <source>setroomdata</source>
         <translation type="obsolete">Räumlischgeden Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>getcustomerlist</source>
         <translation type="obsolete">Lisde dor Gunden anguggn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>getcustomer</source>
         <translation type="obsolete">Gunde abfrachen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>setcustomer</source>
         <translation type="obsolete">Gunde anlechen oder Ã¤ndorn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>deletecustomer</source>
         <translation type="obsolete">Gunde löschen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>checkorder</source>
         <translation type="obsolete">Ma guggn ob ne Beschdellung gehen würde.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createorder</source>
         <translation type="obsolete">Ne Beschdellung anlegn.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createsale</source>
         <translation type="obsolete">Was vorkofen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>getorderlist</source>
         <translation type="obsolete">Beschdellungslisde holen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>getorder</source>
         <translation type="obsolete">Beschdellung anguggn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>orderpay</source>
         <translation type="obsolete">Beschdellung bezahl&apos;n</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>orderrefund</source>
         <translation type="obsolete">Geld zurüggeben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>ordershipped</source>
         <translation type="obsolete">Beschdellung wegschiggn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>cancelorder</source>
         <translation type="obsolete">Beschdellung abbrech&apos;n</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>orderbyticket</source>
         <translation type="obsolete">gans dief ins Arschief guggn und &apos;ne Beschdellung nur mit nor Garte finden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>getordersbyevents</source>
         <translation type="obsolete">de Beschdellungen zu nor Veranschdaldung finden</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>setordercomment</source>
         <translation type="obsolete">Dummen Schbruch in dor Beschdellung Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>getticket</source>
         <translation type="obsolete">Garde anguggn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>useticket</source>
         <translation type="obsolete">Garde benudsen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>changeticketprice</source>
         <translation type="obsolete">Gardenbreis Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>ticketreturn</source>
         <translation type="obsolete">Garde zurüggeben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>gettemplatelist</source>
         <translation type="obsolete">Vorlachenlisde anguggen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>gettemplate</source>
         <translation type="obsolete">Vorlache runderladen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>settemplate</source>
         <translation type="obsolete">Vorlache erschdellen.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="60"/>
         <source>_admin</source>
         <translation type="obsolete">Godd. Darf alles, gann alles, wees alles bessor.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="61"/>
         <source>_anyshipping</source>
         <translation type="obsolete">alle wechschigarden benudsen derfen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="62"/>
         <source>_repriceshipping</source>
         <translation type="obsolete">beim wechschiggn &apos;nen Fandasiebreis nehm&apos;</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createreservedorder</source>
         <translation type="obsolete">Ne Resorvierung anleechn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>orderchangeshipping</source>
         <translation type="obsolete">De Versandmedode von dor Beschdellung Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
         <source>reservationtoorder</source>
         <translation type="obsolete">Ne Resorvierung zur Beschdellung machn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
         <source>reservationtosale</source>
         <translation type="obsolete">Ne Resorvierung zu nem Vorgauf machn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>getshipping</source>
         <translation type="obsolete">Versandmedoden abfrachn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>setshipping</source>
         <translation type="obsolete">Versandmedoden Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>deleteshipping</source>
         <translation type="obsolete">Versandmedoden löschn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>getvoucherprices</source>
         <translation type="obsolete">erloobde Gudscheinbreise holn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>cancelvoucher</source>
         <translation type="obsolete">Gudschein zurüggeben</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>emptyvoucher</source>
         <translation type="obsolete">Gudschein ungüldsch machn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>usevoucher</source>
         <translation type="obsolete">mit Gudschein bedsahln</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>getvoucher</source>
         <translation type="obsolete">Gudschein abfrachn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>settemplatedescription</source>
         <translation type="obsolete">Vorlachenbeschreibung Ã¤ndorn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="52"/>
         <source>deletetemplate</source>
         <translation type="obsolete">Vorlache löschn</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="63"/>
         <source>_anyvoucher</source>
         <translation type="obsolete">Gudschein mit belibschm Werd vergoofen</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="64"/>
         <source>_anypricevoucher</source>
         <translation type="obsolete">Gudscheine vorgoofen, die &apos;n andorn Breis ham&apos; als wo &apos;se werd sin</translation>
     </message>
 </context>
 <context>
-    <name>Voucher</name>
+    <name>WTransaction</name>
+    <message>
+        <location filename="wbase/WTransaction.cpp" line="78"/>
+        <source>interface not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="wbase/WTransaction.cpp" line="132"/>
+        <source>Web Request timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="wbase/WTransaction.cpp" line="151"/>
+        <source>HTTP Error, return code %1 %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WobTransaction</name>
     <message>
+        <location filename="wob/MTBackup.cpp" line="41"/>
+        <location filename="wob/MTCancelEvent.cpp" line="50"/>
+        <location filename="wob/MTCancelOrder.cpp" line="40"/>
+        <location filename="wob/MTChangeMyPassword.cpp" line="52"/>
+        <location filename="wob/MTChangePassword.cpp" line="50"/>
+        <location filename="wob/MTCreateOrder.cpp" line="40"/>
+        <location filename="wob/MTCreateReservation.cpp" line="40"/>
+        <location filename="wob/MTCreateRole.cpp" line="40"/>
+        <location filename="wob/MTCreateUser.cpp" line="57"/>
+        <location filename="wob/MTDeleteCustomer.cpp" line="48"/>
+        <location filename="wob/MTDeleteHost.cpp" line="44"/>
+        <location filename="wob/MTDeleteUser.cpp" line="48"/>
+        <location filename="wob/MTGetAllCustomerNames.cpp" line="41"/>
+        <location filename="wob/MTGetAllEvents.cpp" line="41"/>
+        <location filename="wob/MTGetAllHostNames.cpp" line="41"/>
+        <location filename="wob/MTGetAllHosts.cpp" line="41"/>
+        <location filename="wob/MTGetAllRoles.cpp" line="41"/>
+        <location filename="wob/MTGetAllRooms.cpp" line="41"/>
+        <location filename="wob/MTGetAllShipping.cpp" line="41"/>
+        <location filename="wob/MTGetAllUsers.cpp" line="41"/>
+        <location filename="wob/MTGetCustomer.cpp" line="45"/>
+        <location filename="wob/MTGetEvent.cpp" line="45"/>
+        <location filename="wob/MTGetLanguage.cpp" line="49"/>
+        <location filename="wob/MTGetMyRights.cpp" line="41"/>
+        <location filename="wob/MTGetMyRoles.cpp" line="41"/>
+        <location filename="wob/MTGetOrder.cpp" line="45"/>
+        <location filename="wob/MTGetOrderByBarcode.cpp" line="47"/>
+        <location filename="wob/MTGetOrderList.cpp" line="46"/>
+        <location filename="wob/MTGetOrdersByCustomer.cpp" line="49"/>
+        <location filename="wob/MTGetOrdersByEvents.cpp" line="54"/>
+        <location filename="wob/MTGetTicket.cpp" line="45"/>
+        <location filename="wob/MTGetUserHosts.cpp" line="45"/>
+        <location filename="wob/MTGetUserRoles.cpp" line="45"/>
+        <location filename="wob/MTGetVoucher.cpp" line="45"/>
+        <location filename="wob/MTLogin.cpp" line="66"/>
+        <location filename="wob/MTLogout.cpp" line="40"/>
+        <location filename="wob/MTReservationToOrder.cpp" line="40"/>
+        <location filename="wob/MTServerInfo.cpp" line="43"/>
+        <location filename="wob/MTSetHost.cpp" line="50"/>
+        <location filename="wob/MTSetUserDescription.cpp" line="50"/>
+        <location filename="wob/MTSetUserHosts.cpp" line="52"/>
         <location filename="wob/MTSetUserRoles.cpp" line="52"/>
         <source>XML result parser error line %1 col %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="wob/MOAddress.cpp" line="106"/>
+        <location filename="wob/MOAddress.cpp" line="112"/>
+        <location filename="wob/MOAddress.cpp" line="118"/>
+        <location filename="wob/MOArtist.cpp" line="60"/>
+        <location filename="wob/MOCartOrder.cpp" line="96"/>
+        <location filename="wob/MOCartTicket.cpp" line="99"/>
+        <location filename="wob/MOCartTicket.cpp" line="105"/>
+        <location filename="wob/MOCartTicket.cpp" line="111"/>
+        <location filename="wob/MOCartTicket.cpp" line="123"/>
+        <location filename="wob/MOCartVoucher.cpp" line="81"/>
+        <location filename="wob/MOCartVoucher.cpp" line="87"/>
+        <location filename="wob/MOContact.cpp" line="61"/>
+        <location filename="wob/MOContact.cpp" line="67"/>
+        <location filename="wob/MOContact.cpp" line="73"/>
+        <location filename="wob/MOContactType.cpp" line="53"/>
+        <location filename="wob/MOCustomer.cpp" line="91"/>
+        <location filename="wob/MOCustomerInfoAbstract.cpp" line="60"/>
+        <location filename="wob/MOEvent.cpp" line="117"/>
+        <location filename="wob/MOEvent.cpp" line="123"/>
+        <location filename="wob/MOEvent.cpp" line="129"/>
+        <location filename="wob/MOEvent.cpp" line="135"/>
+        <location filename="wob/MOEvent.cpp" line="159"/>
+        <location filename="wob/MOEvent.cpp" line="172"/>
+        <location filename="wob/MOEvent.cpp" line="178"/>
+        <location filename="wob/MOEvent.cpp" line="188"/>
+        <location filename="wob/MOItemInfo.cpp" line="66"/>
+        <location filename="wob/MOItemInfo.cpp" line="72"/>
+        <location filename="wob/MOItemInfo.cpp" line="82"/>
+        <location filename="wob/MOItemInfo.cpp" line="88"/>
+        <location filename="wob/MOItemInfo.cpp" line="94"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="185"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="191"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="201"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="211"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="242"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="254"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="260"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="266"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="272"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="282"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="288"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="143"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="149"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="158"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="164"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="170"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="182"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="188"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="194"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="200"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="206"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="212"/>
+        <location filename="wob/MOPrice.cpp" line="61"/>
+        <location filename="wob/MOPrice.cpp" line="67"/>
+        <location filename="wob/MOPrice.cpp" line="73"/>
+        <location filename="wob/MOPrice.cpp" line="79"/>
+        <location filename="wob/MORoom.cpp" line="57"/>
+        <location filename="wob/MOShipping.cpp" line="58"/>
+        <location filename="wob/MOShipping.cpp" line="64"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="118"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="124"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="136"/>
+        <location filename="wob/MOVoucher.cpp" line="99"/>
+        <location filename="wob/MOVoucher.cpp" line="105"/>
+        <location filename="wob/MOVoucher.cpp" line="120"/>
+        <source>Class &apos;%1&apos; property &apos;%2&apos; is integer, but non-integer was found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="wob/MOCartOrder.cpp" line="90"/>
+        <location filename="wob/MOCartTicket.cpp" line="117"/>
+        <location filename="wob/MOCartVoucher.cpp" line="93"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="248"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="176"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="130"/>
+        <location filename="wob/MOVoucher.cpp" line="111"/>
+        <source>Class &apos;%1&apos; property &apos;%2&apos; is enum, invalid value was found.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initkey</name>
     <message>
-        <location filename="main.cpp" line="170"/>
         <source>Warning</source>
-        <translation>Dumm gelaufen</translation>
+        <translation type="obsolete">Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="158"/>
         <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>
+        <translation type="obsolete">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="164"/>
         <source>Enter Host Name</source>
-        <translation>Gombjudername eingäbn</translation>
+        <translation type="obsolete">Gombjudername eingäbn</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="165"/>
         <source>Host name:</source>
-        <translation>Gombjudername:</translation>
+        <translation type="obsolete">Gombjudername:</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="170"/>
         <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>
+        <translation type="obsolete">Mädschig Schmohg brauchd &apos;nen Namen für diesen Gombjuder. Desweschen isser beleidschd. Beim nächsden Schdard mussde ihn eingäben. </translation>
     </message>
 </context>
 <context>
     <name>initprofile</name>
     <message>
-        <location filename="main.cpp" line="179"/>
         <source>default</source>
         <comment>initial profile</comment>
-        <translation>Schdandardbrofiel</translation>
+        <translation type="obsolete">Schdandardbrofiel</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="180"/>
         <source>Create Initial Profile</source>
-        <translation>Erschdes Brofiel anlechen</translation>
+        <translation type="obsolete">Erschdes Brofiel anlechen</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="180"/>
         <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>
+        <translation type="obsolete">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>
+    <message>
+        <location filename="main.cpp" line="176"/>
+        <source>Initial Profile Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="176"/>
+        <source>You need a profile to work with Magic Smoke. Please create one now.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3960,37 +4900,37 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>misc</name>
     <message>
-        <location filename="misc.cpp" line="52"/>
+        <location filename="misc/misc.cpp" line="52"/>
         <source>%1.%2</source>
         <comment>price with decimal dot</comment>
         <translation>%1,%2</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="60"/>
+        <location filename="misc/misc.cpp" line="60"/>
         <source>.</source>
         <comment>decimal dot in price</comment>
         <translation>,</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="86"/>
+        <location filename="misc/misc.cpp" line="86"/>
         <source>[0-9]+\.[0-9]{2}</source>
         <comment>regexp for price</comment>
         <translation>[0-9]+,[0-9]{2}</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="94"/>
+        <location filename="misc/misc.cpp" line="94"/>
         <source>yyyy-MM-dd</source>
         <comment>localized date format</comment>
         <translation type="unfinished">d.M.yyyy</translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="102"/>
+        <location filename="misc/misc.cpp" line="102"/>
         <source>hh:mm</source>
         <comment>localized time format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="110"/>
+        <location filename="misc/misc.cpp" line="110"/>
         <source>yyyy-MM-dd hh:mm</source>
         <comment>localized date + time format</comment>
         <translation type="unfinished"></translation>
@@ -3999,27 +4939,27 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>office</name>
     <message>
-        <location filename="office.cpp" line="47"/>
+        <location filename="templates/office.cpp" line="47"/>
         <source>Chose Printer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="50"/>
+        <location filename="templates/office.cpp" line="50"/>
         <source>Please chose a printer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="54"/>
+        <location filename="templates/office.cpp" line="54"/>
         <source>(Default Printer)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="70"/>
+        <location filename="templates/office.cpp" line="70"/>
         <source>Ok</source>
         <translation type="unfinished">Is gud so.</translation>
     </message>
     <message>
-        <location filename="office.cpp" line="92"/>
+        <location filename="templates/office.cpp" line="92"/>
         <source>Save current document as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4027,374 +4967,300 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>php::</name>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="259"/>
         <source>Unknown Customer</source>
         <translation type="obsolete">Unbegannder Gunde. Da iss was schiefgelaufn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="271"/>
         <source>Unable to parse XML.</source>
         <translation type="obsolete">Gann des XML nisch vorschdehn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="316"/>
         <source>Cannot find customer ID to delete.</source>
         <translation type="obsolete">Gann den Gunden ni finden, den wo isch löschen soll.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="322"/>
         <source>Invalid Customer ID, cannot delete.</source>
         <translation type="obsolete">Gann den Gunden ni löschen, weil die Nummer gibsd gar ni! Widsbold!</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="330"/>
         <source>Invalid Customer ID, cannot merge.</source>
         <translation type="obsolete">Ungüldsche Nummer sachd der Sörvor. Jedsd gannor de Gunden ni zusammlechn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="348"/>
         <source>Cannot find Customer ID, cannot delete.</source>
         <translation type="obsolete">Ei verbübschd! Ich gann den Kunden gar ni findn, den Du löschen willst!</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="369"/>
         <source>Cannot merge customers.</source>
         <translation type="obsolete">Kann de Gunden nisch zusammlechen. Worum wees&apos;sch och ni.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/customer.php" line="379"/>
         <source>Cannot delete customer.</source>
         <translation type="obsolete">Gann den Gunden ni löschen. Gomm&apos;se morchen nochma&apos;.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="257"/>
         <source>Malformed request.</source>
         <translation type="obsolete">Gabudde Anfrache. Nimm ma&apos; das Logbuch und lauf damit zum Brogrammierer, dem Lümmel.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/event.php" line="424"/>
         <source>The event id must be numeric.</source>
         <translation type="obsolete">Die Veranschdaldungsnummer muss och wirschlich &apos;ne Nummer sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/event.php" line="438"/>
         <source>Invalid event id.</source>
         <translation type="obsolete">Ungüldsche Veranschdaldungsnummer.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="800"/>
         <source>Cannot place order, sorry.</source>
         <translation type="obsolete">Jedsd gann&apos;sch vor Schregg die Beschdellung ni anleschn. Dud mir wirschlich leid!</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="790"/>
         <source>Cannot place sale, sorry.</source>
         <translation type="obsolete">Das gann&apos;sch jedsd aus irschendnem Grund ni vergaufen. Gomisch.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="805"/>
         <source>Internal Error: unknown action.</source>
         <translation type="obsolete">Huch! Jedsd habsch was falsch gemachd: de &quot;Action&quot; is ni begannd. Frach ma jemand anders.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="873"/>
         <source>No such orderID in database.</source>
         <translation type="obsolete">De Beschdellung is ni in dor Dadenbank.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="884"/>
         <source>Expected 2 arguments.</source>
         <translation type="obsolete">Eischendlich hadsch zwee Argumende erwarded. Wasn&apos; nu?</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="890"/>
         <source>Invalid Order ID</source>
         <translation type="obsolete">Ungüldsche Beschdellnummer</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="896"/>
         <source>Expected positive amount.</source>
         <translation type="obsolete">Wenn&apos;de mir sachst wieviel&apos;s sein soll, dann versuch mich ni zu verarschen: s&apos; muss schon &apos;ne bosidive Zahl sein.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="905"/>
         <source>Order does not exist.</source>
         <translation type="obsolete">Beschdellung gibsd ni. Wirschlich ni. Bionierärenword.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="911"/>
         <source>Order cannot be changed, it is closed.</source>
         <translation type="obsolete">De Beschdellung gansch jedsd ni mehr Ã¤ndern. Ã„rsdens is gleisch Feierahmd und zweed&apos;ns is die schon geschloss&apos;n.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="970"/>
         <source>Order ID must be numeric.</source>
         <translation type="obsolete">Du hör ma! Das heesd Beschdellnummer weils &apos;ne Nummer sein soll, ni weil&apos;de Göthe zidiern sollsd.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="980"/>
         <source>Order ID is invalid.</source>
         <translation type="obsolete">Ungüldsche Beschdellnummer</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="961"/>
         <source>Wrong state, cannot set order to shipped.</source>
         <translation type="obsolete">De Beschdellung gann ni weggeschiggd werden. Bungd.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="986"/>
         <source>Wrong state, cannot set order to cancelled.</source>
         <translation type="obsolete">De Beschdellung gann ni abgebrochn werden. Bungd.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ticket not found.</source>
         <translation type="obsolete">Garde nisch gefunden.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Ticket has no order.</source>
         <translation type="obsolete">Garde had geene Beschdellung. Seid wann machn&apos; worn sowas?</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The ticket is not valid.</source>
         <translation type="obsolete">De Garde is nisch güldsch. Wollmor uns widder einschmuggeln - hä?</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The ticket has already been used.</source>
         <translation type="obsolete">De Garde wurde schonma benudsd. Mir sin&apos; hier nisch bei &quot;Nimm Zwei&quot;!</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The ticket has not been bought or is cancelled.</source>
         <translation type="obsolete">De Garde wurde nisch gegaufd oder wurde schon zurüggegeben. So ni!</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The ticket has not been paid.</source>
         <translation type="obsolete">De Garde is nisch bezahlt! Kohle her oder zu Hause blei&apos;m!</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>The tickets order is in an invalid state or does not exist.</source>
         <translation type="obsolete">De Beschdellung von dor Garde is ungüldsch! Das müssmer ersdma scheggn eh der rein darf!</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="292"/>
         <source>Unable to find this ticket.</source>
         <translation type="obsolete">Gann de Garde ni finden. War&apos;s vielleischd Ã¤ Gassenzeddel?</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="262"/>
         <source>Price must be a number.</source>
         <translation type="obsolete">Also wär schon schön, wenn dor Breis irschendwie Zahlenähnlisch wär.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="267"/>
         <source>Price must be positive.</source>
         <translation type="obsolete">Mir sind hier nisch beim Loddo. Breise sind größer als Null.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/ticket.php" line="297"/>
         <source>Ticket cannot be returned.</source>
         <translation type="obsolete">Garde gann nisch zurüggegeben werden.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="577"/>
         <source>unable to parse XML data</source>
         <translation type="obsolete">Gann de XML Daden nisch verstehn</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/host.php" line="91"/>
         <source>Cannot delete special hosts.</source>
         <translation type="obsolete">Schbedsielle Reschnor gönnen nisch gelöschd werdn.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>missing some authentication data</source>
         <translation type="obsolete">Isch vormisse a bissl was von dor Audendigadsion.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Not authenticated. Can&apos;t change password.</source>
         <translation type="obsolete">De bissd nisch angemeldet, also gannsde och gee Bassword Ã¤ndorn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="582"/>
         <source>expected exactly one passwd element</source>
         <translation type="obsolete">Isch hadde eschendlich nur een Bassword erwarded.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="590"/>
         <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>
     </message>
     <message>
-        <location filename="" line="0"/>
         <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>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Wrong password. Session hijacked, terminating it.</source>
         <translation type="obsolete">Falsches Bassword. Du bissd wahrscheinlich a böser Birad. Geh wech!</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="376"/>
         <source>invalid user name</source>
         <translation type="obsolete">Falscher Nudsorname.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="335"/>
         <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>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="434"/>
         <source>unknown user name</source>
         <translation type="obsolete">Unbegannder Nudsorname. Findsde das ni&apos; ooch Misd?</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="418"/>
         <source>expected exactly 1 Hosts element</source>
         <translation type="obsolete">Isch hab nur een Host Elemend erwarded. Mach ma rischdsch.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="522"/>
         <source>Syntax Error</source>
         <translation type="obsolete">Syntaxfehler... ...&quot;Südagsfählor&quot; - isch glob&apos; das is wenn mor sisch vergwasslt.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="540"/>
         <source>Cannot remove user: DB error while deleting ACL.</source>
         <translation type="obsolete">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/session.php" line="549"/>
         <source>Cannot remove user: unable to replace user.</source>
         <translation type="obsolete">Gann den Nudsor nisch löschen: gann de zwee&apos;e ni verdauschen.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="563"/>
         <source>Cannot remove user: DB error while deleting user.</source>
         <translation type="obsolete">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/inc/machine/session.php" line="595"/>
         <source>Unable to change this password.</source>
         <translation type="obsolete">Isch gann das Bassword &apos;ne Ã¤ndern.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="42"/>
         <source>Template File not found in database</source>
         <translation type="obsolete">De Vorlache gibsd ned in dor Dadenbank.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="83"/>
         <source>Unable to find file name</source>
         <translation type="obsolete">De Dadai gibsd ned.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="91"/>
         <source>Illegal File Name</source>
         <translation type="obsolete">De Dadai is nich erlaubd. Du mussd Disch schon an de Gonvendsion halden.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="73"/>
         <source>Invalid Request, please use the MagicSmoke Client with this page.</source>
         <translation type="obsolete">Da iss was gabudd mit Deim Brogramm, Du mussd schon &apos;s rischdsche nehm.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="127"/>
         <source>Invalid or missing sessionid, or session timed out.</source>
         <translation type="obsolete">De Seschion gehd nimmer.</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="139"/>
         <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>
     </message>
     <message>
-        <location filename="../www/machine.php" line="151"/>
         <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>
     </message>
     <message>
-        <location filename="../www/machine.php" line="492"/>
         <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>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>invalidvalue</source>
         <comment>voucher state</comment>
         <translation type="obsolete">ungüldschor Werd</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>invalidprice</source>
         <comment>voucher state</comment>
         <translation type="obsolete">ungüldschor Breis</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Shipping type not available to user.</source>
         <translation type="obsolete">De Versandmedode gannsde nisch benudsen. S&apos; had dor Scheff verboden.</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Illegal shipping type.</source>
         <translation type="obsolete">De Versandmedode gibs doch gar nisch!</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="916"/>
         <source>Order cannot be paid for, it is only a reservation. Order or sell it first!</source>
         <translation type="obsolete">Isch gann das Geld jedsd wirschlisch ni nehm. Gands Ã¤nsdhafd. S&apos; iss nämlisch noch ni beschdelld, sondorn nur resorvierd.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1072"/>
         <source>Unable to update order comment.</source>
         <translation type="obsolete">Gann den Gommendar ni anbassn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1217"/>
         <source>Invalid Order.</source>
         <translation type="obsolete">Ungüldsche Beschdellung.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1112"/>
         <source>Invalid Shipping Method.</source>
         <translation type="obsolete">Ungüldsche Versandmedode.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1179"/>
         <source>Unable to create new shipping method.</source>
         <translation type="obsolete">GAnn de neue Versandmedode ni anlechn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1188"/>
         <source>Unable to change shipping method.</source>
         <translation type="obsolete">Gann de Versandmedode ni Ã¤ndorn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1201"/>
         <source>Expected a numeric shipping ID.</source>
         <translation type="obsolete">Also eechendlich habsch &apos;ne Nummor erwarded als Versandmedodennummer. Desweschn heesd das och Versandmedodennummer.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1206"/>
         <source>Unable to delete shipping method.</source>
         <translation type="obsolete">Gann de Versandmedode ni löschn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/classes/order.php" line="1224"/>
         <source>Cannot change order from reservation.</source>
         <translation type="obsolete">Gann de Resorvierung ni Ã¤ndorn.</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/template.php" line="98"/>
         <source>Template file does not exist</source>
         <translation type="obsolete">Vorlache eggsisdierd ni. Wirschlisch ni. Isch hab gesuchd wie&apos;n Bleeder. Isch gonnd&apos;s ni find&apos;n!</translation>
     </message>
index 0a35b53..7377998 100644 (file)
@@ -1,5 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="en">
+<!DOCTYPE TS>
+<TS version="2.0" language="en">
+<context>
+    <name>MAppStyleDialog</name>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="563"/>
+        <source>Application Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="566"/>
+        <source>GUI Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="568"/>
+        <source>System Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="576"/>
+        <source>Stylesheet:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="587"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="590"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="596"/>
+        <source>Select Stylesheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MApplication</name>
     <message>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="91"/>
-        <source>About MagicSmoke</source>
+        <location filename="main.cpp" line="91"/>
+        <source>About MagicSmoke</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="92"/>
+        <source>&lt;h3&gt;MagicSmoke %3&lt;/h3&gt;&amp;copy; Konrad Rosenbaum, 2007-2010&lt;br&gt;&amp;copy; Peter Keller, 2007-2008&lt;br&gt;protected under the GNU GPL v.3 or at your option any newer&lt;p&gt;See also the &lt;a href=&quot;http://smoke.silmor.de&quot;&gt;MagicSmoke Homepage&lt;/a&gt;.&lt;p&gt;This version was compiled from repository &apos;%1&apos; revision &apos;%2&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MBackupDialog</name>
+    <message>
+        <location filename="mwin/overview.cpp" line="560"/>
+        <source>Backup Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="565"/>
+        <source>Backup File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="567"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="570"/>
+        <source>Generations to keep:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="575"/>
+        <source>Automatic Backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="579"/>
+        <source>Interval in days:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="587"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="590"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="596"/>
+        <source>Backup File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MCartTab</name>
+    <message>
+        <location filename="mwin/carttab.cpp" line="56"/>
+        <source>Add Ticket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="58"/>
+        <source>Add Voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="60"/>
+        <source>Remove Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="66"/>
+        <source>Customer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="72"/>
+        <source>Shipping Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="75"/>
+        <source>Delivery Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="78"/>
+        <source>Comments:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="85"/>
+        <source>Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="88"/>
+        <source>Reserve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="91"/>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="105"/>
+        <source>C&amp;art</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="106"/>
+        <source>Add &amp;Ticket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="107"/>
+        <source>Add &amp;Voucher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="108"/>
+        <source>&amp;Remove Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="109"/>
+        <source>&amp;Abort Shopping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="111"/>
+        <source>&amp;Update Shipping Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="122"/>
+        <source>(No Shipping)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="133"/>
+        <source>Amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="133"/>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="133"/>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="166"/>
+        <source>Select Event to order Ticket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="179"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/carttab.cpp" line="182"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MCentDialog</name>
+    <message>
+        <location filename="widgets/centbox.cpp" line="105"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/centbox.cpp" line="108"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MCheckDialog</name>
+    <message>
+        <location filename="dialogs/checkdlg.cpp" line="33"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/checkdlg.cpp" line="35"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MConfigDialog</name>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="49"/>
+        <source>Magic Smoke Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="60"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="61"/>
+        <source>&amp;New Profile...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="62"/>
+        <source>&amp;Delete Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="63"/>
+        <source>&amp;Rename Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="64"/>
+        <source>C&amp;lone Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="65"/>
+        <source>&amp;Make Default Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="67"/>
+        <source>&amp;Export Host Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="68"/>
+        <source>&amp;Import Host Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="69"/>
+        <source>&amp;Generate Host Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="71"/>
+        <source>&amp;Close Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="72"/>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="73"/>
+        <source>&amp;Language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="74"/>
+        <source>&amp;OpenOffice.org Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="75"/>
+        <source>Set &amp;Default Label Font...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="76"/>
+        <source>Set &amp;Application Style...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="90"/>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="95"/>
+        <source>Server URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="100"/>
+        <source>Proxy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="108"/>
+        <source>Proxy Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="111"/>
+        <source>Proxy Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="118"/>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="121"/>
+        <source>Hostname:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="124"/>
+        <source>Hostkey:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="127"/>
+        <source>Default Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="133"/>
+        <source>SSL Exceptions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="135"/>
+        <source>List of non-fatal SSL exceptions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="143"/>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="145"/>
+        <source>Probe Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="252"/>
+        <location filename="dialogs/configdialog.cpp" line="328"/>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="252"/>
+        <location filename="dialogs/configdialog.cpp" line="287"/>
+        <location filename="dialogs/configdialog.cpp" line="328"/>
+        <source>Please enter a profile name. It must be non-empty and must not be used yet:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="287"/>
+        <source>Rename Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="294"/>
+        <location filename="dialogs/configdialog.cpp" line="402"/>
+        <location filename="dialogs/configdialog.cpp" line="417"/>
+        <location filename="dialogs/configdialog.cpp" line="429"/>
+        <location filename="dialogs/configdialog.cpp" line="437"/>
+        <location filename="dialogs/configdialog.cpp" line="441"/>
+        <location filename="dialogs/configdialog.cpp" line="446"/>
+        <location filename="dialogs/configdialog.cpp" line="451"/>
+        <location filename="dialogs/configdialog.cpp" line="456"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="294"/>
+        <source>This profile name is already in use.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="378"/>
+        <source>Generate Hostkey</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="378"/>
+        <source>Do you really want to generate a new host key for this profile? This may disable all accounts from this host.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="393"/>
+        <source>Export Key to File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="402"/>
+        <source>Unable to open file %1 for writing: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="417"/>
+        <source>Importing a key overwrites the host key that is currently used by this profile. This may disable your accounts. Do you still want to continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="420"/>
+        <source>Import Key from File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="429"/>
+        <source>Unable to open file %1 for reading: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="437"/>
+        <location filename="dialogs/configdialog.cpp" line="441"/>
+        <source>This is not a host key file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/configdialog.cpp" line="446"/>
+        <source>This host key file does not contain a valid host name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="97"/>
-        <source>&lt;h3&gt;MagicSmoke %3&lt;/h3&gt;&amp;copy; Konrad Rosenbaum, Peter Keller, 2007-9&lt;br&gt;protected under the GNU GPL v.3 or at your option any newer&lt;p&gt;See also the &lt;a href=&quot;http://smoke.silmor.de&quot;&gt;MagicSmoke Homepage&lt;/a&gt;.&lt;p&gt;This version was compiled from repository &apos;%1&apos; revision &apos;%2&apos;.</source>
+        <location filename="dialogs/configdialog.cpp" line="451"/>
+        <source>This host key file does not contain a valid key.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MBackupDialog</name>
     <message>
-        <location filename="overview.cpp" line="1624"/>
-        <source>Backup Settings</source>
+        <location filename="dialogs/configdialog.cpp" line="456"/>
+        <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1629"/>
-        <source>Backup File:</source>
+        <location filename="dialogs/configdialog.cpp" line="477"/>
+        <source>Chose Default Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1631"/>
-        <source>...</source>
+        <location filename="dialogs/configdialog.cpp" line="477"/>
+        <source>Please chose a default font:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1634"/>
-        <source>Generations to keep:</source>
+        <location filename="dialogs/configdialog.cpp" line="510"/>
+        <location filename="dialogs/configdialog.cpp" line="512"/>
+        <source>Server Probe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1639"/>
-        <source>Automatic Backup:</source>
+        <location filename="dialogs/configdialog.cpp" line="510"/>
+        <source>The request finished without errors.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1643"/>
-        <source>Interval in days:</source>
+        <location filename="dialogs/configdialog.cpp" line="512"/>
+        <source>The request finished with an error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1651"/>
-        <source>&amp;OK</source>
+        <location filename="dialogs/configdialog.cpp" line="523"/>
+        <source>SSL Errors encountered:
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1654"/>
-        <source>&amp;Cancel</source>
+        <location filename="dialogs/configdialog.cpp" line="526"/>
+        <source>Certificate &quot;%1&quot;
+  Fingerprint (sha1): %2
+  Error: %3
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1660"/>
-        <source>Backup File</source>
+        <location filename="dialogs/configdialog.cpp" line="531"/>
+        <source>Accept connection anyway?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MCentDialog</name>
     <message>
-        <location filename="widgets/centbox.cpp" line="105"/>
-        <source>OK</source>
+        <location filename="dialogs/configdialog.cpp" line="532"/>
+        <source>SSL Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/centbox.cpp" line="108"/>
-        <source>Cancel</source>
+        <location filename="dialogs/configdialog.cpp" line="550"/>
+        <source>Common Name</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MCheckDialog</name>
     <message>
-        <location filename="widgets/checkdlg.cpp" line="33"/>
-        <source>Ok</source>
+        <location filename="dialogs/configdialog.cpp" line="550"/>
+        <source>SHA-1 Digest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/checkdlg.cpp" line="35"/>
-        <source>Cancel</source>
+        <location filename="dialogs/configdialog.cpp" line="550"/>
+        <source>Error Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MCustomerDialog</name>
     <message>
-        <location filename="customer.cpp" line="254"/>
+        <location filename="dialogs/customerdlg.cpp" line="206"/>
         <source>Customer %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="256"/>
+        <location filename="dialogs/customerdlg.cpp" line="208"/>
         <source>New Customer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="262"/>
+        <location filename="dialogs/customerdlg.cpp" line="214"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="264"/>
+        <location filename="dialogs/customerdlg.cpp" line="216"/>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="267"/>
+        <location filename="dialogs/customerdlg.cpp" line="219"/>
         <source>Contact Information:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="272"/>
+        <location filename="dialogs/customerdlg.cpp" line="224"/>
         <source>Web-Login/eMail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="275"/>
+        <location filename="dialogs/customerdlg.cpp" line="227"/>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="283"/>
+        <location filename="dialogs/customerdlg.cpp" line="235"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="286"/>
+        <location filename="dialogs/customerdlg.cpp" line="238"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 <context>
     <name>MCustomerListDialog</name>
     <message>
-        <location filename="customer.cpp" line="73"/>
+        <location filename="dialogs/customerdlg.cpp" line="37"/>
         <source>Select a Customer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="75"/>
+        <location filename="dialogs/customerdlg.cpp" line="39"/>
         <source>Customers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="96"/>
+        <location filename="dialogs/customerdlg.cpp" line="60"/>
         <source>Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="98"/>
+        <location filename="dialogs/customerdlg.cpp" line="62"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="101"/>
+        <location filename="dialogs/customerdlg.cpp" line="65"/>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="109"/>
+        <location filename="dialogs/customerdlg.cpp" line="73"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="112"/>
+        <location filename="dialogs/customerdlg.cpp" line="76"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="115"/>
+        <location filename="dialogs/customerdlg.cpp" line="79"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="202"/>
+        <location filename="dialogs/customerdlg.cpp" line="165"/>
         <source>Delete Customer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="205"/>
+        <location filename="dialogs/customerdlg.cpp" line="168"/>
         <source>Really delete this customer (%1)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="208"/>
+        <location filename="dialogs/customerdlg.cpp" line="171"/>
         <source>merge with other entry:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="220"/>
+        <location filename="dialogs/customerdlg.cpp" line="183"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="customer.cpp" line="222"/>
+        <location filename="dialogs/customerdlg.cpp" line="185"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="dialogs/customerdlg.cpp" line="192"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialogs/customerdlg.cpp" line="192"/>
+        <source>Failed to delete customer: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MEntranceTab</name>
+    <message>
+        <location filename="mwin/entrancetab.cpp" line="40"/>
+        <source>Enter or scan Ticket-ID:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MEvent</name>
     <message>
-        <location filename="event.cpp" line="31"/>
+        <location filename="iface/event.cpp" line="31"/>
         <source>[0-9]+\.[0-9]{2}</source>
         <comment>price validator regexp</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="event.cpp" line="61"/>
+        <location filename="iface/event.cpp" line="38"/>
+        <location filename="iface/event.cpp" line="61"/>
         <source>.</source>
         <comment>price decimal dot</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="event.cpp" line="56"/>
+        <location filename="iface/event.cpp" line="46"/>
+        <location filename="iface/event.cpp" line="56"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="event.cpp" line="51"/>
+        <location filename="iface/event.cpp" line="51"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation type="unfinished"></translation>
 <context>
     <name>MEventEditor</name>
     <message>
-        <location filename="eventedit.cpp" line="39"/>
+        <location filename="dialogs/eventedit.cpp" line="39"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="39"/>
+        <location filename="dialogs/eventedit.cpp" line="39"/>
         <source>Unable to load event from server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="46"/>
+        <location filename="dialogs/eventedit.cpp" line="46"/>
         <source>Event Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="58"/>
+        <location filename="dialogs/eventedit.cpp" line="58"/>
         <source>ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="63"/>
+        <location filename="dialogs/eventedit.cpp" line="63"/>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="68"/>
+        <location filename="dialogs/eventedit.cpp" line="68"/>
         <source>Artist:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="73"/>
+        <location filename="dialogs/eventedit.cpp" line="73"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="78"/>
+        <location filename="dialogs/eventedit.cpp" line="78"/>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="89"/>
+        <location filename="dialogs/eventedit.cpp" line="81"/>
+        <location filename="dialogs/eventedit.cpp" line="89"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="86"/>
+        <location filename="dialogs/eventedit.cpp" line="86"/>
         <source>End Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="94"/>
+        <location filename="dialogs/eventedit.cpp" line="94"/>
         <source>Room/Place:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="103"/>
+        <location filename="dialogs/eventedit.cpp" line="103"/>
         <source>Capacity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="109"/>
+        <location filename="dialogs/eventedit.cpp" line="109"/>
         <source>Default Price:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="115"/>
+        <location filename="dialogs/eventedit.cpp" line="115"/>
         <source>Event Cancelled:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="127"/>
+        <location filename="dialogs/eventedit.cpp" line="127"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="177"/>
+        <location filename="dialogs/eventedit.cpp" line="130"/>
+        <location filename="dialogs/eventedit.cpp" line="177"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="161"/>
+        <location filename="dialogs/eventedit.cpp" line="161"/>
         <source>Select a Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="172"/>
+        <location filename="dialogs/eventedit.cpp" line="172"/>
         <source>New...</source>
         <comment>new room</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventedit.cpp" line="175"/>
+        <location filename="dialogs/eventedit.cpp" line="175"/>
         <source>Select</source>
         <comment>select room</comment>
         <translation type="unfinished"></translation>
 <context>
     <name>MEventSummary</name>
     <message>
-        <location filename="eventsummary.cpp" line="39"/>
+        <location filename="dialogs/eventsummary.cpp" line="39"/>
         <source>Summary for Event %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="45"/>
+        <location filename="dialogs/eventsummary.cpp" line="45"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="49"/>
+        <location filename="dialogs/eventsummary.cpp" line="49"/>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="51"/>
+        <location filename="dialogs/eventsummary.cpp" line="51"/>
         <source>Artist:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="53"/>
+        <location filename="dialogs/eventsummary.cpp" line="53"/>
         <source>Start:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="55"/>
+        <location filename="dialogs/eventsummary.cpp" line="55"/>
         <source>Capacity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="57"/>
+        <location filename="dialogs/eventsummary.cpp" line="57"/>
         <source>Tickets currently reserved:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="59"/>
+        <location filename="dialogs/eventsummary.cpp" line="59"/>
         <source>Tickets currently cancelled:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="61"/>
+        <location filename="dialogs/eventsummary.cpp" line="61"/>
         <source>Tickets currently usable:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="63"/>
+        <location filename="dialogs/eventsummary.cpp" line="63"/>
         <source>Total Income:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="68"/>
+        <location filename="dialogs/eventsummary.cpp" line="68"/>
         <source>Tickets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Price</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Bought</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="73"/>
+        <location filename="dialogs/eventsummary.cpp" line="73"/>
         <source>Unused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="84"/>
+        <location filename="dialogs/eventsummary.cpp" line="84"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="90"/>
+        <location filename="dialogs/eventsummary.cpp" line="90"/>
         <source>Order: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="92"/>
+        <location filename="dialogs/eventsummary.cpp" line="92"/>
         <source>Customer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="102"/>
+        <location filename="dialogs/eventsummary.cpp" line="102"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="104"/>
+        <location filename="dialogs/eventsummary.cpp" line="104"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="eventsummary.cpp" line="107"/>
+        <location filename="dialogs/eventsummary.cpp" line="107"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>MEventsTab</name>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="56"/>
+        <source>New Event...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="59"/>
+        <source>Details...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="63"/>
+        <source>Order Ticket...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="67"/>
+        <source>Event Summary...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="71"/>
+        <source>Cancel Event...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="85"/>
+        <source>&amp;Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="86"/>
+        <source>&amp;Update Event List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="88"/>
+        <source>&amp;Show/Edit details...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="90"/>
+        <source>&amp;New Event...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="92"/>
+        <source>Show &amp;old Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Reserved</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Sold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="126"/>
+        <source>Capacity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="134"/>
+        <source>ddd MMMM d yyyy, h:mm ap</source>
+        <comment>time format</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="196"/>
+        <source>Cancel Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="196"/>
+        <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="200"/>
+        <source>Event Cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="200"/>
+        <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="202"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/eventstab.cpp" line="202"/>
+        <source>Unable to cancel event &quot;%1&quot;: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MHostTab</name>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="235"/>
+        <source>New Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="238"/>
+        <source>Add This Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="241"/>
+        <source>Delete Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="245"/>
+        <source>Generate New Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="248"/>
+        <source>Import...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="251"/>
+        <source>Export...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="274"/>
+        <source>Host Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="274"/>
+        <source>Host Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MKeyGen</name>
     <message>
-        <location filename="keygen.cpp" line="42"/>
+        <location filename="crypto/keygen.cpp" line="43"/>
         <source>Magic Smoke Key Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="53"/>
+        <location filename="crypto/keygen.cpp" line="54"/>
         <source>&lt;html&gt;&lt;h1&gt;Key Generation&lt;/h1&gt;
 I am currently collecting random bits in order to generate a host key for this installation. Please use mouse and keyboard to generate more random. Alternatively you can load a key from an external medium.&lt;p&gt;
 At least %1 Bits of random are required.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="keygen.cpp" line="88"/>
+        <location filename="crypto/keygen.cpp" line="59"/>
+        <location filename="crypto/keygen.cpp" line="89"/>
         <source>Current random buffer: %n Bits</source>
         <translation>
             <numerusform>Current random buffer: %n Bit</numerusform>
@@ -467,12 +1114,12 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="69"/>
+        <location filename="crypto/keygen.cpp" line="70"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="keygen.cpp" line="71"/>
+        <location filename="crypto/keygen.cpp" line="72"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -480,651 +1127,707 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MLabelDialog</name>
     <message>
-        <location filename="labeldlg.cpp" line="40"/>
+        <location filename="templates/labeldlg.cpp" line="40"/>
         <source>Label Printing Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="49"/>
+        <location filename="templates/labeldlg.cpp" line="49"/>
         <source>mm</source>
         <comment>defaultmetric: mm, in, cm</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="75"/>
+        <location filename="templates/labeldlg.cpp" line="75"/>
         <source>Label offset:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="81"/>
+        <location filename="templates/labeldlg.cpp" line="81"/>
         <source>Label size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="87"/>
+        <location filename="templates/labeldlg.cpp" line="87"/>
         <source>Unit:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="89"/>
+        <location filename="templates/labeldlg.cpp" line="89"/>
         <source>Millimeter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="90"/>
+        <location filename="templates/labeldlg.cpp" line="90"/>
         <source>Centimeter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="91"/>
+        <location filename="templates/labeldlg.cpp" line="91"/>
         <source>Inch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="99"/>
+        <location filename="templates/labeldlg.cpp" line="99"/>
         <source>Page usage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="102"/>
+        <location filename="templates/labeldlg.cpp" line="102"/>
         <source>Page %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="146"/>
+        <location filename="templates/labeldlg.cpp" line="146"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="150"/>
+        <location filename="templates/labeldlg.cpp" line="150"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="labeldlg.cpp" line="303"/>
+        <location filename="templates/labeldlg.cpp" line="303"/>
         <source>Warning: the label may not fit on the page!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MMainWindow</name>
-    <message>
-        <location filename="mainwindow.cpp" line="48"/>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>MLogin</name>
     <message>
-        <location filename="mainwindow.cpp" line="49"/>
-        <source>&amp;New Profile...</source>
+        <location filename="dialogs/login.cpp" line="34"/>
+        <source>Magic Smoke Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="50"/>
-        <source>&amp;Save Profile</source>
+        <location filename="dialogs/login.cpp" line="40"/>
+        <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="52"/>
-        <source>&amp;Close Window</source>
+        <location filename="dialogs/login.cpp" line="41"/>
+        <source>&amp;Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="53"/>
+        <location filename="dialogs/login.cpp" line="42"/>
         <source>&amp;Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="54"/>
-        <source>&amp;Language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="56"/>
-        <source>&amp;Export Host Key...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="57"/>
-        <source>&amp;Import Host Key...</source>
+        <location filename="dialogs/login.cpp" line="43"/>
+        <source>&amp;Configuration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="58"/>
-        <source>&amp;Generate Host Key...</source>
+        <location filename="dialogs/login.cpp" line="51"/>
+        <source>Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="71"/>
-        <source>Profile:</source>
+        <location filename="dialogs/login.cpp" line="55"/>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="75"/>
-        <source>Alternate Hostname:</source>
+        <location filename="dialogs/login.cpp" line="58"/>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="78"/>
-        <source>Server URL:</source>
+        <location filename="dialogs/login.cpp" line="69"/>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="81"/>
-        <source>Proxy:</source>
+        <location filename="dialogs/login.cpp" line="111"/>
+        <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
-        <source>Proxy Username:</source>
+        <location filename="dialogs/login.cpp" line="111"/>
+        <source>Unable to log in.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MMoneyLog</name>
     <message>
-        <location filename="mainwindow.cpp" line="93"/>
-        <source>Proxy Password:</source>
+        <location filename="dialogs/moneylog.cpp" line="27"/>
+        <source>Money Log of %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="102"/>
-        <source>Username:</source>
+        <location filename="dialogs/moneylog.cpp" line="40"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOCartOrder</name>
     <message>
-        <location filename="mainwindow.cpp" line="105"/>
-        <source>Password:</source>
+        <location filename="wob/MOCartOrder.cpp" line="28"/>
+        <location filename="wob/MOCartOrder.cpp" line="37"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="114"/>
-        <source>new Profile</source>
+        <location filename="wob/MOCartOrder.cpp" line="29"/>
+        <location filename="wob/MOCartOrder.cpp" line="38"/>
+        <source>SaleOnly</source>
+        <oldsource>saleonly</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="116"/>
-        <source>save Profile</source>
+        <location filename="wob/MOCartOrder.cpp" line="30"/>
+        <location filename="wob/MOCartOrder.cpp" line="39"/>
+        <source>OrderOnly</source>
+        <oldsource>orderonly</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="119"/>
-        <source>Login</source>
+        <location filename="wob/MOCartOrder.cpp" line="31"/>
+        <location filename="wob/MOCartOrder.cpp" line="40"/>
+        <source>Invalid</source>
+        <oldsource>invalid</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="196"/>
-        <source>New Profile</source>
+        <location filename="wob/MOCartOrder.cpp" line="28"/>
+        <location filename="wob/MOCartOrder.cpp" line="37"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="196"/>
-        <source>Please enter a profile name. It must be non-empty and must not be used yet:</source>
+        <location filename="wob/MOCartOrder.cpp" line="29"/>
+        <location filename="wob/MOCartOrder.cpp" line="38"/>
+        <source>SaleOnly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="336"/>
-        <source>Warning</source>
+        <location filename="wob/MOCartOrder.cpp" line="30"/>
+        <location filename="wob/MOCartOrder.cpp" line="39"/>
+        <source>OrderOnly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
-        <source>New Host Name</source>
+        <location filename="wob/MOCartOrder.cpp" line="31"/>
+        <location filename="wob/MOCartOrder.cpp" line="40"/>
+        <source>Invalid</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOCartTicket</name>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
-        <source>Please enter a name for the new host:</source>
+        <location filename="wob/MOCartTicket.cpp" line="30"/>
+        <location filename="wob/MOCartTicket.cpp" line="40"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="265"/>
-        <source>The host name must only consist of letters, digits and underscore. It must start with a letter.</source>
+        <location filename="wob/MOCartTicket.cpp" line="31"/>
+        <location filename="wob/MOCartTicket.cpp" line="41"/>
+        <source>TooLate</source>
+        <oldsource>toolate</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="277"/>
-        <source>Export Key to File</source>
+        <location filename="wob/MOCartTicket.cpp" line="32"/>
+        <location filename="wob/MOCartTicket.cpp" line="42"/>
+        <source>Exhausted</source>
+        <oldsource>exhausted</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="286"/>
-        <source>Unable to open file %1 for writing: %2</source>
+        <location filename="wob/MOCartTicket.cpp" line="33"/>
+        <location filename="wob/MOCartTicket.cpp" line="43"/>
+        <source>SaleOnly</source>
+        <oldsource>saleonly</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="297"/>
-        <source>Importing a key overwrites the host key that is currently used by this program. This may disable your accounts. Do you still want to continue?</source>
+        <location filename="wob/MOCartTicket.cpp" line="34"/>
+        <location filename="wob/MOCartTicket.cpp" line="44"/>
+        <source>OrderOnly</source>
+        <oldsource>orderonly</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="300"/>
-        <source>Import Key from File</source>
+        <location filename="wob/MOCartTicket.cpp" line="30"/>
+        <location filename="wob/MOCartTicket.cpp" line="40"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="309"/>
-        <source>Unable to open file %1 for reading: %2</source>
+        <location filename="wob/MOCartTicket.cpp" line="31"/>
+        <location filename="wob/MOCartTicket.cpp" line="41"/>
+        <source>TooLate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="321"/>
-        <source>This is not a host key file.</source>
+        <location filename="wob/MOCartTicket.cpp" line="32"/>
+        <location filename="wob/MOCartTicket.cpp" line="42"/>
+        <source>Exhausted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="326"/>
-        <source>This host key file does not contain a valid host name.</source>
+        <location filename="wob/MOCartTicket.cpp" line="33"/>
+        <location filename="wob/MOCartTicket.cpp" line="43"/>
+        <source>SaleOnly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="331"/>
-        <source>This host key file does not contain a valid key.</source>
+        <location filename="wob/MOCartTicket.cpp" line="34"/>
+        <location filename="wob/MOCartTicket.cpp" line="44"/>
+        <source>OrderOnly</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOCartVoucher</name>
     <message>
-        <location filename="mainwindow.cpp" line="336"/>
-        <source>The key check sum did not match. Please get a clean copy of the host key file.</source>
+        <location filename="wob/MOCartVoucher.cpp" line="26"/>
+        <location filename="wob/MOCartVoucher.cpp" line="34"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="60"/>
-        <source>&amp;OpenOffice.org Settings...</source>
+        <location filename="wob/MOCartVoucher.cpp" line="27"/>
+        <location filename="wob/MOCartVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
+        <oldsource>invalidvalue</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="61"/>
-        <source>Set &amp;Default Label Font...</source>
+        <location filename="wob/MOCartVoucher.cpp" line="28"/>
+        <location filename="wob/MOCartVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
+        <oldsource>invalidprice</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="224"/>
-        <source>Unable to log in.</source>
+        <location filename="wob/MOCartVoucher.cpp" line="26"/>
+        <location filename="wob/MOCartVoucher.cpp" line="34"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="353"/>
-        <source>Chose Default Font</source>
+        <location filename="wob/MOCartVoucher.cpp" line="27"/>
+        <location filename="wob/MOCartVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="353"/>
-        <source>Please chose a default font:</source>
+        <location filename="wob/MOCartVoucher.cpp" line="28"/>
+        <location filename="wob/MOCartVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MMoneyLog</name>
+    <name>MOOrderAbstract</name>
     <message>
-        <location filename="moneylog.cpp" line="27"/>
-        <source>Money Log of %1 %2</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="43"/>
+        <source>Placed</source>
+        <oldsource>placed</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="moneylog.cpp" line="40"/>
-        <source>Close</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="44"/>
+        <source>Sent</source>
+        <oldsource>sent</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOAddress</name>
     <message>
-        <location filename="wob/MOAddress.cpp" line="108"/>
-        <source>Class MOAddress property addressid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="45"/>
+        <source>Sold</source>
+        <oldsource>sold</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOAddress.cpp" line="114"/>
-        <source>Class MOAddress property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
+        <oldsource>cancelled</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOArtist</name>
     <message>
-        <location filename="wob/MOArtist.cpp" line="60"/>
-        <source>Class MOArtist property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="47"/>
+        <source>Reserved</source>
+        <oldsource>reserved</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCartOrder</name>
     <message>
-        <location filename="wob/MOCartOrder.cpp" line="72"/>
-        <source>Class MOCartOrder property status is enum, invalid value was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="48"/>
+        <source>Closed</source>
+        <oldsource>closed</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartOrder.cpp" line="78"/>
-        <source>Class MOCartOrder property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="43"/>
+        <source>Placed</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCartTicket</name>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="79"/>
-        <source>Class MOCartTicket property eventid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="44"/>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="85"/>
-        <source>Class MOCartTicket property amount is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="45"/>
+        <source>Sold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="91"/>
-        <source>Class MOCartTicket property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="97"/>
-        <source>Class MOCartTicket property status is enum, invalid value was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="47"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartTicket.cpp" line="103"/>
-        <source>Class MOCartTicket property maxamount is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="48"/>
+        <source>Closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MOCartVoucher</name>
-    <message>
-        <location filename="wob/MOCartVoucher.cpp" line="65"/>
-        <source>Class MOCartVoucher property value is integer, but non-integer was found.</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>MOOrderInfoAbstract</name>
     <message>
-        <location filename="wob/MOCartVoucher.cpp" line="71"/>
-        <source>Class MOCartVoucher property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="43"/>
+        <source>Placed</source>
+        <oldsource>placed</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOCartVoucher.cpp" line="77"/>
-        <source>Class MOCartVoucher property status is enum, invalid value was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="44"/>
+        <source>Sent</source>
+        <oldsource>sent</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOContact</name>
     <message>
-        <location filename="wob/MOContact.cpp" line="61"/>
-        <source>Class MOContact property contactid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="45"/>
+        <source>Sold</source>
+        <oldsource>sold</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOContact.cpp" line="67"/>
-        <source>Class MOContact property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
+        <oldsource>cancelled</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOContact.cpp" line="73"/>
-        <source>Class MOContact property contacttypeid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="47"/>
+        <source>Reserved</source>
+        <oldsource>reserved</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOContactType</name>
     <message>
-        <location filename="wob/MOContactType.cpp" line="53"/>
-        <source>Class MOContactType property contacttypeid is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="48"/>
+        <source>Closed</source>
+        <oldsource>closed</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCustomer</name>
     <message>
-        <location filename="wob/MOCustomer.cpp" line="77"/>
-        <source>Class MOCustomer property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="32"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="43"/>
+        <source>Placed</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOCustomerShort</name>
     <message>
-        <location filename="wob/MOCustomerShort.cpp" line="46"/>
-        <source>Class MOCustomerShort property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="33"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="44"/>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOEvent</name>
     <message>
-        <location filename="wob/MOEvent.cpp" line="112"/>
-        <source>Class MOEvent property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="34"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="45"/>
+        <source>Sold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="118"/>
-        <source>Class MOEvent property start is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="35"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="46"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="124"/>
-        <source>Class MOEvent property end is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="36"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="47"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="130"/>
-        <source>Class MOEvent property capacity is integer, but non-integer was found.</source>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="37"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="48"/>
+        <source>Closed</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOTicketAbstract</name>
     <message>
-        <location filename="wob/MOEvent.cpp" line="161"/>
-        <source>Class MOEvent property amountSold is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="38"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="52"/>
+        <source>Reserved</source>
+        <oldsource>reserved</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="167"/>
-        <source>Class MOEvent property amountReserved is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="39"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="53"/>
+        <source>Ordered</source>
+        <oldsource>ordered</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOEvent.cpp" line="177"/>
-        <source>Class MOEvent property tax is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="40"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="54"/>
+        <source>Used</source>
+        <oldsource>used</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOOrder</name>
     <message>
-        <location filename="wob/MOOrder.cpp" line="111"/>
-        <source>Class MOOrder property orderid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="41"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="55"/>
+        <source>Cancelled</source>
+        <oldsource>cancelled</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="117"/>
-        <source>Class MOOrder property customerid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="42"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="56"/>
+        <source>Refund</source>
+        <oldsource>refund</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="138"/>
-        <source>Class MOOrder property amountpaid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="43"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="57"/>
+        <source>MaskBlock</source>
+        <oldsource>maskblock</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="144"/>
-        <source>Class MOOrder property state is enum, invalid value was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="44"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="58"/>
+        <source>MaskPay</source>
+        <oldsource>maskpay</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="150"/>
-        <source>Class MOOrder property amountdue is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="45"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="59"/>
+        <source>MaskUsable</source>
+        <oldsource>maskusable</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="156"/>
-        <source>Class MOOrder property totalprice is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="46"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="60"/>
+        <source>MaskReturnable</source>
+        <oldsource>maskreturnable</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="162"/>
-        <source>Class MOOrder property ordertime is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="38"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="52"/>
+        <source>Reserved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOOrder.cpp" line="168"/>
-        <source>Class MOOrder property senttime is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="39"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="53"/>
+        <source>Ordered</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOPrice</name>
     <message>
-        <location filename="wob/MOPrice.cpp" line="61"/>
-        <source>Class MOPrice property eventid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="40"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="54"/>
+        <source>Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOPrice.cpp" line="67"/>
-        <source>Class MOPrice property pricecategoryid is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="41"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="55"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOPrice.cpp" line="73"/>
-        <source>Class MOPrice property maxavailable is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="42"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="56"/>
+        <source>Refund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOPrice.cpp" line="79"/>
-        <source>Class MOPrice property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="43"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="57"/>
+        <source>MaskBlock</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MORoom</name>
     <message>
-        <location filename="wob/MORoom.cpp" line="57"/>
-        <source>Class MORoom property capacity is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="44"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="58"/>
+        <source>MaskPay</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOShipping</name>
     <message>
-        <location filename="wob/MOShipping.cpp" line="61"/>
-        <source>Class MOShipping property id is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="45"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="59"/>
+        <source>MaskUsable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOShipping.cpp" line="67"/>
-        <source>Class MOShipping property cost is integer, but non-integer was found.</source>
+        <location filename="wob/MOTicketAbstract.cpp" line="46"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="60"/>
+        <source>MaskReturnable</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MOTicket</name>
-    <message>
-        <location filename="wob/MOTicket.cpp" line="90"/>
-        <source>Class MOTicket property eventid is integer, but non-integer was found.</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>MOVoucher</name>
     <message>
-        <location filename="wob/MOTicket.cpp" line="96"/>
-        <source>Class MOTicket property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="26"/>
+        <location filename="wob/MOVoucher.cpp" line="34"/>
+        <source>Ok</source>
+        <oldsource>ok</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOTicket.cpp" line="102"/>
-        <source>Class MOTicket property status is enum, invalid value was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="27"/>
+        <location filename="wob/MOVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
+        <oldsource>invalidvalue</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOTicket.cpp" line="108"/>
-        <source>Class MOTicket property orderid is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="28"/>
+        <location filename="wob/MOVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
+        <oldsource>invalidprice</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MOVoucher</name>
     <message>
-        <location filename="wob/MOVoucher.cpp" line="78"/>
-        <source>Class MOVoucher property value is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="26"/>
+        <location filename="wob/MOVoucher.cpp" line="34"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOVoucher.cpp" line="84"/>
-        <source>Class MOVoucher property price is integer, but non-integer was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="27"/>
+        <location filename="wob/MOVoucher.cpp" line="35"/>
+        <source>InvalidValue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="wob/MOVoucher.cpp" line="90"/>
-        <source>Class MOVoucher property status is enum, invalid value was found.</source>
+        <location filename="wob/MOVoucher.cpp" line="28"/>
+        <location filename="wob/MOVoucher.cpp" line="36"/>
+        <source>InvalidPrice</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MOfficeConfig</name>
     <message>
-        <location filename="office.cpp" line="102"/>
+        <location filename="templates/office.cpp" line="102"/>
         <source>Configure OpenOffice.org Access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="112"/>
+        <location filename="templates/office.cpp" line="112"/>
         <source>OpenOffice.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="114"/>
+        <location filename="templates/office.cpp" line="114"/>
         <source>Path to Executable:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="116"/>
+        <location filename="templates/office.cpp" line="116"/>
         <source>...</source>
         <comment>select OpenOffice path button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="119"/>
+        <location filename="templates/office.cpp" line="119"/>
         <source>Printing ODF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="122"/>
+        <location filename="templates/office.cpp" line="122"/>
         <source>Printer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="125"/>
+        <location filename="templates/office.cpp" line="125"/>
         <source>(Default Printer)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="135"/>
+        <location filename="templates/office.cpp" line="135"/>
         <source>Always confirm printer when printing ODF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="137"/>
+        <location filename="templates/office.cpp" line="137"/>
         <source>Save printed files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="140"/>
+        <location filename="templates/office.cpp" line="140"/>
         <source>Opening ODF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="142"/>
+        <location filename="templates/office.cpp" line="142"/>
         <source>Always open as Read-Only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="144"/>
+        <location filename="templates/office.cpp" line="144"/>
         <source>Automatically open all newly created files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="150"/>
+        <location filename="templates/office.cpp" line="150"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="153"/>
+        <location filename="templates/office.cpp" line="153"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="173"/>
+        <location filename="templates/office.cpp" line="173"/>
         <source>Select OpenOffice.org executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1132,13 +1835,15 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrder</name>
     <message>
-        <location filename="order.cpp" line="181"/>
+        <location filename="iface/order.cpp" line="159"/>
+        <location filename="iface/order.cpp" line="181"/>
         <source>yyyy-MM-dd hh:mm ap</source>
         <comment>date/time format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="order.cpp" line="192"/>
+        <location filename="iface/order.cpp" line="170"/>
+        <location filename="iface/order.cpp" line="192"/>
         <source>yyyy-MM-dd</source>
         <comment>date format</comment>
         <translation type="unfinished"></translation>
@@ -1147,17 +1852,17 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrderItemView</name>
     <message>
-        <location filename="orderwin.cpp" line="988"/>
+        <location filename="dialogs/orderwin.cpp" line="978"/>
         <source>Preview Tickets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="996"/>
+        <location filename="dialogs/orderwin.cpp" line="986"/>
         <source>Ticket: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="998"/>
+        <location filename="dialogs/orderwin.cpp" line="988"/>
         <source>Voucher: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1165,672 +1870,470 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MOrderWindow</name>
     <message>
-        <location filename="orderwin.cpp" line="52"/>
+        <location filename="dialogs/orderwin.cpp" line="52"/>
         <source>Order Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="57"/>
+        <location filename="dialogs/orderwin.cpp" line="57"/>
         <source>&amp;Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="58"/>
+        <location filename="dialogs/orderwin.cpp" line="58"/>
         <source>&amp;Order...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="61"/>
-        <source>&amp;Sell...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="66"/>
-        <source>&amp;Prune and recheck...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="69"/>
+        <location filename="dialogs/orderwin.cpp" line="60"/>
         <source>C&amp;ancel Order...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="72"/>
+        <location filename="dialogs/orderwin.cpp" line="62"/>
         <source>&amp;Mark Order as Shipped...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="79"/>
+        <location filename="dialogs/orderwin.cpp" line="69"/>
         <source>Change Commen&amp;t...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="89"/>
+        <location filename="dialogs/orderwin.cpp" line="79"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="91"/>
+        <location filename="dialogs/orderwin.cpp" line="81"/>
         <source>&amp;Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="93"/>
+        <location filename="dialogs/orderwin.cpp" line="83"/>
         <source>Receive &amp;Payment...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="95"/>
+        <location filename="dialogs/orderwin.cpp" line="85"/>
         <source>&amp;Refund...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="100"/>
+        <location filename="dialogs/orderwin.cpp" line="90"/>
         <source>P&amp;rinting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="102"/>
+        <location filename="dialogs/orderwin.cpp" line="92"/>
         <source>Print &amp;Bill...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="103"/>
+        <location filename="dialogs/orderwin.cpp" line="93"/>
         <source>Save Bill &amp;as file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="105"/>
+        <location filename="dialogs/orderwin.cpp" line="95"/>
         <source>Print &amp;Tickets...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="119"/>
+        <location filename="dialogs/orderwin.cpp" line="109"/>
         <source>Order ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="121"/>
+        <location filename="dialogs/orderwin.cpp" line="111"/>
         <source>Order Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="123"/>
+        <location filename="dialogs/orderwin.cpp" line="113"/>
         <source>Shipping Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="125"/>
+        <location filename="dialogs/orderwin.cpp" line="115"/>
         <source>Customer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="127"/>
+        <location filename="dialogs/orderwin.cpp" line="117"/>
         <source>Delivery Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="130"/>
+        <location filename="dialogs/orderwin.cpp" line="120"/>
         <source>Sold by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="132"/>
+        <location filename="dialogs/orderwin.cpp" line="122"/>
         <source>Total Price:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="134"/>
+        <location filename="dialogs/orderwin.cpp" line="124"/>
         <source>Already Paid:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="136"/>
+        <location filename="dialogs/orderwin.cpp" line="126"/>
         <source>Order State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="143"/>
+        <location filename="dialogs/orderwin.cpp" line="133"/>
         <source>Order Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="979"/>
+        <location filename="dialogs/orderwin.cpp" line="969"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="64"/>
-        <source>Ma&amp;ke Reservation...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="orderwin.cpp" line="75"/>
+        <location filename="dialogs/orderwin.cpp" line="65"/>
         <source>Ch&amp;ange Item-Price...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="77"/>
+        <location filename="dialogs/orderwin.cpp" line="67"/>
         <source>&amp;Return Item...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="81"/>
+        <location filename="dialogs/orderwin.cpp" line="71"/>
         <source>Change Sh&amp;ipping Method...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="106"/>
+        <location filename="dialogs/orderwin.cpp" line="96"/>
         <source>Print V&amp;ouchers...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="107"/>
+        <location filename="dialogs/orderwin.cpp" line="97"/>
         <source>Print &amp;Current Item...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="108"/>
+        <location filename="dialogs/orderwin.cpp" line="98"/>
         <source>&amp;View Items...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="138"/>
+        <location filename="dialogs/orderwin.cpp" line="128"/>
         <source>Shipping Method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="141"/>
+        <location filename="dialogs/orderwin.cpp" line="131"/>
         <source>Shipping Costs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="84"/>
+        <location filename="dialogs/orderwin.cpp" line="74"/>
         <source>MoneyLog for Order...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="86"/>
+        <location filename="dialogs/orderwin.cpp" line="76"/>
         <source>MoneyLog for selected Voucher...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="979"/>
+        <location filename="dialogs/orderwin.cpp" line="969"/>
         <source>This is not a voucher, cannot show the money log.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="97"/>
+        <location filename="dialogs/orderwin.cpp" line="87"/>
         <source>Pay with &amp;Voucher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MOverview</name>
-    <message>
-        <location filename="overview.cpp" line="86"/>
-        <source>&amp;Session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="87"/>
-        <source>&amp;Re-Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="88"/>
-        <source>Change my &amp;Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="94"/>
-        <source>&amp;Close Session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="96"/>
-        <source>&amp;Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="97"/>
-        <source>&amp;Update Event List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="99"/>
-        <source>&amp;Show/Edit details...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="101"/>
-        <source>&amp;New Event...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="103"/>
-        <source>Show &amp;old Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="108"/>
-        <source>&amp;Customer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="109"/>
-        <source>&amp;Show all customers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="111"/>
-        <source>C&amp;art</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="112"/>
-        <source>Add &amp;Ticket</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="113"/>
-        <source>Add &amp;Voucher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="114"/>
-        <source>&amp;Remove Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="115"/>
-        <source>&amp;Abort Shopping</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="119"/>
-        <source>&amp;Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="130"/>
-        <source>C&amp;onfigure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="131"/>
-        <source>&amp;Auto-Refresh settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="134"/>
-        <source>&amp;Admin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="137"/>
-        <source>&amp;Backup now...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="147"/>
-        <source>Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="157"/>
-        <source>New Event...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="249"/>
-        <source>Details...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="164"/>
-        <source>Order Ticket...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="168"/>
-        <source>Event Summary...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="172"/>
-        <source>Cancel Event...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="178"/>
-        <source>Shopping Cart</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="190"/>
-        <source>Add Ticket</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="192"/>
-        <source>Add Voucher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="194"/>
-        <source>Remove Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="200"/>
-        <source>Customer:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="209"/>
-        <source>Delivery Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="212"/>
-        <source>Comments:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="219"/>
-        <source>Check Order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="222"/>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="226"/>
-        <source>Order List</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>MOrdersTab</name>
     <message>
-        <location filename="overview.cpp" line="230"/>
+        <location filename="mwin/orderstab.cpp" line="53"/>
         <source>-select mode-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="231"/>
+        <location filename="mwin/orderstab.cpp" line="54"/>
         <source>All Orders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="232"/>
+        <location filename="mwin/orderstab.cpp" line="55"/>
         <source>Open Orders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="234"/>
+        <location filename="mwin/orderstab.cpp" line="56"/>
+        <source>Open Reservations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/orderstab.cpp" line="57"/>
         <source>Outstanding Payments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="235"/>
+        <location filename="mwin/orderstab.cpp" line="58"/>
         <source>Outstanding Refunds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="236"/>
+        <location filename="mwin/orderstab.cpp" line="59"/>
         <source>Undelivered Orders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="238"/>
+        <location filename="mwin/orderstab.cpp" line="61"/>
         <source>-search result-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="246"/>
+        <location filename="mwin/orderstab.cpp" line="69"/>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="253"/>
-        <source>Find by Ticket...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="256"/>
-        <source>Find by Event...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="259"/>
-        <source>Find by Customer...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="268"/>
-        <source>Entrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="284"/>
-        <source>Users</source>
+        <location filename="mwin/orderstab.cpp" line="72"/>
+        <source>Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="292"/>
-        <source>New User...</source>
+        <location filename="mwin/orderstab.cpp" line="76"/>
+        <source>Find by Ticket...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="295"/>
-        <source>Delete User...</source>
+        <location filename="mwin/orderstab.cpp" line="79"/>
+        <source>Find by Event...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="299"/>
-        <source>Description...</source>
+        <location filename="mwin/orderstab.cpp" line="82"/>
+        <source>Find by Customer...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="302"/>
-        <source>Hosts...</source>
+        <location filename="mwin/orderstab.cpp" line="85"/>
+        <source>Find by Order ID...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="305"/>
-        <source>Roles...</source>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="308"/>
-        <source>Set Password...</source>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="314"/>
-        <source>Hosts</source>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Paid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="322"/>
-        <source>New Host...</source>
+        <location filename="mwin/orderstab.cpp" line="126"/>
+        <source>Customer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="325"/>
-        <source>Add This Host...</source>
+        <location filename="mwin/orderstab.cpp" line="157"/>
+        <location filename="mwin/orderstab.cpp" line="181"/>
+        <location filename="mwin/orderstab.cpp" line="198"/>
+        <location filename="mwin/orderstab.cpp" line="202"/>
+        <location filename="mwin/orderstab.cpp" line="251"/>
+        <location filename="mwin/orderstab.cpp" line="279"/>
+        <location filename="mwin/orderstab.cpp" line="300"/>
+        <location filename="mwin/orderstab.cpp" line="304"/>
+        <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="328"/>
-        <source>Delete Host...</source>
+        <location filename="mwin/orderstab.cpp" line="157"/>
+        <location filename="mwin/orderstab.cpp" line="251"/>
+        <source>There was a problem retrieving the order list: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="332"/>
-        <source>Generate New Key...</source>
+        <location filename="mwin/orderstab.cpp" line="181"/>
+        <location filename="mwin/orderstab.cpp" line="300"/>
+        <source>Error while retrieving order: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="335"/>
-        <source>Import...</source>
+        <location filename="mwin/orderstab.cpp" line="193"/>
+        <source>Enter Ticket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="338"/>
-        <source>Export...</source>
+        <location filename="mwin/orderstab.cpp" line="193"/>
+        <source>Please enter the ID of one of the tickets of the order you seek:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="804"/>
-        <source>Start Time</source>
+        <location filename="mwin/orderstab.cpp" line="198"/>
+        <source>Error while searching for order: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="804"/>
-        <source>Title</source>
+        <location filename="mwin/orderstab.cpp" line="202"/>
+        <source>Order for barcode &apos;%1&apos; not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
-        <source>Capacity</source>
+        <location filename="mwin/orderstab.cpp" line="215"/>
+        <source>Select Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
-        <source>Sold</source>
+        <location filename="mwin/orderstab.cpp" line="228"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
-        <source>Reserved</source>
+        <location filename="mwin/orderstab.cpp" line="230"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="392"/>
-        <source>Free</source>
+        <location filename="mwin/orderstab.cpp" line="279"/>
+        <source>Error while retrieving order list: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="399"/>
-        <source>ddd MMMM d yyyy, h:mm ap</source>
-        <comment>time format</comment>
+        <location filename="mwin/orderstab.cpp" line="295"/>
+        <source>Enter Order ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1578"/>
-        <source>Warning</source>
+        <location filename="mwin/orderstab.cpp" line="295"/>
+        <source>Please enter the ID of the order you want to display:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="478"/>
-        <source>Cancel Event</source>
+        <location filename="mwin/orderstab.cpp" line="304"/>
+        <source>This order does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MOverview</name>
     <message>
-        <location filename="overview.cpp" line="478"/>
-        <source>Please enter a reason to cancel event &quot;%1&quot; or abort:</source>
+        <location filename="mwin/overview.cpp" line="67"/>
+        <source>&amp;Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="482"/>
-        <source>Event Cancelled</source>
+        <location filename="mwin/overview.cpp" line="68"/>
+        <source>&amp;Re-Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="482"/>
-        <source>The event &quot;%1&quot; has been cancelled. Please inform everybody who bought a ticket.</source>
+        <location filename="mwin/overview.cpp" line="69"/>
+        <source>Change my &amp;Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="506"/>
-        <source>Login Name</source>
+        <location filename="mwin/overview.cpp" line="75"/>
+        <source>&amp;Close Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="506"/>
-        <source>Description</source>
+        <location filename="mwin/overview.cpp" line="113"/>
+        <source>&amp;Customer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="520"/>
-        <source>New User</source>
+        <location filename="mwin/overview.cpp" line="114"/>
+        <source>&amp;Show all customers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="520"/>
-        <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
+        <location filename="mwin/overview.cpp" line="116"/>
+        <source>&amp;Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="971"/>
-        <source>Error</source>
+        <location filename="mwin/overview.cpp" line="127"/>
+        <source>C&amp;onfigure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="525"/>
-        <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
+        <location filename="mwin/overview.cpp" line="128"/>
+        <source>&amp;Auto-Refresh settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="529"/>
-        <source>Password</source>
+        <location filename="mwin/overview.cpp" line="130"/>
+        <source>&amp;Display settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="529"/>
-        <source>Please enter an initial password for the user:</source>
+        <location filename="mwin/overview.cpp" line="132"/>
+        <source>&amp;Admin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="544"/>
-        <source>Delete User?</source>
+        <location filename="mwin/overview.cpp" line="135"/>
+        <source>&amp;Backup now...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="544"/>
-        <source>Really delete user &apos;%1&apos;?</source>
+        <location filename="mwin/overview.cpp" line="86"/>
+        <source>Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="548"/>
-        <source>(Nobody)</source>
-        <comment>this is a username for no user, the string must contain &apos;(&apos; to distinguish it from the others</comment>
+        <location filename="mwin/overview.cpp" line="90"/>
+        <source>Shopping Cart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="551"/>
-        <source>Delete User</source>
+        <location filename="mwin/overview.cpp" line="100"/>
+        <source>Order List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="551"/>
-        <source>Select which user will inherit this users database objects:</source>
+        <location filename="mwin/overview.cpp" line="104"/>
+        <source>Entrance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="556"/>
-        <source>Cannot delete user: %1</source>
+        <location filename="mwin/overview.cpp" line="107"/>
+        <source>Users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="570"/>
-        <source>Edit Description</source>
+        <location filename="mwin/overview.cpp" line="110"/>
+        <source>Hosts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="570"/>
-        <source>Descriptionof user %1:</source>
+        <location filename="mwin/overview.cpp" line="186"/>
+        <location filename="mwin/overview.cpp" line="196"/>
+        <location filename="mwin/overview.cpp" line="489"/>
+        <location filename="mwin/overview.cpp" line="493"/>
+        <location filename="mwin/overview.cpp" line="514"/>
+        <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="613"/>
+        <location filename="mwin/overview.cpp" line="196"/>
         <source>Error setting password: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="645"/>
         <source>The key of this new host could only be generated with %n bits entropy. Store anyway?</source>
         <translation type="obsolete">
             <numerusform>The key of this new host could only be generated with %n bit of entropy. Store anyway?</numerusform>
@@ -1838,7 +2341,6 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="overview.cpp" line="687"/>
         <source>The new key of this host could only be generated with %n bits entropy. Store anyway?</source>
         <translation type="obsolete">
             <numerusform>The key of this new host could only be generated with %n bit of entropy. Store anyway?</numerusform>
@@ -1846,217 +2348,171 @@ At least %1 Bits of random are required.</source>
         </translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="804"/>
-        <source>Amount</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="835"/>
-        <source>Select Event to order Ticket</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="848"/>
-        <source>Select</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="851"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="967"/>
-        <source>There is nothing in the order. Ignoring it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="971"/>
-        <source>Please chose a customer first!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="1448"/>
+        <location filename="mwin/overview.cpp" line="343"/>
         <source>Refresh Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1453"/>
+        <location filename="mwin/overview.cpp" line="348"/>
         <source>Refresh Rate (minutes):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1459"/>
+        <location filename="mwin/overview.cpp" line="354"/>
         <source>refresh &amp;event list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1461"/>
+        <location filename="mwin/overview.cpp" line="356"/>
         <source>refresh &amp;user list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1463"/>
+        <location filename="mwin/overview.cpp" line="358"/>
         <source>refresh &amp;host list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1523"/>
+        <location filename="mwin/overview.cpp" line="367"/>
+        <location filename="mwin/overview.cpp" line="418"/>
+        <location filename="mwin/overview.cpp" line="462"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1525"/>
+        <location filename="mwin/overview.cpp" line="369"/>
+        <location filename="mwin/overview.cpp" line="420"/>
+        <location filename="mwin/overview.cpp" line="464"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="91"/>
+        <location filename="mwin/overview.cpp" line="72"/>
         <source>&amp;Edit Templates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="92"/>
+        <location filename="mwin/overview.cpp" line="73"/>
         <source>&amp;Update Templates Now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="117"/>
-        <source>&amp;Update Shipping Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="120"/>
+        <location filename="mwin/overview.cpp" line="117"/>
         <source>Return &amp;ticket...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="121"/>
+        <location filename="mwin/overview.cpp" line="118"/>
         <source>Return &amp;voucher...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="123"/>
+        <location filename="mwin/overview.cpp" line="120"/>
         <source>Edit &amp;Shipping Options...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="206"/>
-        <source>Shipping Method:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="233"/>
-        <source>Open Reservations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="491"/>
-        <source>(No Shipping)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="1465"/>
+        <location filename="mwin/overview.cpp" line="360"/>
         <source>refresh &amp;shipping list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="262"/>
-        <source>Find by Order ID...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="125"/>
+        <location filename="mwin/overview.cpp" line="122"/>
         <source>&amp;Deduct from voucher...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="127"/>
+        <location filename="mwin/overview.cpp" line="124"/>
         <source>&amp;Money Log for voucher...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="128"/>
+        <location filename="mwin/overview.cpp" line="125"/>
         <source>Money Log for &amp;user...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="132"/>
+        <location filename="mwin/overview.cpp" line="129"/>
         <source>&amp;Server Access settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="135"/>
+        <location filename="mwin/overview.cpp" line="133"/>
         <source>Backup &amp;Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="273"/>
-        <source>Enter or scan Ticket-ID:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="1499"/>
+        <location filename="mwin/overview.cpp" line="394"/>
         <source>Server Access Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1503"/>
+        <location filename="mwin/overview.cpp" line="398"/>
         <source>Request Timeout (seconds):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1509"/>
+        <location filename="mwin/overview.cpp" line="404"/>
         <source>Log Level:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1511"/>
+        <location filename="mwin/overview.cpp" line="406"/>
         <source>Minimal Logging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1512"/>
+        <location filename="mwin/overview.cpp" line="407"/>
         <source>Log Details on Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1513"/>
+        <location filename="mwin/overview.cpp" line="408"/>
         <source>Always Log Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1574"/>
+        <location filename="mwin/overview.cpp" line="443"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="448"/>
+        <source>Maximum event age (days, 0=show all):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="453"/>
+        <source>Maximum order list age (days, 0=show all):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/overview.cpp" line="510"/>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1574"/>
+        <location filename="mwin/overview.cpp" line="510"/>
         <source>The backup was successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1578"/>
+        <location filename="mwin/overview.cpp" line="514"/>
         <source>Cannot create backup file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="430"/>
+        <location filename="mwin/overview.cpp" line="186"/>
         <source>I was unable to renew the login at the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="484"/>
-        <source>Unable to cancel event &quot;%1&quot;: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="overview.cpp" line="1553"/>
+        <location filename="mwin/overview.cpp" line="489"/>
         <source>Backup failed with error (%2): %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1557"/>
+        <location filename="mwin/overview.cpp" line="493"/>
         <source>Backup returned empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2064,37 +2520,37 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MPasswordChange</name>
     <message>
-        <location filename="overview.cpp" line="1679"/>
+        <location filename="dialogs/passwdchg.cpp" line="26"/>
         <source>Change my password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1681"/>
+        <location filename="dialogs/passwdchg.cpp" line="28"/>
         <source>Reset password of user &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1685"/>
+        <location filename="dialogs/passwdchg.cpp" line="32"/>
         <source>Old Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1689"/>
+        <location filename="dialogs/passwdchg.cpp" line="36"/>
         <source>New Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1692"/>
+        <location filename="dialogs/passwdchg.cpp" line="39"/>
         <source>Repeat Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1700"/>
+        <location filename="dialogs/passwdchg.cpp" line="47"/>
         <source>Set Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="1702"/>
+        <location filename="dialogs/passwdchg.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2102,70 +2558,83 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MSInterface</name>
     <message>
-        <location filename="msinterface.cpp" line="35"/>
+        <location filename="iface/msinterface.cpp" line="58"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="35"/>
+        <location filename="iface/msinterface.cpp" line="58"/>
         <source>Login failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="76"/>
+        <location filename="iface/msinterface.cpp" line="85"/>
+        <location filename="iface/msinterface.cpp" line="89"/>
+        <location filename="iface/msinterface.cpp" line="94"/>
+        <location filename="iface/msinterface.cpp" line="99"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="62"/>
+        <location filename="iface/msinterface.cpp" line="85"/>
         <source>Communication problem while talking to the server, see log for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="66"/>
+        <location filename="iface/msinterface.cpp" line="89"/>
         <source>Communication with server was not successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="71"/>
+        <location filename="iface/msinterface.cpp" line="94"/>
         <source>The server implementation is too old for this client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="msinterface.cpp" line="76"/>
+        <location filename="iface/msinterface.cpp" line="99"/>
         <source>This client is too old for the server, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="iface/msinterface.cpp" line="191"/>
+        <source>Connection Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="iface/msinterface.cpp" line="191"/>
+        <source>There were problems while authenticating the server. Aborting. Check your configuration.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MShippingChange</name>
     <message>
-        <location filename="orderwin.cpp" line="1043"/>
+        <location filename="dialogs/orderwin.cpp" line="1033"/>
         <source>Change Shipping Method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1051"/>
+        <location filename="dialogs/orderwin.cpp" line="1041"/>
         <source>Method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1053"/>
+        <location filename="dialogs/orderwin.cpp" line="1043"/>
         <source>Price:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1061"/>
+        <location filename="dialogs/orderwin.cpp" line="1051"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1063"/>
+        <location filename="dialogs/orderwin.cpp" line="1053"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="orderwin.cpp" line="1070"/>
+        <location filename="dialogs/orderwin.cpp" line="1060"/>
         <source>(None)</source>
         <comment>shipping method</comment>
         <translation type="unfinished"></translation>
@@ -2174,101 +2643,91 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MShippingEditor</name>
     <message>
-        <location filename="shipping.cpp" line="37"/>
+        <location filename="dialogs/shipping.cpp" line="37"/>
         <source>Edit Shipping Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="49"/>
+        <location filename="dialogs/shipping.cpp" line="49"/>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="51"/>
+        <location filename="dialogs/shipping.cpp" line="51"/>
         <source>Change Price</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="53"/>
+        <location filename="dialogs/shipping.cpp" line="53"/>
         <source>Change Availability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="56"/>
+        <location filename="dialogs/shipping.cpp" line="56"/>
         <source>Add Option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="58"/>
+        <location filename="dialogs/shipping.cpp" line="58"/>
         <source>Delete Option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="65"/>
+        <location filename="dialogs/shipping.cpp" line="65"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="67"/>
+        <location filename="dialogs/shipping.cpp" line="67"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Price</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Web</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="shipping.cpp" line="75"/>
+        <location filename="dialogs/shipping.cpp" line="75"/>
         <source>Any User</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="shipping.cpp" line="81"/>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="shipping.cpp" line="81"/>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MTemplateChoice</name>
     <message>
-        <location filename="templatedlg.cpp" line="29"/>
+        <location filename="templates/templatedlg.cpp" line="29"/>
         <source>Chose Template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="32"/>
+        <location filename="templates/templatedlg.cpp" line="32"/>
         <source>Please chose a variant of template %1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="41"/>
+        <location filename="templates/templatedlg.cpp" line="41"/>
         <source>(default)</source>
         <comment>default template pseudo-variant</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="50"/>
+        <location filename="templates/templatedlg.cpp" line="50"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2276,532 +2735,682 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MTemplateEditor</name>
     <message>
-        <location filename="templatedlg.cpp" line="72"/>
+        <location filename="templates/templatedlg.cpp" line="72"/>
         <source>Edit Template Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="84"/>
+        <location filename="templates/templatedlg.cpp" line="84"/>
         <source>Update Now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="86"/>
+        <location filename="templates/templatedlg.cpp" line="86"/>
         <source>Add Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="88"/>
+        <location filename="templates/templatedlg.cpp" line="88"/>
         <source>Delete Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="95"/>
+        <location filename="templates/templatedlg.cpp" line="95"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
+        <location filename="templates/templatedlg.cpp" line="110"/>
         <source>Template/Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
+        <location filename="templates/templatedlg.cpp" line="110"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="110"/>
+        <location filename="templates/templatedlg.cpp" line="110"/>
         <source>Checksum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="221"/>
+        <location filename="templates/templatedlg.cpp" line="167"/>
+        <location filename="templates/templatedlg.cpp" line="185"/>
+        <location filename="templates/templatedlg.cpp" line="204"/>
+        <location filename="templates/templatedlg.cpp" line="221"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="167"/>
+        <location filename="templates/templatedlg.cpp" line="167"/>
         <source>Unable to delete this template.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="180"/>
+        <location filename="templates/templatedlg.cpp" line="180"/>
         <source>Select Template File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="185"/>
+        <location filename="templates/templatedlg.cpp" line="185"/>
         <source>Files with this extension (%1) are not legal for this template.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="204"/>
+        <location filename="templates/templatedlg.cpp" line="204"/>
         <source>Unable to upload file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="templatedlg.cpp" line="221"/>
+        <location filename="templates/templatedlg.cpp" line="221"/>
         <source>Unable to send new description to server.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MTemplateStore</name>
-</context>
-<context>
     <name>MTicket</name>
     <message>
-        <location filename="order.cpp" line="330"/>
+        <location filename="iface/order.cpp" line="330"/>
         <source>.</source>
         <comment>decimal dot</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MUser</name>
+    <name>MUserTab</name>
     <message>
-        <location filename="user.cpp" line="58"/>
-        <source>User not valid: cannot delete.</source>
+        <location filename="mwin/acltabs.cpp" line="43"/>
+        <source>New User...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="46"/>
+        <source>Delete User...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="50"/>
+        <source>Description...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="53"/>
+        <source>Hosts...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="56"/>
+        <source>Roles...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="59"/>
+        <source>Set Password...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="80"/>
+        <source>Login Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="80"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="94"/>
+        <source>New User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="94"/>
+        <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="99"/>
+        <location filename="mwin/acltabs.cpp" line="130"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="99"/>
+        <source>The user name must contain only letters, digits, dots and underscores and must be at least one character long!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="103"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="103"/>
+        <source>Please enter an initial password for the user:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="118"/>
+        <source>Delete User?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="118"/>
+        <source>Really delete user &apos;%1&apos;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="122"/>
+        <source>(Nobody)</source>
+        <comment>this is a username for no user, the string must contain &apos;(&apos; to distinguish it from the others</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="125"/>
+        <source>Delete User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="125"/>
+        <source>Select which user will inherit this users database objects:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="130"/>
+        <source>Cannot delete user: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="144"/>
+        <source>Edit Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="144"/>
+        <source>Description of user %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="161"/>
+        <location filename="mwin/acltabs.cpp" line="166"/>
+        <location filename="mwin/acltabs.cpp" line="209"/>
+        <location filename="mwin/acltabs.cpp" line="215"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="161"/>
+        <source>Cannot retrieve user roles: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="166"/>
+        <source>Cannot retrieve role descriptions: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="209"/>
+        <source>The password must be non-empty and both lines must match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mwin/acltabs.cpp" line="215"/>
+        <source>Error while setting password: %1</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MVoucher</name>
-</context>
-<context>
-    <name>MWebRequest</name>
-</context>
-<context>
-    <name>Order</name>
-</context>
-<context>
-    <name>Session</name>
 </context>
 <context>
     <name>SpecialHost</name>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="41"/>
         <source>_any</source>
         <translation type="obsolete">any host (even unregistered ones)</translation>
     </message>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="42"/>
         <source>_anon</source>
         <translation type="obsolete">any registered host</translation>
     </message>
     <message>
-        <location filename="../www/inc/db/db_scheme.php" line="43"/>
         <source>_online</source>
         <translation type="obsolete">web system</translation>
     </message>
 </context>
 <context>
-    <name>Ticket</name>
-</context>
-<context>
     <name>TransactionNames::</name>
     <message>
-        <location filename="../www/machine.php" line="19"/>
         <source>serverinfo</source>
         <translation type="obsolete">basic server information (implicitly granted)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>startsession</source>
         <translation type="obsolete">start a session (implicitly granted)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>sessionauth</source>
         <translation type="obsolete">authenticate to the server (implicitly granted)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="21"/>
         <source>closesession</source>
         <translation type="obsolete">end my own session</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="25"/>
         <source>getmyroles</source>
         <translation type="obsolete">retrieve the roles/privileges I have</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getusers</source>
         <translation type="obsolete">get a list of all (system) users existing at the system</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>setuserdescription</source>
         <translation type="obsolete">get description of a user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getuseracl</source>
         <translation type="obsolete">get the roles/privileges of any user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>setuseracl</source>
         <translation type="obsolete">set the roles/privileges of any user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="29"/>
         <source>getuserhosts</source>
         <translation type="obsolete">get the hosts a user may connect from</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setuserhosts</source>
         <translation type="obsolete">set the hosts a user may connect from</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>adduser</source>
         <translation type="obsolete">add a new user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>deleteuser</source>
         <translation type="obsolete">delete a user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setmypasswd</source>
         <translation type="obsolete">set my own password</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="30"/>
         <source>setpasswd</source>
         <translation type="obsolete">set the password of any user</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>gethosts</source>
         <translation type="obsolete">get all hosts that are known to the system</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>sethost</source>
         <translation type="obsolete">change a host</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>addhost</source>
         <translation type="obsolete">add a new host to the system</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="32"/>
         <source>deletehost</source>
         <translation type="obsolete">delete a host</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>geteventlist</source>
         <translation type="obsolete">get a list of events (overview)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>geteventdata</source>
         <translation type="obsolete">get detailed event data</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>seteventdata</source>
         <translation type="obsolete">change/create an event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>eventsummary</source>
         <translation type="obsolete">get summary data for a specific event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="34"/>
         <source>cancelevent</source>
         <translation type="obsolete">cancel an event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
         <source>getroomdata</source>
         <translation type="obsolete">get detailed data about a room</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="36"/>
         <source>setroomdata</source>
         <translation type="obsolete">change/create a room</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>getcustomerlist</source>
         <translation type="obsolete">get a list of customers</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>getcustomer</source>
         <translation type="obsolete">get detailed information about a customer</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>setcustomer</source>
         <translation type="obsolete">change/create a customer</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="38"/>
         <source>deletecustomer</source>
         <translation type="obsolete">delete a customer</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>checkorder</source>
         <translation type="obsolete">check whether an order would succeed in ordering or selling</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createorder</source>
         <translation type="obsolete">create an order (as pre-ordered, unpaid items)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createsale</source>
         <translation type="obsolete">create an order as sold and paid items</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>getorderlist</source>
         <translation type="obsolete">get a list of orders (overview)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>getorder</source>
         <translation type="obsolete">get details about an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>orderpay</source>
         <translation type="obsolete">pay for an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>orderrefund</source>
         <translation type="obsolete">refund money from a cancelled or overpaid order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>ordershipped</source>
         <translation type="obsolete">mark an order as being shipped</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="41"/>
         <source>cancelorder</source>
         <translation type="obsolete">cancel an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>orderbyticket</source>
         <translation type="obsolete">find an order by one of the tickets it contains</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>getordersbyevents</source>
         <translation type="obsolete">get a list of all orders that contain tickets for an event</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>setordercomment</source>
         <translation type="obsolete">change the comment of an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>getticket</source>
         <translation type="obsolete">get details about a ticket</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>useticket</source>
         <translation type="obsolete">mark a ticket as used</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>changeticketprice</source>
         <translation type="obsolete">change the price of a specific ticket (automatically changes price of the order)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="47"/>
         <source>ticketreturn</source>
         <translation type="obsolete">return a ticket unused</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>gettemplatelist</source>
         <translation type="obsolete">get a list of templates stored at the server (necessary for printing)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>gettemplate</source>
         <translation type="obsolete">get a specific template (necessary for printing)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>settemplate</source>
         <translation type="obsolete">store a new template at the server</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="60"/>
         <source>_admin</source>
         <translation type="obsolete">administrator, implies all other privileges</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="61"/>
         <source>_anyshipping</source>
         <translation type="obsolete">user has the right to use any shipping method</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="62"/>
         <source>_repriceshipping</source>
         <translation type="obsolete">user has the right to change the shipping price of an order regardless of shipping type</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="40"/>
         <source>createreservedorder</source>
         <translation type="obsolete">create an order as reservation (tickets blocked, but not usable until really ordered)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="42"/>
         <source>orderchangeshipping</source>
         <translation type="obsolete">change the shipping method of an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
         <source>reservationtoorder</source>
         <translation type="obsolete">change a reservation into a normal order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="43"/>
         <source>reservationtosale</source>
         <translation type="obsolete">change a reservation into a sale (order that is already paid)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>getshipping</source>
         <translation type="obsolete">get shipping methods</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>setshipping</source>
         <translation type="obsolete">create/change shipping methods</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="45"/>
         <source>deleteshipping</source>
         <translation type="obsolete">delete a shipping method</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>getvoucherprices</source>
         <translation type="obsolete">get the allowed voucher prices</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>cancelvoucher</source>
         <translation type="obsolete">cancel (give back) a voucher (price and value go to zero)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>emptyvoucher</source>
         <translation type="obsolete">make a voucher invalid (remaining value goes to zero, price remains)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>usevoucher</source>
         <translation type="obsolete">use a voucher to pay for an order</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="49"/>
         <source>getvoucher</source>
         <translation type="obsolete">get details about a voucher</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="51"/>
         <source>settemplatedescription</source>
         <translation type="obsolete">set a new description for a template</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="52"/>
         <source>deletetemplate</source>
         <translation type="obsolete">delete a template (variant)</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="63"/>
         <source>_anyvoucher</source>
         <translation type="obsolete">user may create vouchers with any value/price</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="64"/>
         <source>_anypricevoucher</source>
         <translation type="obsolete">user may create vouchers for which price and value differ</translation>
     </message>
     <message>
-        <location filename="../www/machine.php" line="65"/>
         <source>_explicitshipdate</source>
         <translation type="obsolete">user may set an explicit shipping date/time when marking an order as shipped (default: current date/time)</translation>
     </message>
 </context>
 <context>
-    <name>Voucher</name>
-</context>
-<context>
-    <name>WobTransaction</name>
+    <name>WTransaction</name>
     <message>
-        <location filename="wob/MTSetUserRoles.cpp" line="52"/>
-        <source>XML result parser error line %1 col %2: %3</source>
+        <location filename="wbase/WTransaction.cpp" line="78"/>
+        <source>interface not found</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>initkey</name>
     <message>
-        <location filename="main.cpp" line="170"/>
-        <source>Warning</source>
+        <location filename="wbase/WTransaction.cpp" line="132"/>
+        <source>Web Request timed out.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="158"/>
-        <source>Magic Smoke needs a host key. You have to generate one before you can use the program.</source>
+        <location filename="wbase/WTransaction.cpp" line="151"/>
+        <source>HTTP Error, return code %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WobTransaction</name>
     <message>
-        <location filename="main.cpp" line="164"/>
-        <source>Enter Host Name</source>
+        <location filename="wob/MTBackup.cpp" line="41"/>
+        <location filename="wob/MTCancelEvent.cpp" line="50"/>
+        <location filename="wob/MTCancelOrder.cpp" line="40"/>
+        <location filename="wob/MTChangeMyPassword.cpp" line="52"/>
+        <location filename="wob/MTChangePassword.cpp" line="50"/>
+        <location filename="wob/MTCreateOrder.cpp" line="40"/>
+        <location filename="wob/MTCreateReservation.cpp" line="40"/>
+        <location filename="wob/MTCreateRole.cpp" line="40"/>
+        <location filename="wob/MTCreateUser.cpp" line="57"/>
+        <location filename="wob/MTDeleteCustomer.cpp" line="48"/>
+        <location filename="wob/MTDeleteHost.cpp" line="44"/>
+        <location filename="wob/MTDeleteUser.cpp" line="48"/>
+        <location filename="wob/MTGetAllCustomerNames.cpp" line="41"/>
+        <location filename="wob/MTGetAllEvents.cpp" line="41"/>
+        <location filename="wob/MTGetAllHostNames.cpp" line="41"/>
+        <location filename="wob/MTGetAllHosts.cpp" line="41"/>
+        <location filename="wob/MTGetAllRoles.cpp" line="41"/>
+        <location filename="wob/MTGetAllRooms.cpp" line="41"/>
+        <location filename="wob/MTGetAllShipping.cpp" line="41"/>
+        <location filename="wob/MTGetAllUsers.cpp" line="41"/>
+        <location filename="wob/MTGetCustomer.cpp" line="45"/>
+        <location filename="wob/MTGetEvent.cpp" line="45"/>
+        <location filename="wob/MTGetLanguage.cpp" line="49"/>
+        <location filename="wob/MTGetMyRights.cpp" line="41"/>
+        <location filename="wob/MTGetMyRoles.cpp" line="41"/>
+        <location filename="wob/MTGetOrder.cpp" line="45"/>
+        <location filename="wob/MTGetOrderByBarcode.cpp" line="47"/>
+        <location filename="wob/MTGetOrderList.cpp" line="46"/>
+        <location filename="wob/MTGetOrdersByCustomer.cpp" line="49"/>
+        <location filename="wob/MTGetOrdersByEvents.cpp" line="54"/>
+        <location filename="wob/MTGetTicket.cpp" line="45"/>
+        <location filename="wob/MTGetUserHosts.cpp" line="45"/>
+        <location filename="wob/MTGetUserRoles.cpp" line="45"/>
+        <location filename="wob/MTGetVoucher.cpp" line="45"/>
+        <location filename="wob/MTLogin.cpp" line="66"/>
+        <location filename="wob/MTLogout.cpp" line="40"/>
+        <location filename="wob/MTReservationToOrder.cpp" line="40"/>
+        <location filename="wob/MTServerInfo.cpp" line="43"/>
+        <location filename="wob/MTSetHost.cpp" line="50"/>
+        <location filename="wob/MTSetUserDescription.cpp" line="50"/>
+        <location filename="wob/MTSetUserHosts.cpp" line="52"/>
+        <location filename="wob/MTSetUserRoles.cpp" line="52"/>
+        <source>XML result parser error line %1 col %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="165"/>
-        <source>Host name:</source>
+        <location filename="wob/MOAddress.cpp" line="106"/>
+        <location filename="wob/MOAddress.cpp" line="112"/>
+        <location filename="wob/MOAddress.cpp" line="118"/>
+        <location filename="wob/MOArtist.cpp" line="60"/>
+        <location filename="wob/MOCartOrder.cpp" line="96"/>
+        <location filename="wob/MOCartTicket.cpp" line="99"/>
+        <location filename="wob/MOCartTicket.cpp" line="105"/>
+        <location filename="wob/MOCartTicket.cpp" line="111"/>
+        <location filename="wob/MOCartTicket.cpp" line="123"/>
+        <location filename="wob/MOCartVoucher.cpp" line="81"/>
+        <location filename="wob/MOCartVoucher.cpp" line="87"/>
+        <location filename="wob/MOContact.cpp" line="61"/>
+        <location filename="wob/MOContact.cpp" line="67"/>
+        <location filename="wob/MOContact.cpp" line="73"/>
+        <location filename="wob/MOContactType.cpp" line="53"/>
+        <location filename="wob/MOCustomer.cpp" line="91"/>
+        <location filename="wob/MOCustomerInfoAbstract.cpp" line="60"/>
+        <location filename="wob/MOEvent.cpp" line="117"/>
+        <location filename="wob/MOEvent.cpp" line="123"/>
+        <location filename="wob/MOEvent.cpp" line="129"/>
+        <location filename="wob/MOEvent.cpp" line="135"/>
+        <location filename="wob/MOEvent.cpp" line="159"/>
+        <location filename="wob/MOEvent.cpp" line="172"/>
+        <location filename="wob/MOEvent.cpp" line="178"/>
+        <location filename="wob/MOEvent.cpp" line="188"/>
+        <location filename="wob/MOItemInfo.cpp" line="66"/>
+        <location filename="wob/MOItemInfo.cpp" line="72"/>
+        <location filename="wob/MOItemInfo.cpp" line="82"/>
+        <location filename="wob/MOItemInfo.cpp" line="88"/>
+        <location filename="wob/MOItemInfo.cpp" line="94"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="185"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="191"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="201"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="211"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="242"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="254"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="260"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="266"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="272"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="282"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="288"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="143"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="149"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="158"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="164"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="170"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="182"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="188"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="194"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="200"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="206"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="212"/>
+        <location filename="wob/MOPrice.cpp" line="61"/>
+        <location filename="wob/MOPrice.cpp" line="67"/>
+        <location filename="wob/MOPrice.cpp" line="73"/>
+        <location filename="wob/MOPrice.cpp" line="79"/>
+        <location filename="wob/MORoom.cpp" line="57"/>
+        <location filename="wob/MOShipping.cpp" line="58"/>
+        <location filename="wob/MOShipping.cpp" line="64"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="118"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="124"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="136"/>
+        <location filename="wob/MOVoucher.cpp" line="99"/>
+        <location filename="wob/MOVoucher.cpp" line="105"/>
+        <location filename="wob/MOVoucher.cpp" line="120"/>
+        <source>Class &apos;%1&apos; property &apos;%2&apos; is integer, but non-integer was found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="170"/>
-        <source>Magic Smoke needs a host name. You have to configure one before you can use the program.</source>
+        <location filename="wob/MOCartOrder.cpp" line="90"/>
+        <location filename="wob/MOCartTicket.cpp" line="117"/>
+        <location filename="wob/MOCartVoucher.cpp" line="93"/>
+        <location filename="wob/MOOrderAbstract.cpp" line="248"/>
+        <location filename="wob/MOOrderInfoAbstract.cpp" line="176"/>
+        <location filename="wob/MOTicketAbstract.cpp" line="130"/>
+        <location filename="wob/MOVoucher.cpp" line="111"/>
+        <source>Class &apos;%1&apos; property &apos;%2&apos; is enum, invalid value was found.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>initprofile</name>
     <message>
-        <location filename="main.cpp" line="179"/>
-        <source>default</source>
-        <comment>initial profile</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main.cpp" line="180"/>
-        <source>Create Initial Profile</source>
+        <location filename="main.cpp" line="176"/>
+        <source>Initial Profile Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="180"/>
-        <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>
+        <location filename="main.cpp" line="176"/>
+        <source>You need a profile to work with Magic Smoke. Please create one now.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2831,37 +3440,37 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>misc</name>
     <message>
-        <location filename="misc.cpp" line="52"/>
+        <location filename="misc/misc.cpp" line="52"/>
         <source>%1.%2</source>
         <comment>price with decimal dot</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="60"/>
+        <location filename="misc/misc.cpp" line="60"/>
         <source>.</source>
         <comment>decimal dot in price</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="86"/>
+        <location filename="misc/misc.cpp" line="86"/>
         <source>[0-9]+\.[0-9]{2}</source>
         <comment>regexp for price</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="94"/>
+        <location filename="misc/misc.cpp" line="94"/>
         <source>yyyy-MM-dd</source>
         <comment>localized date format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="102"/>
+        <location filename="misc/misc.cpp" line="102"/>
         <source>hh:mm</source>
         <comment>localized time format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="misc.cpp" line="110"/>
+        <location filename="misc/misc.cpp" line="110"/>
         <source>yyyy-MM-dd hh:mm</source>
         <comment>localized date + time format</comment>
         <translation type="unfinished"></translation>
@@ -2870,32 +3479,29 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>office</name>
     <message>
-        <location filename="office.cpp" line="47"/>
+        <location filename="templates/office.cpp" line="47"/>
         <source>Chose Printer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="50"/>
+        <location filename="templates/office.cpp" line="50"/>
         <source>Please chose a printer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="54"/>
+        <location filename="templates/office.cpp" line="54"/>
         <source>(Default Printer)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="70"/>
+        <location filename="templates/office.cpp" line="70"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="office.cpp" line="92"/>
+        <location filename="templates/office.cpp" line="92"/>
         <source>Save current document as...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>php::</name>
-</context>
 </TS>
index 3642310..e4b0646 100644 (file)
@@ -41,8 +41,6 @@
 #include <QSettings>
 #include <QStringList>
 
-#define req (MSInterface::instance())
-
 MTemplateStore::MTemplateStore(QString p)
 {
        profileid=p;
index 8e5b9d4..7de714b 100644 (file)
 #include <QSettings>
 #include <QStringList>
 
-#include "../zip/qunzip.h"
-#include "../zip/qzip.h"
+#include "qunzip.h"
+#include "qzip.h"
 #include "code39.h"
-#include "order.h"
+
+#include "MOTicket.h"
+#include "MOVoucher.h"
 
 
 class MLabelRendererPrivate
@@ -514,25 +516,25 @@ MLabel::~MLabel(){}
 class MTicketLabel:public MLabel
 {
        public:
-               MTicketLabel(const MTicket&t):tick(t){}
+               MTicketLabel(const MOTicket&t):tick(t){}
                QString getVariable(QString var)const;
        private:
-               MTicket tick;
+               MOTicket tick;
 };
 
 QString MTicketLabel::getVariable(QString var)const
 {
        if(var=="TICKETID"||var=="BARCODE")return tick.ticketid();
-       if(var=="PRICE")return tick.priceString();
+       /*if(var=="PRICE")return tick.priceString();
        if(var=="DATETIME")return tick.event().startTimeString();
        if(var=="ROOM")return tick.event().room();
        if(var=="TITLE")return tick.event().title();
-       if(var=="ARTIST")return tick.event().artist().value().name();
+       if(var=="ARTIST")return tick.event().artist().value().name();*/
        return "";
 }
 
 MTicketRenderer::MTicketRenderer(MTemplate f):MLabelRenderer(f){}
-bool MTicketRenderer::render(const MTicket&label,QPaintDevice&pdev,QPainter*painter,QPointF offset)
+bool MTicketRenderer::render(const MOTicket&label,QPaintDevice&pdev,QPainter*painter,QPointF offset)
 {
        return MLabelRenderer::render(MTicketLabel(label),pdev,painter,offset);
 }
@@ -540,22 +542,22 @@ bool MTicketRenderer::render(const MTicket&label,QPaintDevice&pdev,QPainter*pain
 class MVoucherLabel:public MLabel
 {
        public:
-               MVoucherLabel(const MVoucher&t):vouc(t){}
+               MVoucherLabel(const MOVoucher&t):vouc(t){}
                QString getVariable(QString var)const;
        private:
-               MVoucher vouc;
+               MOVoucher vouc;
 };
 
 QString MVoucherLabel::getVariable(QString var)const
 {
        if(var=="VOUCHERID"||var=="BARCODE")return vouc.voucherid();
-       if(var=="PRICE")return vouc.priceString();
-       if(var=="VALUE")return vouc.valueString();
+       /*if(var=="PRICE")return vouc.priceString();
+       if(var=="VALUE")return vouc.valueString();*/
        return "";
 }
 
 MVoucherRenderer::MVoucherRenderer(MTemplate f):MLabelRenderer(f){}
-bool MVoucherRenderer::render(const MVoucher&label,QPaintDevice&pdev,QPainter*painter,QPointF offset)
+bool MVoucherRenderer::render(const MOVoucher&label,QPaintDevice&pdev,QPainter*painter,QPointF offset)
 {
        return MLabelRenderer::render(MVoucherLabel(label),pdev,painter,offset);
 }
index 46cb400..3a4b7ee 100644 (file)
@@ -20,8 +20,8 @@
 #include "templates.h"
 
 class MLabelRendererPrivate;
-class MTicket;
-class MVoucher;
+class MOTicket;
+class MOVoucher;
 class QPaintDevice;
 class QPainter;
 
@@ -65,7 +65,7 @@ class MVoucherRenderer:public MLabelRenderer
 {
        public:
                MVoucherRenderer(MTemplate f);
-               bool render(const MVoucher&label,QPaintDevice&pdev,QPainter*painter=0,QPointF offset=QPointF());
+               bool render(const MOVoucher&label,QPaintDevice&pdev,QPainter*painter=0,QPointF offset=QPointF());
 };
 
 /**convenience class: renders vouchers directly*/
@@ -73,7 +73,7 @@ class MTicketRenderer:public MLabelRenderer
 {
        public:
                MTicketRenderer(MTemplate f);
-               bool render(const MTicket&label,QPaintDevice&pdev,QPainter*painter=0,QPointF offset=QPointF());
+               bool render(const MOTicket&label,QPaintDevice&pdev,QPainter*painter=0,QPointF offset=QPointF());
 };
 
 
diff --git a/src/wext/MOOrder.cpp b/src/wext/MOOrder.cpp
new file mode 100644 (file)
index 0000000..27387b9
--- /dev/null
@@ -0,0 +1,102 @@
+//
+// C++ Implementation: MOOrder
+//
+// Description: 
+//
+//
+// Author: Konrad Rosenbaum <konrad@silmor.de>, (C) 2009
+//
+// Copyright: See README/COPYING files that come with this distribution
+//
+//
+
+#include "MOOrder.h"
+
+#include "msinterface.h"
+
+MOOrder::MOOrder(qint64 id)
+{
+       MTGetOrder go=req->queryGetOrder(id);
+       if(go.stage()==go.Success)
+               operator=(go.getorder().value());
+}
+
+bool MOOrder::needsPayment()const
+{
+       if(status()==Placed || status()==Sent)
+               if(amountpaid()<totalprice())return true;
+       return false;
+}
+
+bool MOOrder::needsRefund()const
+{
+       if(status()==Cancelled)
+               return amountpaid()>0;
+       if(status()==Placed || status()==Sent)
+               return amountpaid()>totalprice();
+       return false;
+}
+
+int MOOrder::amountToPay()const
+{
+       if(status()==Placed || status()==Sent)
+               if(amountpaid()<totalprice())return totalprice()-amountpaid();
+       return 0;
+}
+
+int MOOrder::amountToRefund()const
+{
+       if(status()==Cancelled)
+               return amountpaid();
+       if(status()==Placed || status()==Sent)
+               if(amountpaid()>totalprice())
+                       return amountpaid()-totalprice();
+       return 0;
+}
+
+bool MOOrder::isSent()const
+{
+       //only in placed mode there is a need for action, hence in all other modes we assume sent
+       return status()!=Placed;
+}
+
+
+QString MOOrder::orderDateTimeStr()
+{
+       if(ordertime().value()==0)return "";
+       return QDateTime::fromTime_t(ordertime()).toString(QCoreApplication::translate("MOOrder","yyyy-MM-dd hh:mm ap","date/time format"));
+}
+
+QDate MOOrder::orderDate()
+{
+       return QDateTime::fromTime_t(ordertime()).date();
+}
+
+QString MOOrder::orderDateStr()
+{
+       if(ordertime().value()==0)return "";
+       return QDateTime::fromTime_t(ordertime()).toString(QCoreApplication::translate("MOOrder","yyyy-MM-dd","date format"));
+}
+
+QDateTime MOOrder::sentDateTime()
+{
+       return QDateTime::fromTime_t(senttime());
+}
+
+QString MOOrder::sentDateTimeStr()
+{
+       if(senttime().value()==0)return "";
+       return QDateTime::fromTime_t(senttime()).toString(QCoreApplication::translate("MOOrder","yyyy-MM-dd hh:mm ap","date/time format"));
+}
+
+QDate MOOrder::sentDate()
+{
+       return QDateTime::fromTime_t(senttime()).date();
+}
+
+QString MOOrder::sentDateStr()
+{
+       if(senttime().value()==0)return "";
+       return QDateTime::fromTime_t(senttime()).toString(QCoreApplication::translate("MOOrder","yyyy-MM-dd","date format"));
+}
+
index 6c91d87..465c5a9 100644 (file)
 #define MAGICSMOKE_MOORDER_H
 
 #include "MOOrderAbstract.h"
+#include "misc.h"
+
+#include <QDate>
+#include <QDateTime>
+
+/**this class represents a complete order*/
 class MOOrder:public MOOrderAbstract
 {
        public:
+               /**creates an invalid/empty order object*/
                MOOrder():MOOrderAbstract(){}
+               /**create order by id, retrieves it automatically from the database*/
+               MOOrder(qint64);
+               /**copy constructor*/
                MOOrder(const MOOrder&o):MOOrderAbstract(o){}
+               /**used by transactions to create order from xml*/
                MOOrder(const QDomElement&e):MOOrderAbstract(e){}
 
+               /**returns whether the order is valid (it comes from the DB and it has been understood by the parser)*/
+               bool isValid()const{return !orderid().isNull();}
+               
+               /**returns whether this order is a reservation*/
+               bool isReservation()const{return status()==Reserved;}
+               
+               /**returns whether the tickets of this order have already been shipped*/
+               bool isSent()const;
+               
+               /**returns the status of the order as localized string*/
+               QString orderStatusString()const{return OrderState2locstr(status());}
+
+               /**returns how much money needs to be paid in total for this order, in cents*/
+               QString totalPriceString()const{return cent2str(totalprice());}
+               
+               /**returns how much money has already been paid for this order, in cents*/
+               QString amountPaidString()const{return cent2str(amountpaid());}
+               
+               /**returns whether there is anything left to pay*/
+               bool needsPayment()const;
+               
+               /**returns whether there is anything left to refund*/
+               bool needsRefund()const;
+               
+               /**returns how much there is to be paid, in cents*/
+               int amountToPay()const;
+               
+               /**returns how much there is to be paid, as localized string*/
+               QString amountToPayStr()const{return cent2str(amountToPay());}
+               
+               /**returns how much there is to be refunded, in cents*/
+               int amountToRefund()const;
+               
+               /**returns how much there is to be refunded, as localized string*/
+               QString amountToRefundStr()const{return cent2str(amountToRefund());}
+               
+               /**returns the order date+time as string*/
+               QString orderDateTimeStr();
+               
+               /**returns the order date only*/
+               QDate orderDate();
+               
+               /**returns the order date only as string*/
+               QString orderDateStr();
+               
+               /**returns the shipping date+time*/
+               QDateTime sentDateTime();
+               
+               /**returns the shipping date+time as string*/
+               QString sentDateTimeStr();
+               
+               /**returns the shipping date only*/
+               QDate sentDate();
+               
+               /**returns the shipping date only as string*/
+               QString sentDateStr();
+               
 };
 
 #endif
index 65b5ae3..15cc4a3 100644 (file)
@@ -1 +1,11 @@
 INCLUDEPATH += ./wext
+
+HEADERS += \
+       wext/MOCustomerInfo.h \
+       wext/MOOrder.h \
+       wext/MOOrderInfo.h \
+       wext/MORole.h \
+       wext/MOTicket.h
+
+SOURCES += \
+       wext/MOOrder.cpp
\ No newline at end of file