From: konrad Date: Sat, 26 Feb 2011 14:12:57 +0000 (+0000) Subject: unify main Makefile X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=aa250e2580ce41359d3a6c0a1a2e1d6827717755;p=web%2Fkonrad%2Fsmoke.git unify main Makefile delete obsolete host/template PHP files git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@732 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- diff --git a/Makefile.unix b/Makefile similarity index 51% rename from Makefile.unix rename to Makefile index c5b918f..cd8ce2b 100644 --- a/Makefile.unix +++ b/Makefile @@ -1,6 +1,6 @@ ########################################################### -# global Makefile for MagicSmoke, Unix flavour -# (c) Konrad Rosenbaum, 2008-9 +# global Makefile for MagicSmoke +# (c) Konrad Rosenbaum, 2008-2011 ########################################################### ###### @@ -8,8 +8,6 @@ #change this if Qt is not in your PATH QMAKE = qmake -#eg: -#QMAKE = /usr/local/Trolltech/Qt-4.4.3/bin/qmake #set this if you want arguments to qmake QMAKEFLAGS = @@ -19,11 +17,22 @@ QMAKEFLAGS = #change this if doxygen uses a different name or is not in your PATH DOXYGEN = doxygen -#this is used to compile the Twig docu into HTML -MARKDOWN = markdown - #the directory to install MagicSmoke to -PREFIX = /usr/local +PREFIX = dist + +#the make utility to use +MYMAKE = $(MAKE) + +#this builds the installation package +NSIS = makensis + +#set this to pass additional options to nsis +NOPT = + +#Translation tools of Qt +LUPD=lupdate +LREL=lrelease +XPAT=xmlpatterns ########################################################### # END OF CONFIGURATION @@ -33,49 +42,70 @@ PREFIX = /usr/local QTDIR=$(shell $(QMAKE) -query QT_INSTALL_PREFIX) QTBIN=$(shell $(QMAKE) -query QT_INSTALL_BINS) -all: script server client +none: + @echo "Usage: $(MAKE) target" + @echo " " + @echo "Please chose a target!" + @echo " " + @echo "Building:" + @echo " client - build the client (in Unix/Windows mode)" + @echo " server - build the server (in Unix mode)" + @echo " all - build everything (in Unix mode)" + @echo " debug - build client in debug mode" + @echo " macosx - build the client and server on Mac OS/X" + @echo "Documentation, Translation:" + @echo " sdoc - generate source docu, needs doxygen" + @echo " lupdate - update translation source files" + @echo " lrelease - create binary translation files" + @echo "Installation:" + @echo " install-client - install the client (Unix/Mac)" + @echo " install-server - install the server (Unix/Mac)" + @echo " install - install everything (Unix/Mac)" + @echo " nsis - generate NSIS package (Win32)" + @echo "Cleanup:" + @echo " clean - clean up intermediate files (Unix/Mac)" + @echo " distclean - clean up built files (Unix/Mac)" + +all: server client lrelease wob: woc - cd wob ; ../pack/woc/woc magicsmoke.wolf + cd wob && ../pack/woc/woc magicsmoke.wolf woc: - cd pack/woc; $(QMAKE) $(QMAKEFLAGS) && $(MAKE) + cd pack/woc && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE) wbase: - cd pack/qtbase; $(QMAKE) $(QMAKEFLAGS) && $(MAKE) + cd pack/qtbase && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE) elam: - cd elam/src; $(QMAKE) $(QMAKEFLAGS) && $(MAKE) + cd elam/src && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE) server: wob client: wob zip wbase tzone elam - cd src ; $(QMAKE) $(QMAKEFLAGS) && $(MAKE) + cd src && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE) zip: - cd zip/src ; $(QMAKE) $(QMAKEFLAGS) && $(MAKE) + cd zip/src && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE) tzone: - cd tzone ; $(QMAKE) $(QMAKEFLAGS) && $(MAKE) - -dist: - @echo Distribution not implemented yet + cd tzone && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE) sdoc: $(DOXYGEN) Doxyfile-php $(DOXYGEN) Doxyfile-cpp - rm -rf doc/twig ; mkdir -p doc/twig - echo 'Twig Index

Twig Index

' >>doc/twig/index.html - cd pack/phpbase ; $(DOXYGEN) - cd pack/qtbase ; $(DOXYGEN) - cd tzone ; $(DOXYGEN) Doxyfile - cd elam/src ; $(DOXYGEN) Doxyfile + cd pack/phpbase && $(DOXYGEN) + cd pack/qtbase && $(DOXYGEN) + cd tzone && $(DOXYGEN) Doxyfile + cd elam/src && $(DOXYGEN) Doxyfile + +lrelease: + cd src && $(LREL) smoke.pro + -$(MAKE) -C www/translations LREL=$(LREL) XPAT=$(XPAT) lrelease + +lupdate: + cd src && $(LUPD) smoke.pro + $(MAKE) -C www/translations LUPD=$(LUPD) lupdate install: install-client install-server install-doc @@ -109,7 +139,7 @@ clean: -rm -rf pack/woc/.ctmp pack/woc/woc pack/woc/core* pack/woc/Makefile* -rm -rf pack/qtbase/.ctmp pack/qtbase/libqwbase* pack/qtbase/Makefile* -rm -rf tzone/zoneinfo* tzone/libtzdata* tzone/Makefile* tzone/.ctmp - -rm -rf doc/source-php doc/source-cpp doc/twig + -rm -rf doc/source-php doc/source-cpp -rm -rf `find . -name '*~'` -rm -rf `find . -name '*.bak'` -rm -rf `find . -name 'core*'` @@ -117,7 +147,16 @@ clean: distclean: clean debug: QMAKEFLAGS+=CONFIG+=debug -debug: all +debug: client server + +macosx: MYMAKE=xcodebuild +macosx: client server + + +nsis: script client + echo !define QTDIR / >qtpath.nsh + $(QMAKE) -query QT_INSTALL_PREFIX >>qtpath.nsh + $(NSIS) $(NOPT) smoke.nsi #tell Make that the rules above are symbolic: -.PHONY: script woc wob server client sdoc zip wbase clean distclean tzone elam debug +.PHONY: script woc wob server client sdoc zip wbase clean distclean tzone elam debug macosx diff --git a/Makefile.mingw b/Makefile.mingw deleted file mode 100644 index 4308ea6..0000000 --- a/Makefile.mingw +++ /dev/null @@ -1,83 +0,0 @@ -########################################################### -# global Makefile for MagicSmoke, MinGW flavour -# (c) Konrad Rosenbaum, 2008-2010 -# -# this builds the client for windows; -# it is currently not supported to build all the documentation on windows; -# the server cannot run on windows -########################################################### - -###### -#global configuration - -#change this if Qt is not in your PATH -QMAKE = qmake -#e.g.: -#QMAKE = C:/Qt-4.4.3/bin/qmake - -#change this to introduce different options to qmake -QOPT = CONFIG+=release -#e.g.: -#QOPT = CONFIG+=debug -spec win32-g++ - -#this builds the installation package -NSIS = makensis - -#set this to pass additional options to nsis -NOPT = - -########################################################### -# END OF CONFIGURATION -# No editable content below this line -########################################################### - -QTDIR=$(shell $(QMAKE) -query QT_INSTALL_PREFIX) -QTBIN=$(shell $(QMAKE) -query QT_INSTALL_BINS) - -all: dist - -wob: woc - cd wob && ../pack/woc/woc magicsmoke.wolf - -woc: - cd pack/woc && $(QMAKE) $(QOPT) - cd pack/woc && $(MAKE) - -server: wob - -client: wob zip qwbase tzone elam - cd src && $(QMAKE) $(QOPT) - cd src && $(MAKE) - -zip: - cd zip/src && $(QMAKE) $(QOPT) - cd zip/src && $(MAKE) - -qwbase: - cd pack/qtbase && $(QMAKE) $(QOPT) - cd pack/qtbase && $(MAKE) - -tzone: - cd tzone && $(QMAKE) $(QOPT) - cd tzone && $(MAKE) - -elam: - cd elam/src && $(QMAKE) $(QOPT) - cd elam/src && $(MAKE) - -#script stuff: depends on generated CPP files -script: qtscript/generated_cpp - cd qtscript/qtbindings && $(QMAKE) && $(MAKE) release - -#generated script plugins: depend on Qt version -qtscript/generated_cpp: $(QTBIN)/qmake.exe - cd qtscript/generator && $(QMAKE) && $(MAKE) - cd qtscript/generator && set QTDIR=$(QTDIR) && ./generator - -dist: script client - echo !define QTDIR / >qtpath.nsh - $(QMAKE) -query QT_INSTALL_PREFIX >>qtpath.nsh - $(NSIS) $(NOPT) smoke.nsi - -#tell Make that the rules above are symbolic: -.PHONY: woc wob server client zip elam tzone diff --git a/doc/index.html b/doc/index.html index eb2573c..5ddbb73 100644 --- a/doc/index.html +++ b/doc/index.html @@ -48,7 +48,7 @@ Architectural Overviews: External Components:

diff --git a/doc/template.html b/doc/template.html index 8deb1d4..b81bfb5 100644 --- a/doc/template.html +++ b/doc/template.html @@ -7,7 +7,7 @@ The web user interface is constructed with templates with just a few dynamic values filled in. Those templates are found in the template/* directories. These templates are normal HTML or text with some special constructs to fill in the blanks.

-Please see the Twig template engine documentation for syntax details. +Please see the Twig template engine documentation for syntax details.

Template Files

diff --git a/src/smoke_de.ts b/src/smoke_de.ts index 60ca2c8..86ded9b 100644 --- a/src/smoke_de.ts +++ b/src/smoke_de.ts @@ -9,32 +9,32 @@ Zugriffsrechte - + &Window &Fenster - + &Close S&chließen - + Users Nutzer - + Roles Rollen - + Hosts Hosts - + Flags Flags @@ -42,27 +42,27 @@ MAddressChoiceDialog - + Chose an Address Adresse wählen - + Add Address Adresse hinzufügen - + Cancel Abbrechen - + Warning Warnung - + Unable to save changes made to addresses: %1 Änderungen an dieser Adresse können nicht gespeichert werden: %1 @@ -70,107 +70,107 @@ MAddressDialog - + Edit Address Adresse ändern - + Create Address Adresse anlegen - + Last used: Zuletzt benutzt: - + Name: Name: - - + + Address: Adresse: - + City: Stadt: - + State: Bundesland: - + ZIP Code: Postleitzahl: - + Country: Land: - - + + Ok Ok - - + + Cancel Abbrechen - + Create New Country... must contain leading space to distinguish it from genuine countries Neues Land anlegen... - + Select Country Land auswählen - + Please select a country: Bitte wählen Sie ein Land: - + Create New Country Neues Land anlegen - + Country Name: Name des Landes: - + Abbreviation: Abkürzung: - - + + Warning Warnung - + The country name and abbreviation must contain something! Der Landesname und die Abkürzung müssen Daten enthalten! - + Error while creating country: %1 Fehler beim Anlegen des Landes: %1 @@ -178,27 +178,27 @@ MAddressWidget - + Select Auswählen - + Edit Ändern - + Delete Löschen - + Delete Address Adresse löschen - + Really delete this address? %1 Diese Adresse wirklich löschen? @@ -374,12 +374,12 @@ zurücksetzen - + Add &Ticket Eintrittskarte &hinzufügen - + Add &Voucher &Gutschein hinzufügen @@ -399,227 +399,227 @@ verkaufen - + Add &Shop-Item Waren hinzufügen - + &Remove Line Zeile entfernen - + &Abort Shopping &Einkauf abbrechen - + &Update Shipping Options Versandoptionen auffrischen - + (No Shipping) (Kein Versand) - + Amount Anzahl - + Title Titel - + Start Time Anfangszeit - + Price Preis - - - - - - - + + + + + + + Warning Warnung - + Please set the customer first. Bitte wählen Sie einen Kunden aus. - + Select Event to order Ticket Bitte wählen Sie eine Verstaltung aus, um zu bestellen - + Select Auswählen - - - + + + Cancel Abbrechen - + Error getting event, please try again. Konnte Veranstalung nicht herunterlden, bitte versuchen Sie es noch einmal. - + This event has no prices associated. Cannot sell tickets. Diese Veranstaltung hat keine Preise assoziiert, daher können keine Eintrittskarten dafür generiert werden. - + Select Price Category Preiskategorie wählen - + Please chose a price category: Bitte wählen Sie eine Preiskategorie: - - + + Ok Ok - + Select Voucher Gutschein wählen - + Select voucher price and value: Bitte Gutschein-Preis und -Wert wählen: - + Price: Preis: - + Value: Wert: - + Voucher (value %1) Gutschein (Wert: %1) - + There are problems with the contents of the cart, please check and then try again. Es gibt Probleme mit dem Inhalt des Wahrenkorbs. Bitte prüfen Sie die rot markierten Inhalte und probieren Sie es erneut. - - + + Error Fehler - + There is nothing in the order. Ignoring it. Bestellung ist leer. Vorgang abgebrochen. - + Please chose a customer first! Bitte wählen Sie zunächst einen Kunden aus! - + Shipping Versand - + You have chosen a shipping method, but no address. Are you sure you want to continue? Sie haben eine Versandmethode, aber keine Adresse gewählt. Sind Sie sicher? - + Reservations can only contain tickets. Reservierungen können nur Eintrittskarten enthalten. - + Error while creating reservation: %1 Fehler beim Anlegen der Reservierung: %1 - + Error while creating order: %1 Fehler beim Anlegen der Bestellung: %1 - + The customer is not valid, please chose another one. Der Kunde existiert nicht oder kann nicht benutzt werden, bitte wählen Sie einen anderen Kunden. - + The delivery address is not valid, please chose another one. Die Lieferadresse kann nicht benutzt werden, bitte wählen Sie eine andere Adresse. - + The invoice address is not valid, please chose another one. Die Rechnungsadresse kann nicht benutzt werden, bitte wählen Sie eine andere. - + Shipping Type does not exist or you do not have permission to use it. Die Versandart existiert nicht oder Sie haben nicht das Recht diese Versandart zu verwenden. - + The event is already over, please remove this entry. Diese Veranstaltung ist bereits vorbei. Bitte entfernen Sie diesen Eintrag. - + You cannot order tickets for this event anymore, ask a more privileged user. Sie können keine Entrittskarten mehr für diese Veranstaltung verkaufen, bitte fragen Sie einen höher privilegierten Nutzer. - + The event is (almost) sold out, there are %1 tickets left. Diese Veranstaltung ist (nahezu) ausverkauft. Es gibt nur noch %1 Karten. - + The event does not exist or there is another serious problem, please remove this entry. Diese Veranstaltung existiert nicht oder es gibt ein anderes Problem - bitte entfernen Sie diesen Eintrag. - + You do not have permission to create vouchers with this value, please remove it. Sie haben nicht die Berechtigung Gutscheine mit diesem Wert anzulegen - bitte entfernen Sie ihn. - + The price tag of this voucher is not valid, please remove and recreate it. Der Preis dieses Gutscheins ist nicht gültig. Bitte entfernen Sie ihn und legen Sie ihn neu an. @@ -1010,42 +1010,42 @@ Priorität: Quellen mit dem niedrigsten Wert werden zuerst durchsucht. MContactTableDelegate - + (New Contact Type) (Neuer Kontakttyp) - + Create new Contact Type Neuen Kontakttyp Anlegen - + Contact Type Name: Kontakttypname: - + Contact Type URI Prefix: Kontakttyp URI-Prefix: - + Ok Ok - + Cancel Abbrechen - + Warning Warnung - + Error while creating contact type: %1 Fehler beim anlegen des Kontakttyps: %1 @@ -1148,17 +1148,22 @@ Priorität: Quellen mit dem niedrigsten Wert werden zuerst durchsucht.Bitte geben Sie die Mailadresse ein, die dieser Kunde benutzt um sich am Webportal anzumelden: - + + Unable to set new email: %1 + + + + Error while resetting password: %1 Fehler beim Zurücksetzen des Passworts: %1 - + Password Reset Passwort Zurücksetzen - + A password reset mail has been sent to the customer. Eine E-Mail mit den Daten zum Zurücksetzen des Passwortes wurde an den Kunden geschickt. @@ -1186,7 +1191,8 @@ Priorität: Quellen mit dem niedrigsten Wert werden zuerst durchsucht. - + + Warning Warnung @@ -1359,53 +1365,53 @@ Priorität: Quellen mit dem niedrigsten Wert werden zuerst durchsucht.Unbenutzt: - + searching... entrance control suche Kartendaten... - + Ticket "%1" Not Valid Karte "%1" ist nicht gültig. - + Ticket "%1" is not for this event. Karte "%1" ist nicht für diese Veranstaltung. - + Ticket "%1" has already been used Karte "%1" wurde bereits verwendet. - + Ticket "%1" has not been bought. Karte "%1" wurde nicht gekauft. - + Ticket "%1" Ok Karte "%1" Okay. - + Ticket "%1" is not paid for! Karte "%1" ist nicht bezahlt!!! - + Ticket "%1" cannot be accepted, please check the order! Karte "%1" kann nicht akzeptiert werden, bitte prüfen Sie die Bestellung. - + Warning Warnung - + Error while retrieving order: %1 Fehler beim Einholen der Bestelldaten: %1 @@ -1414,37 +1420,37 @@ Priorität: Quellen mit dem niedrigsten Wert werden zuerst durchsucht.Fehler beim Einholen der Bestelldaten: %1 - + Entrance Configuration Konfiguration der Eingangskontrolle - + Show events that start within hours: Veranstaltungen zeigen die innerhalb von x Stunden beginnen: - + Show events a maximum of hours after they end: Veranstaltungen bis maximal x Stunden nach ihrem Ende zeigen: - + Use Cache: Puffer verwenden: - + Cache update interval: Puffer Auffrischintervall: - + Ok Ok - + Cancel Abbrechen @@ -1927,57 +1933,57 @@ Priorität: Quellen mit dem niedrigsten Wert werden zuerst durchsucht.&Veranstaltung - + &Update Event List &Veranstaltungsliste auffrischen - + &Show/Edit details... &Details anzeigen/editieren... - + &New Event... &Neue Veranstaltung... - + Show &old Events vergangene Veranstaltungen anzeigen - + &Edit Price Categories... Preiskategorien ändern... - + Start Time Anfangszeit - + Title Titel - + Free Frei - + Reserved Reserviert - + Sold Verkauft - + Capacity Sitzplätze: @@ -1987,32 +1993,32 @@ Priorität: Quellen mit dem niedrigsten Wert werden zuerst durchsucht.ddd, d.M.yyyy hh:mm - + Cancel Event Veranstaltung absagen - + Please enter a reason to cancel event "%1" or abort: Bitte geben Sie einen Grund für die Absage der Veranstaltung "%1" ein: - + Event Cancelled Veranstaltung abgesagt - + The event "%1" has been cancelled. Please inform everybody who bought a ticket. Die Veranstaltung "%1" wurde abgesagt. Bitte informieren Sie alle Kunden. - + Warning Warnung - + Unable to cancel event "%1": %2. Kann Veranstaltung '%1' nicht absagen: %2 @@ -2303,587 +2309,602 @@ Priorität: Quellen mit dem niedrigsten Wert werden zuerst durchsucht. MInterface - + Backup Sicherung - + GetLanguage Übersetzung für Servermeldungen holen - + ServerInfo Serverinformationen - + Login Login - + Logout Logout - + GetMyRoles meine Rollen herausfinden - + GetMyRights meine Rechte herausfinden - + ChangeMyPassword Mein Passwort ändern - + GetAllUsers Nutzer abfragen - + CreateUser Nutzer anlegen - + ChangePassword Passwort eines anderen Nutzers ändern - + DeleteUser Nutzer löschen - + SetUserDescription Nutzerkommentar setzen - + GetUserRoles Rollen eines anderen Nutzers herausfinden - + SetUserRoles Rollen eines anderen Nutzers setzen - + GetAllRoles Alle Rollen abfragen - + GetRole spezifische Rolle abfragen - + CreateRole Rolle anlegen - + SetRoleDescription Rollenkommentar setzen - + SetRoleRights Rollenrechte setzen - + DeleteRole Rolle löschen - + GetAllRightNames Namen aller Rechte abfragen - + GetAllHostNames Namen aller Hosts abfragen - + GetAllHosts Alle Hosts (incl. Keys) abfragen - + SetHost Host ändern/anlegen - + DeleteHost Host löschen - + GetUserHosts erlaubte Hosts eines Nutzers abfragen - + GetValidFlags alle gültigen Flags abfragen - + SetFlag Flag anlegen/ändern - + DeleteFlag Flag löschen - + GetUser Nutzerdaten abfragen - + SetUserHosts erlaubte Hosts eines Nutzers abfragen - + SetUserFlags Flags des Nutzers setzen - + SetRoleFlags Flags der Rolle setzen - + GetAllContactTypes Kontaktinformationstypen abfragen - + CreateContactType Kontaktinformationstypen anlegen - + GetCustomer Kunden abfragen - + GetAllCustomerNames Alle Kundennamen abfragen - + CreateCustomer Kunden anlegen - + ChangeCustomer Kunden ändern - + DeleteCustomer Kunden löschen - + GetAddress Addresse abfragen - + GetAllCountries gespeicherte Länder abfragen - + CreateCountry Land anlegen - + ResetCustomerPassword Kundenpasswort zurücksetzen (sendet Mail) - + GetAllArtists Künstler abfragen - + CreateArtist Künstler anlegen - + GetAllPriceCategories Preiskategorien abfragen - + CreatePriceCategory Preiskategorie anlegen - + ChangePriceCategory Preiskategorie anpassen - + GetEvent Veranstaltungsdetails abfragen - + GetAllEvents Liste der Veranstaltungen abfragen - + GetEventList Liste der Veranstaltungen abfragen (spezifische Liste) - + CreateEvent Veranstaltung anlegen - + ChangeEvent Veranstaltung ändern - + CancelEvent Veranstaltung absagen - + GetAllRooms Liste aller Räume abfragen - + CreateRoom Raum anlegen - + GetEventSummary Veranstaltungübersicht - + GetTicket Ticket abrufen - + GetVoucher Gutschein abfragen - + GetVoucherAudit Logdaten zu Gutschein abfragen - + GetOrderAudit Logdaten zu Bestellung abfragen - + GetOrder Bestellung: Details abfragen - + GetOrderList Liste der Bestellungen abfragen - + GetOrdersByEvents Bestellungen finden, die Veranstaltung enthalten - + GetOrdersByCustomer Bestellungen finden, die zu einem Kunden gehören - + GetOrderByBarcode Bestellung finden, die Eintrittskarte oder Gutschein enthält - + CreateOrder Bestellung anlegen - + CreateReservation Reservierung anlegen - + ReservationToOrder Reservierung in Bestellung wandeln - + CancelOrder Bestellung stornieren - + OrderPay Bestellung bezahlen - + OrderRefund Bestellung: Geld zurück geben - + UseVoucher Gutschein benutzen (damit bezahlen) - + DeductVoucher Gutschein für Waren außerhalb MagicSmoke benutzen - + EmptyVoucher Gutschein ungültig machen - + OrderChangeShipping Versandoption einer Bestellung ändern - + OrderMarkShipped Bestellung als verschickt markieren - + OrderAddComment Bestellkommentar (in angelegter Bestellung) hinzufügen - + OrderChangeComments Bestellkommentar (in angelegter Bestellung) ändern (Adminfunktion) - + ReturnTicketVoucher Eintrittskarte oder Gutschein zurückgeben - + ChangeTicketPrice Ticketpreis ändern - + ChangeTicketPriceCategory Preiskategorie einer Karte ändern - + GetAllShipping Versandoptionen holen - + ChangeShipping Versandoptionsdaten ändern - + CreateShipping Versandoption anlegen - + DeleteShipping Versandoption löschen - + GetValidVoucherPrices Gutscheinpreise abfragen (zB. für Bestellformular) - + UseTicket Ticket entwerten - + GetEntranceEvents Liste der Veranstaltungen abfragen, die am Einlass relevant sind - + WebCartAddTicket Nur Web: Karte zum Warenkorb hinzufügen - + WebCartRemoveTicket Nur Web: Karte aus Warenkorb entfernen - + WebCartAddVoucher Nur Web: Gutschein zum Warenkorb hinzufügen - + WebCartRemoveVoucher Nur Web: Gutschein aus Warenkorb entfernen - + GetTemplateList Vorlagenliste abfragen - + GetTemplate Vorlage abfragen - + SetTemplate Vorlage anlegen oder ändern - + SetTemplateDescription Beschreibung einer Vorlage ändern - + DeleteTemplate Vorlage löschen - + ChangeEvent:CancelEvent Veranstaltung absagen - + CreateOrder:AnyVoucherValue Bestellung anlegen: beliebige Gutscheinwerte erlauben - + CreateOrder:DiffVoucherValuePrice Bestellung anlegen: Gutscheinpreis darf von Gutscheinwert abweichen - + CreateOrder:LateSale Bestellung anlegen: bis zu Veranstaltungsbeginn erlauben - + CreateOrder:AfterTheFactSale Bestellung anlegen: auch nach der Veranstaltung erlauben (Adminfunktion) - + CreateOrder:CanOrder Bestellung anlegen: Nutzer darf bestellen - + CreateOrder:CanSell Bestellung anlegen: Nutzer darf verkaufen - + + CreateOrder:CanOrderTicket + + + + + CreateOrder:CanOrderVoucher + + + + + CreateOrder:CanOrderItem + + + + CreateReservation:LateReserve Reservierung anlegen: bis Veranstaltungsbeginn erlauben - + CancelOrder:CancelSentOrder Bestellung stornieren: auch für bereits versandte Bestellung - + CancelOrder:CancelPastTickets Bestellung stornieren: auch für Bestellung mit Karten vergangener Veranstaltungen - + OrderChangeShipping:ChangePrice Versandoption einer Bestellung ändern: beliebigen Preis erlauben - + OrderMarkShipped:SetTime Bestellung als verschickt markieren: beliebigen Zeitpunkt erlauben - + ReturnTicketVoucher:ReturnPastTicket Eintrittskarte oder Gutschein zurückgeben: auch abgelaufene Karten erlauben - + ChangeTicketPrice:ChangeUsedTicket Ticketpreis ändern: auch bereits genutzte Karten - + ChangeTicketPrice:ChangePastTicket Ticketpreis ändern: auch abgelaufene Karten - + ChangeTicketPriceCategory:ChangeUsedTicket Kartenkategorie ändern: Nutzer darf benutzte Karte ändern - + ChangeTicketPriceCategory:ChangePastTicket Kartenkategorie ändern: Nutzer darf Karte für Veranstaltung ändern, die schon vorbei ist @@ -4966,22 +4987,22 @@ Verbleibender Betrag auf dem Gutschein: %4 MOverview - + &Session &Session - + &Re-Login &Login wiederholen - + Switch to Wizard... Auf Assistent umschalten... - + &Close Session Session &schließen @@ -4994,50 +5015,50 @@ Verbleibender Betrag auf dem Gutschein: %4 &Kunde - + Events Veranstaltungen - + Return &ticket or voucher... Eintrittskarte oder Gutschein zurückgeben... - + &Actions &Aktionen - + Tickets and &Vouchers Eintrittskarten und Gutscheine - + &Empty voucher... Gutschein entleeren... - + &Templates Vorlagen - + &Configuration Konfiguration - - - - - - - - - + + + + + + + + + Warning Warnung @@ -5054,7 +5075,7 @@ Verbleibender Betrag auf dem Gutschein: %4 &Neue Veranstaltung... - + &Show all customers &Alle Kunden anzeigen @@ -5091,7 +5112,7 @@ Verbleibender Betrag auf dem Gutschein: %4 Bestellen... - + Shopping Cart Einkaufswagen @@ -5201,7 +5222,7 @@ Verbleibender Betrag auf dem Gutschein: %4 Beschreibung von Nutzer %1: - + Change my &Password Mein &Passwort ändern @@ -5250,7 +5271,7 @@ Verbleibender Betrag auf dem Gutschein: %4 Nutzer '%1' wirklich löschen? - + Error setting password: %1 Passwort kann nicht gesetzt werden: %1 @@ -5345,7 +5366,7 @@ Verbleibender Betrag auf dem Gutschein: %4 Bestellung prüfen - + Order List Bestellungsliste @@ -5382,7 +5403,7 @@ Verbleibender Betrag auf dem Gutschein: %4 Auswählen - + Cancel Abbrechen @@ -5403,7 +5424,7 @@ Verbleibender Betrag auf dem Gutschein: %4 Die Bestellung ist fehlgeschlagen: %1 - + Entrance Einlasskontrolle @@ -5573,7 +5594,7 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück. &Backupzeit festlegen... - + &Backup now... &Jetzt Backup machen... @@ -5647,151 +5668,151 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück. Konfigurieren - + &Auto-Refresh settings... Auto-Auffrisch-Einstellungen... - + &Display settings... Anzeigeeinstellungen... - + &Administration &Administration - + &User Administration... Nutzerverwaltung... - + Return Ticket/Voucher Eintrittskarte/Gutschein zurückgeben - + Please enter the ticket or voucher ID to return: Bitte geben Sie die Eintrittskarten- oder Gutscheinnummer ein, die zurückgegeben werden soll: - + This ticket/voucher cannot be returned: %1 Diese Karte/dieser Gutschein kann nicht zurückgegeben werden: %1 - + Reason for deducting: Grund für den Abzug: - + Unable to deduct voucher: %1 Kann kein Geld von diesem Gutschein abziehen: %1 - + Voucher does not contain enough money. Money left: %1 Dieser Gutschein hat nicht genug Restwert: %1 - + Invalidate Voucher Ungültiger Gutschein - + Please enter/scan the barcode of the voucher to invalidate/empty - the voucher will no longer be usable afterwards, but still has to be paid for. Bitte scannen Sie den Barcode des Gutscheins der ungültig gemacht werden soll. Der Gutschein wird danach nicht mehr nutzbar sein, aber muss trotzdem bezahlt werden. - + Unable to invalidate voucher: %1 Kann Gutschein nicht ungültig machen: %1 - + Invalidated Voucher Gutschein ungültig - + The voucher '%1'has been invalidated. Der Gutschein '%1' wurde ungültig gemacht. - + Refresh Settings Auffrischeinstellungen - + Refresh Rate (minutes): Auffrischrate (Minuten): - + refresh &event list Veranstaltungsliste auffrischen - + refresh &user list Nutzerliste auffrischen - + refresh &host list Rechnerliste auffrischen - - - + + + &OK &Ok - - - + + + &Cancel &Abbrechen - + No Logging Kein Log - + Medium Logging Mittlere Logdetails - + Display Settings Anzeigeeinstellungen - + Event settings Veranstaltungseinstellungen - + Maximum event age (days, 0=show all): Maximales Veranstaltungsalter (in Tagen, 0=alle anzeigen): - + &Edit Templates... Vorlagen ändern... - + &Update Templates Now Vorlagen jetzt auffrischen @@ -5808,7 +5829,7 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück. Gutschein zurückgeben... - + Edit &Shipping Options... Versandoptionen editieren @@ -5861,7 +5882,7 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück. Dieser Gutschein kann nicht zurückgegeben werden, er wurde bereits benutzt. - + refresh &shipping list Versandoptionen auffrischen @@ -5882,7 +5903,7 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück. Diese Bestellung existiert nicht. - + &Deduct from voucher... Geld von Gutschein abziehen... @@ -5895,12 +5916,12 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück. Geldtransfers von Nutzer... - + &Server Access settings... Serverzugriffseinstellungen... - + Backup &Settings... Einstellungen Sicherungskopie... @@ -5913,27 +5934,27 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück. Karte "%1" ist nicht für diese Veranstaltung. - + Deduct from Voucher Von Gutschein abziehen - + Using a voucher to pay outside the system. Einen Gutschein nutzen um außerhalb des Systems zu bezahlen. - + Amount to deduct: Abzuziehender Betrag: - + Voucher ID: Gutscheinnummer: - + OK Ok @@ -5942,44 +5963,44 @@ Die Bestellung ist überbezahlt: es gibt noch Geld zurück. Anfrage ist fehlgeschlagen. - + Deducted from Voucher Von Gutschein abziehen - + Value taken from voucher: %1 Value remaining on voucher: %2 Vom Gutschein abgezogener Betrag: %1 Verbleibender Betrag: %2 - + Server Access Settings Serverzugriffseinstellungen - + Request Timeout (seconds): max. Anfragezeit (Sekunden): - + Log Level: Logstufe: - + Minimal Logging Minimales Log - + Log Details on Error Bei Fehlern Details - + Always Log Details Immer Details @@ -5988,17 +6009,17 @@ Verbleibender Betrag: %2 Sicherung ist fehlgeschlagen: %1 - + Backup Sicherung - + The backup was successful. Die Sicherung war erfolgreich. - + Cannot create backup file. Kann Sicherungsdatei nicht anlegen. @@ -6019,62 +6040,62 @@ Verbleibender Betrag: %2 Bitte den Login-Namen des Nutzers eingeben um die Transaktionen anzuzeigen: - + I was unable to renew the login at the server. Der Login am Server konnte nicht erneuert werden. - + Maximum order list age Maximales Alter von Bestellungen in der Liste - + Age in days, 0=show all. Alter in Tagen, 0=alle zeigen. - + When showing all orders: Wenn alle Bestellungen angezeigt werden: - + When showing open orders: Wenn offene Bestellungen angezeigt werden: - + When searching by event: Wenn nach Veranstaltung gesucht wird: - + When searching by customer: Wenn nach Kunde gesucht wird: - + Default age when searching by date: Standardalter wenn nach Datum gesucht wird: - + Script settings Scripteinstellungen - + Show script debugger: Script-Debugger zeigen: - + Backup failed with error (%2): %1 Das Backup ist mit Fehler (%2) fehlgeschlagen: %1 - + Backup returned empty. Das Backup ist leer. @@ -8154,6 +8175,7 @@ Offset von UTC: %2 Minuten %3 + @@ -8258,6 +8280,7 @@ Offset von UTC: %2 Minuten %3 + diff --git a/src/smoke_de_SAX.ts b/src/smoke_de_SAX.ts index b67a089..9a37b1c 100644 --- a/src/smoke_de_SAX.ts +++ b/src/smoke_de_SAX.ts @@ -9,32 +9,32 @@ - + &Window - + &Close &Schließen - + Users Nudsor - + Roles - + Hosts Reschnor - + Flags @@ -42,27 +42,27 @@ MAddressChoiceDialog - + Chose an Address - + Add Address - + Cancel - + Warning Dumm gelaufen - + Unable to save changes made to addresses: %1 @@ -70,107 +70,107 @@ MAddressDialog - + Edit Address - + Create Address - + Last used: - + Name: Dor Name: - - + + Address: De Adresse: - + City: - + State: - + ZIP Code: - + Country: - - + + Ok Is gud so. - - + + Cancel - + Create New Country... must contain leading space to distinguish it from genuine countries - + Select Country - + Please select a country: - + Create New Country - + Country Name: - + Abbreviation: - - + + Warning Dumm gelaufen - + The country name and abbreviation must contain something! - + Error while creating country: %1 @@ -178,27 +178,27 @@ MAddressWidget - + Select - + Edit - + Delete - + Delete Address - + Really delete this address? %1 @@ -373,12 +373,12 @@ Wechwerfen und von vorne! - + Add &Ticket Ein&driddsgarde hinzufüchen - + Add &Voucher &Gudschein hinzufüchen @@ -398,227 +398,227 @@ - + Add &Shop-Item - + &Remove Line - + &Abort Shopping &Eingauf Abbrechen - + &Update Shipping Options Jedsd soford Versandmedoden nachguggn - + (No Shipping) (gar gee Vorsand) - + Amount Anzahl - + Title Diddel - + Start Time Anfangszeit - + Price Breis - - - - - - - + + + + + + + Warning Dumm gelaufen - + Please set the customer first. - + Select Event to order Ticket Wähl ma ne Voranschdaldung aus um ne Garde zu beschdelln - + Select - - - + + + Cancel - + Error getting event, please try again. - + This event has no prices associated. Cannot sell tickets. - + Select Price Category - + Please chose a price category: - - + + Ok Is gud so. - + Select Voucher Gudschein auswähln - + Select voucher price and value: Beschdimm mal 'n Gudscheinpreis und -werd: - + Price: Breis: - + Value: Werd: - + Voucher (value %1) - + There are problems with the contents of the cart, please check and then try again. - - + + Error Gans doller falschor Fehler - + There is nothing in the order. Ignoring it. Da is doch gar nischd drin. Isch mach das jedsd ni! - + Please chose a customer first! Du mussd schon nen Gunden auswähln, sonsd wees isch doch ni wer's griechen soll! - + Shipping - + You have chosen a shipping method, but no address. Are you sure you want to continue? - + Reservations can only contain tickets. - + Error while creating reservation: %1 - + Error while creating order: %1 - + The customer is not valid, please chose another one. - + The delivery address is not valid, please chose another one. - + The invoice address is not valid, please chose another one. - + Shipping Type does not exist or you do not have permission to use it. - + The event is already over, please remove this entry. - + You cannot order tickets for this event anymore, ask a more privileged user. - + The event is (almost) sold out, there are %1 tickets left. - + The event does not exist or there is another serious problem, please remove this entry. - + You do not have permission to create vouchers with this value, please remove it. - + The price tag of this voucher is not valid, please remove and recreate it. @@ -1003,42 +1003,42 @@ Priority: locations with the lowest value are searched first, when a script it f MContactTableDelegate - + (New Contact Type) - + Create new Contact Type - + Contact Type Name: - + Contact Type URI Prefix: - + Ok Is gud so. - + Cancel - + Warning Dumm gelaufen - + Error while creating contact type: %1 @@ -1141,17 +1141,22 @@ Priority: locations with the lowest value are searched first, when a script it f - + + Unable to set new email: %1 + + + + Error while resetting password: %1 - + Password Reset - + A password reset mail has been sent to the customer. @@ -1179,7 +1184,8 @@ Priority: locations with the lowest value are searched first, when a script it f - + + Warning Dumm gelaufen @@ -1352,88 +1358,88 @@ Priority: locations with the lowest value are searched first, when a script it f - + searching... entrance control - + Ticket "%1" Not Valid De Garde "%1" is ni güldsch. - + Ticket "%1" is not for this event. - + Ticket "%1" has already been used De Garde "%1" wurde schonma benudsd. - + Ticket "%1" has not been bought. De Garde "%1" wurde ni gegauft. - + Ticket "%1" Ok De Garde "%1" is in Ordnung. - + Ticket "%1" is not paid for! De Garde "%1" is abor ni bedsahld! - + Ticket "%1" cannot be accepted, please check the order! De Garde "%1" gönnmor so abor ni agsebdiern. Schegg ma' de Beschdellung! - + Warning Dumm gelaufen - + Error while retrieving order: %1 - + Entrance Configuration - + Show events that start within hours: - + Show events a maximum of hours after they end: - + Use Cache: - + Cache update interval: - + Ok Is gud so. - + Cancel @@ -1916,57 +1922,57 @@ Priority: locations with the lowest value are searched first, when a script it f &Veranschdaldung - + &Update Event List &Voranschdaldungsliste nochma holen - + &Show/Edit details... &Dedails anzeichen... - + &New Event... Veranschdaldung &absach'n... - + Show &old Events Aldes Zeuch zeichen - + &Edit Price Categories... - + Start Time Anfangszeit - + Title Diddel - + Free Frei - + Reserved Resorvierd - + Sold Vergaufd - + Capacity Magsimale Gäsde @@ -1976,32 +1982,32 @@ Priority: locations with the lowest value are searched first, when a script it f ddd, d.M.yyyy hh:mm - + Cancel Event Veranschdaldung absach'n - + Please enter a reason to cancel event "%1" or abort: Nu' gib mir ma'n rischdsch guden Grund warum Du de Veranschdaldung "%1" absachn willsd oder lass'es sein: - + Event Cancelled Veranschaldung abgesachd - + The event "%1" has been cancelled. Please inform everybody who bought a ticket. De Veranschdaldung "%1" wurde abgesacht. Bidde sorsch ma dafür dass och jedor Bescheid wees. - + Warning Dumm gelaufen - + Unable to cancel event "%1": %2. @@ -2292,587 +2298,602 @@ Priority: locations with the lowest value are searched first, when a script it f MInterface - + Backup - + GetLanguage - + ServerInfo - + Login Droff offn' Reschnor - + Logout - + GetMyRoles - + GetMyRights - + ChangeMyPassword - + GetAllUsers - + CreateUser - + ChangePassword - + DeleteUser - + SetUserDescription - + GetUserRoles - + SetUserRoles - + GetAllRoles - + GetRole - + CreateRole - + SetRoleDescription - + SetRoleRights - + DeleteRole - + GetAllRightNames - + GetAllHostNames - + GetAllHosts - + SetHost - + DeleteHost - + GetUserHosts - + GetValidFlags - + SetFlag - + DeleteFlag - + GetUser - + SetUserHosts - + SetUserFlags - + SetRoleFlags - + GetAllContactTypes - + CreateContactType - + GetCustomer - + GetAllCustomerNames - + CreateCustomer - + ChangeCustomer - + DeleteCustomer - + GetAddress - + GetAllCountries - + CreateCountry - + ResetCustomerPassword - + GetAllArtists - + CreateArtist - + GetAllPriceCategories - + CreatePriceCategory - + ChangePriceCategory - + GetEvent - + GetAllEvents - + GetEventList - + CreateEvent - + ChangeEvent - + CancelEvent - + GetAllRooms - + CreateRoom - + GetEventSummary - + GetTicket - + GetVoucher - + GetVoucherAudit - + GetOrderAudit - + GetOrder - + GetOrderList - + GetOrdersByEvents - + GetOrdersByCustomer - + GetOrderByBarcode - + CreateOrder - + CreateReservation - + ReservationToOrder - + CancelOrder - + OrderPay - + OrderRefund - + UseVoucher - + DeductVoucher - + EmptyVoucher - + OrderChangeShipping - + OrderMarkShipped - + OrderAddComment - + OrderChangeComments - + ReturnTicketVoucher - + ChangeTicketPrice - + ChangeTicketPriceCategory - + GetAllShipping - + ChangeShipping - + CreateShipping - + DeleteShipping - + GetValidVoucherPrices - + UseTicket - + GetEntranceEvents - + WebCartAddTicket - + WebCartRemoveTicket - + WebCartAddVoucher - + WebCartRemoveVoucher - + GetTemplateList - + GetTemplate - + SetTemplate - + SetTemplateDescription - + DeleteTemplate - + ChangeEvent:CancelEvent - + CreateOrder:AnyVoucherValue - + CreateOrder:DiffVoucherValuePrice - + CreateOrder:LateSale - + CreateOrder:AfterTheFactSale - + CreateOrder:CanOrder - + CreateOrder:CanSell - + + CreateOrder:CanOrderTicket + + + + + CreateOrder:CanOrderVoucher + + + + + CreateOrder:CanOrderItem + + + + CreateReservation:LateReserve - + CancelOrder:CancelSentOrder - + CancelOrder:CancelPastTickets - + OrderChangeShipping:ChangePrice - + OrderMarkShipped:SetTime - + ReturnTicketVoucher:ReturnPastTicket - + ChangeTicketPrice:ChangeUsedTicket - + ChangeTicketPrice:ChangePastTicket - + ChangeTicketPriceCategory:ChangeUsedTicket - + ChangeTicketPriceCategory:ChangePastTicket @@ -4935,17 +4956,17 @@ Remaining value of this voucher: %4 MOverview - + &Session &Sidsung - + &Re-Login &Noch'ma einloggn - + &Close Session Sidsung &Zumachn @@ -4958,20 +4979,20 @@ Remaining value of this voucher: %4 &Gunde - + Events Veranschdaldungen - - - - - - - - - + + + + + + + + + Warning Dumm gelaufen @@ -4988,7 +5009,7 @@ Remaining value of this voucher: %4 Veranschdaldung &absach'n... - + &Show all customers &Alle Gunden anzeigen @@ -5025,7 +5046,7 @@ Remaining value of this voucher: %4 Eindriddsgarde beschdellen... - + Shopping Cart Eingaufswagen @@ -5135,7 +5156,7 @@ Remaining value of this voucher: %4 Beschreibung vom Nudsor %1: - + Change my &Password Mei eechnes &Bassword ändorn @@ -5184,7 +5205,7 @@ Remaining value of this voucher: %4 Nudsor '%1' wirklich löschen? Bissde Dir da och gans sischor? - + Error setting password: %1 Gann Bassword ni sedsen: %1 @@ -5279,7 +5300,7 @@ Remaining value of this voucher: %4 Ne Beschdellung anlegn. - + Order List Beschdelllisde @@ -5316,7 +5337,7 @@ Remaining value of this voucher: %4 Auswähln - + Cancel Ni machen @@ -5337,7 +5358,7 @@ Remaining value of this voucher: %4 Isch hadde nen Broblem mit dor Beschdellung: %1 - + Entrance Einlassgondrolle @@ -5506,7 +5527,7 @@ Remaining value of this voucher: %4 &Zeit für Sischerungsgobie fesdlechn... - + &Backup now... Jedsd &Sischorungsgobie anleschn... @@ -5580,61 +5601,61 @@ Remaining value of this voucher: %4 Gonfiguriern - + &Auto-Refresh settings... Schdändisch-Nachgugg-Einschdellungen... - + &Display settings... - + Refresh Settings Schdändisch-Nachgugg-Einschdellungen - + Refresh Rate (minutes): Nachguggfregwens (Minuden) - + refresh &event list Veranschdaldungslisde nachguggn - + refresh &user list Nudsorlisde nachguggn - + refresh &host list Reschnorlisde nachguggn - - - + + + &OK Nu &glar! Nehm'sch. - - - + + + &Cancel &Nee lass mal. - + &Edit Templates... Vorlachen bearbeeden... - + &Update Templates Now Jedsd soford nochmal nachguggen was es neues gibd @@ -5651,7 +5672,7 @@ Remaining value of this voucher: %4 Gudschein zurüggeben... - + Edit &Shipping Options... Versandmedoden bearbeeden... @@ -5704,288 +5725,288 @@ Remaining value of this voucher: %4 Den Gudschein gannsch ni zurügnehm. Der wurde schonma benudsd, der iss ja schon angebissn. - + refresh &shipping list Versandmedoden offfrischen - + &Deduct from voucher... - + Switch to Wizard... - + &Actions - + Tickets and &Vouchers - + Return &ticket or voucher... - + &Empty voucher... - + &Templates - + &Configuration - + &Server Access settings... - + &Administration - + &User Administration... - + Backup &Settings... - + Return Ticket/Voucher - + Please enter the ticket or voucher ID to return: - + This ticket/voucher cannot be returned: %1 - + Deduct from Voucher - + Using a voucher to pay outside the system. - + Amount to deduct: - + Reason for deducting: - + Voucher ID: - + OK - + Unable to deduct voucher: %1 - + Voucher does not contain enough money. Money left: %1 - + Deducted from Voucher - + Value taken from voucher: %1 Value remaining on voucher: %2 - + Invalidate Voucher - + Please enter/scan the barcode of the voucher to invalidate/empty - the voucher will no longer be usable afterwards, but still has to be paid for. - + Unable to invalidate voucher: %1 - + Invalidated Voucher - + The voucher '%1'has been invalidated. - + Server Access Settings - + Request Timeout (seconds): - + Log Level: - + No Logging - + Minimal Logging - + Medium Logging - + Log Details on Error - + Always Log Details - + Display Settings - + Event settings - + Maximum event age (days, 0=show all): - + Backup - + The backup was successful. - + Cannot create backup file. - + I was unable to renew the login at the server. - + Maximum order list age - + Age in days, 0=show all. - + When showing all orders: - + When showing open orders: - + When searching by event: - + When searching by customer: - + Default age when searching by date: - + Script settings - + Show script debugger: - + Backup failed with error (%2): %1 - + Backup returned empty. @@ -8013,6 +8034,7 @@ Offset from UTC: %2 minutes %3 + @@ -8117,6 +8139,7 @@ Offset from UTC: %2 minutes %3 + diff --git a/src/smoke_en.ts b/src/smoke_en.ts index 51dc9e2..c009426 100644 --- a/src/smoke_en.ts +++ b/src/smoke_en.ts @@ -9,32 +9,32 @@ - + &Window - + &Close - + Users - + Roles - + Hosts - + Flags @@ -42,27 +42,27 @@ MAddressChoiceDialog - + Chose an Address - + Add Address - + Cancel - + Warning - + Unable to save changes made to addresses: %1 @@ -70,107 +70,107 @@ MAddressDialog - + Edit Address - + Create Address - + Last used: - + Name: - - + + Address: - + City: - + State: - + ZIP Code: - + Country: - - + + Ok - - + + Cancel - + Create New Country... must contain leading space to distinguish it from genuine countries - + Select Country - + Please select a country: - + Create New Country - + Country Name: - + Abbreviation: - - + + Warning - + The country name and abbreviation must contain something! - + Error while creating country: %1 @@ -178,27 +178,27 @@ MAddressWidget - + Select - + Edit - + Delete - + Delete Address - + Really delete this address? %1 @@ -373,12 +373,12 @@ - + Add &Ticket - + Add &Voucher @@ -398,227 +398,227 @@ - + Add &Shop-Item - + &Remove Line - + &Abort Shopping - + &Update Shipping Options - + (No Shipping) - + Amount - + Title - + Start Time - + Price - - - - - - - + + + + + + + Warning - + Please set the customer first. - + Select Event to order Ticket - + Select - - - + + + Cancel - + Error getting event, please try again. - + This event has no prices associated. Cannot sell tickets. - + Select Price Category - + Please chose a price category: - - + + Ok - + Select Voucher - + Select voucher price and value: - + Price: - + Value: - + Voucher (value %1) - + There are problems with the contents of the cart, please check and then try again. - - + + Error - + There is nothing in the order. Ignoring it. - + Please chose a customer first! - + Shipping - + You have chosen a shipping method, but no address. Are you sure you want to continue? - + Reservations can only contain tickets. - + Error while creating reservation: %1 - + Error while creating order: %1 - + The customer is not valid, please chose another one. - + The delivery address is not valid, please chose another one. - + The invoice address is not valid, please chose another one. - + Shipping Type does not exist or you do not have permission to use it. - + The event is already over, please remove this entry. - + You cannot order tickets for this event anymore, ask a more privileged user. - + The event is (almost) sold out, there are %1 tickets left. - + The event does not exist or there is another serious problem, please remove this entry. - + You do not have permission to create vouchers with this value, please remove it. - + The price tag of this voucher is not valid, please remove and recreate it. @@ -1003,42 +1003,42 @@ Priority: locations with the lowest value are searched first, when a script it f MContactTableDelegate - + (New Contact Type) - + Create new Contact Type - + Contact Type Name: - + Contact Type URI Prefix: - + Ok - + Cancel - + Warning - + Error while creating contact type: %1 @@ -1144,17 +1144,22 @@ Priority: locations with the lowest value are searched first, when a script it f - + + Unable to set new email: %1 + + + + Error while resetting password: %1 - + Password Reset - + A password reset mail has been sent to the customer. @@ -1171,7 +1176,8 @@ Priority: locations with the lowest value are searched first, when a script it f - + + Warning @@ -1340,88 +1346,88 @@ Priority: locations with the lowest value are searched first, when a script it f - + searching... entrance control - + Ticket "%1" Not Valid - + Ticket "%1" is not for this event. - + Ticket "%1" has already been used - + Ticket "%1" has not been bought. - + Ticket "%1" Ok - + Ticket "%1" is not paid for! - + Ticket "%1" cannot be accepted, please check the order! - + Warning - + Error while retrieving order: %1 - + Entrance Configuration - + Show events that start within hours: - + Show events a maximum of hours after they end: - + Use Cache: - + Cache update interval: - + Ok - + Cancel @@ -1851,87 +1857,87 @@ Priority: locations with the lowest value are searched first, when a script it f - + &Update Event List - + &Show/Edit details... - + &New Event... - + Show &old Events - + &Edit Price Categories... - + Start Time - + Title - + Free - + Reserved - + Sold - + Capacity - + Cancel Event - + Please enter a reason to cancel event "%1" or abort: - + Event Cancelled - + The event "%1" has been cancelled. Please inform everybody who bought a ticket. - + Warning - + Unable to cancel event "%1": %2. @@ -2218,587 +2224,602 @@ Priority: locations with the lowest value are searched first, when a script it f MInterface - + Backup - + GetLanguage - + ServerInfo - + Login - + Logout - + GetMyRoles - + GetMyRights - + ChangeMyPassword - + GetAllUsers - + CreateUser - + ChangePassword - + DeleteUser - + SetUserDescription - + GetUserRoles - + SetUserRoles - + GetAllRoles - + GetRole - + CreateRole - + SetRoleDescription - + SetRoleRights - + DeleteRole - + GetAllRightNames - + GetAllHostNames - + GetAllHosts - + SetHost - + DeleteHost - + GetUserHosts - + GetValidFlags - + SetFlag - + DeleteFlag - + GetUser - + SetUserHosts - + SetUserFlags - + SetRoleFlags - + GetAllContactTypes - + CreateContactType - + GetCustomer - + GetAllCustomerNames - + CreateCustomer - + ChangeCustomer - + DeleteCustomer - + GetAddress - + GetAllCountries - + CreateCountry - + ResetCustomerPassword - + GetAllArtists - + CreateArtist - + GetAllPriceCategories - + CreatePriceCategory - + ChangePriceCategory - + GetEvent - + GetAllEvents - + GetEventList - + CreateEvent - + ChangeEvent - + CancelEvent - + GetAllRooms - + CreateRoom - + GetEventSummary - + GetTicket - + GetVoucher - + GetVoucherAudit - + GetOrderAudit - + GetOrder - + GetOrderList - + GetOrdersByEvents - + GetOrdersByCustomer - + GetOrderByBarcode - + CreateOrder - + CreateReservation - + ReservationToOrder - + CancelOrder - + OrderPay - + OrderRefund - + UseVoucher - + DeductVoucher - + EmptyVoucher - + OrderChangeShipping - + OrderMarkShipped - + OrderAddComment - + OrderChangeComments - + ReturnTicketVoucher - + ChangeTicketPrice - + ChangeTicketPriceCategory - + GetAllShipping - + ChangeShipping - + CreateShipping - + DeleteShipping - + GetValidVoucherPrices - + UseTicket - + GetEntranceEvents - + WebCartAddTicket - + WebCartRemoveTicket - + WebCartAddVoucher - + WebCartRemoveVoucher - + GetTemplateList - + GetTemplate - + SetTemplate - + SetTemplateDescription - + DeleteTemplate - + ChangeEvent:CancelEvent - + CreateOrder:AnyVoucherValue - + CreateOrder:DiffVoucherValuePrice - + CreateOrder:LateSale - + CreateOrder:AfterTheFactSale - + CreateOrder:CanOrder - + CreateOrder:CanSell - + + CreateOrder:CanOrderTicket + + + + + CreateOrder:CanOrderVoucher + + + + + CreateOrder:CanOrderItem + + + + CreateReservation:LateReserve - + CancelOrder:CancelSentOrder - + CancelOrder:CancelPastTickets - + OrderChangeShipping:ChangePrice - + OrderMarkShipped:SetTime - + ReturnTicketVoucher:ReturnPastTicket - + ChangeTicketPrice:ChangeUsedTicket - + ChangeTicketPrice:ChangePastTicket - + ChangeTicketPriceCategory:ChangeUsedTicket - + ChangeTicketPriceCategory:ChangePastTicket @@ -4479,80 +4500,80 @@ Remaining value of this voucher: %4 MOverview - + &Session - + &Re-Login - + Change my &Password - + &Close Session - + &Show all customers - + &Auto-Refresh settings... - + &Display settings... - + &Backup now... - + Events - + Shopping Cart - + Order List - + Entrance - - - - - - - - - + + + + + + + + + Warning - + Error setting password: %1 @@ -4571,347 +4592,347 @@ Remaining value of this voucher: %4 - + Refresh Settings - + Refresh Rate (minutes): - + refresh &event list - + refresh &user list - + refresh &host list - - - + + + &OK - - - + + + &Cancel - + &Edit Templates... - + &Update Templates Now - + Edit &Shipping Options... - + refresh &shipping list - + &Deduct from voucher... - + Switch to Wizard... - + &Actions - + Tickets and &Vouchers - + Return &ticket or voucher... - + &Empty voucher... - + &Templates - + &Configuration - + &Server Access settings... - + &Administration - + &User Administration... - + Backup &Settings... - + Return Ticket/Voucher - + Please enter the ticket or voucher ID to return: - + This ticket/voucher cannot be returned: %1 - + Deduct from Voucher - + Using a voucher to pay outside the system. - + Amount to deduct: - + Reason for deducting: - + Voucher ID: - + OK - + Cancel - + Unable to deduct voucher: %1 - + Voucher does not contain enough money. Money left: %1 - + Deducted from Voucher - + Value taken from voucher: %1 Value remaining on voucher: %2 - + Invalidate Voucher - + Please enter/scan the barcode of the voucher to invalidate/empty - the voucher will no longer be usable afterwards, but still has to be paid for. - + Unable to invalidate voucher: %1 - + Invalidated Voucher - + The voucher '%1'has been invalidated. - + Server Access Settings - + Request Timeout (seconds): - + Log Level: - + No Logging - + Minimal Logging - + Medium Logging - + Log Details on Error - + Always Log Details - + Display Settings - + Event settings - + Maximum event age (days, 0=show all): - + Backup - + The backup was successful. - + Cannot create backup file. - + I was unable to renew the login at the server. - + Maximum order list age - + Age in days, 0=show all. - + When showing all orders: - + When showing open orders: - + When searching by event: - + When searching by customer: - + Default age when searching by date: - + Script settings - + Show script debugger: - + Backup failed with error (%2): %1 - + Backup returned empty. @@ -6608,6 +6629,7 @@ Offset from UTC: %2 minutes %3 + @@ -6712,6 +6734,7 @@ Offset from UTC: %2 minutes %3 + diff --git a/www/inc/machine/autoload.php b/www/inc/machine/autoload.php index a58b6d5..8a3a7ff 100644 --- a/www/inc/machine/autoload.php +++ b/www/inc/machine/autoload.php @@ -5,8 +5,6 @@ wob_autoclass("Session","./inc/machine/session.php"); -wob_autoclass("Host","./inc/machine/host.php"); -wob_autoclass("Template","./inc/machine/template.php"); wob_autoclass("Version","./inc/machine/version.php"); wob_autoclass("Translation","./inc/machine/translation.php"); wob_autoclass("MachineUser","./inc/machine/muser.php"); diff --git a/www/inc/machine/host.php b/www/inc/machine/host.php deleted file mode 100644 index 6491473..0000000 --- a/www/inc/machine/host.php +++ /dev/null @@ -1,95 +0,0 @@ -select("host","hostname,hostkey",""); - $dom=new DomDocument; - $root=$dom->createElement("Hosts"); - for($i=0;$icreateElement("Host",$res[$i]["hostkey"]); - $hst->setAttributeNode(new DOMAttr("name",$res[$i]["hostname"])); - $root->appendChild($hst); - } - $dom->appendChild($root); - print($dom->saveXML()); -} - -//create a new host -function addHostXml($txt) -{ - global $db; - $hlist=parseHostXml($txt); - foreach($hlist as $host){ - //check name - if(ereg("^[A-Za-z][A-Za-z0-9_]*$",$host["name"])===false)continue; - //create - $db->insert("host",array("hostname"=>$host["name"],"hostkey"=>$host["key"])); - } - header("X-MagicSmoke-Status: Ok"); - //FIXME: return a useful answer -} - -//change a host -function setHostXml($txt) -{ - global $db; - $hlist=parseHostXml($txt); - foreach($hlist as $host){ - //check name - if(ereg("^[A-Za-z][A-Za-z0-9_]*$",$host["name"])===false)continue; - //update - $db->update("host",array("hostkey"=>$host["key"]),"hostname=".$db->escapeString($host["name"])); - } - header("X-MagicSmoke-Status: Ok"); - //FIXME: return a useful answer -} - -//helper: parse host data -function parseHostXml($txt) -{ - $xml=new DOMDocument; - if(!$xml->loadXML($txt)){ - header("X-MagicSmoke-Status: SyntaxError"); - die(tr("unable to parse XML data")); - } - $ret=array(); - foreach($xml->getElementsByTagName("Host") as $el){ - $usr["name"]=$el->getAttribute("name"); - $usr["key"]=""; - foreach($el->childNodes as $cn) - if($cn->nodeType==XML_TEXT_NODE) - $usr["key"]=$cn->wholeText; - $ret[]=$usr; - } - return $ret; -} - -//delete a host -function deleteHostXml($txt) -{ - global $db; - $hst=trim($txt); - //check syntax - if(substr($hst,0,1)=="_"){ - header("X-MagicSmoke-Status: Error"); - die(tr("Cannot delete special hosts.")); - } - //delete Host from users - $db->deleteRows("userhosts","host=".$db->escapeString($hst)); - //delete Host - $db->deleteRows("host","hostname=".$db->escapeString($hst)); - //say OK anyway; FIXME: check for success above - header("X-MagicSmoke-Status: Ok"); -} - - -?> \ No newline at end of file diff --git a/www/inc/machine/template.php b/www/inc/machine/template.php deleted file mode 100644 index 0253052..0000000 --- a/www/inc/machine/template.php +++ /dev/null @@ -1,104 +0,0 @@ -createElement("TList"); - $res=$db->select("template","filename,hash,description",""); - for($i=0;$icreateElement("Template"); - $el->setAttribute("name",$res[$i]["filename"]); - $el->setAttribute("hash",$res[$i]["hash"]); - if(!$db->isNull($res[$i]["description"])) - $el->appendChild($xml->createTextNode($res[$i]["description"])); - $root->appendChild($el); - } - $xml->appendChild($root); - print($xml->saveXml()); -} - -function getTemplate($fname) -{ - global $db; - $res=$db->select("template","content","filename=".$db->escapeString($fname)); - if(count($res)==0){ - header("X-MagicSmoke-Status: Error"); - die(tr("Template File not found in database")); - } - header("X-MagicSmoke-Status: Ok"); - print($res[0]["content"]); -} - -function setTemplate($data) -{ - $pos=strpos($data,"\n"); - if($pos===false){ - header("X-MagicSmoke-Status: Error"); - die(tr("Unable to find file name")); - } - //split - $fname=strtolower(trim(substr($data,0,$pos))); - $data=substr($data,$pos+1); - //syntax check - if(ereg("^[a-z0-9_]+\\.[a-z0-9_]+(,[a-z0-9_]+)?$",$fname)===false){ - header("X-MagicSmoke-Status: Error"); - die(tr("Illegal File Name")); - } - //store - $hash=md5($data); - global $db; - $db->beginTransaction(); - $res=$db->select("template","filename","filename=".$db->escapeString($fname)); - if(count($res)==1){ - $db->update("template",array("content"=>$data,"hash"=>$hash),"filename=".$db->escapeString($fname)); - }else{ - $db->insert("template",array("content"=>$data,"hash"=>$hash,"filename"=>$fname)); - } - $db->commitTransaction(); - header("X-MagicSmoke-Status: Ok"); - echo $hash; -} - -function setTemplateDescription($data) -{ - $pos=strpos($data,"\n"); - if($pos===false){ - header("X-MagicSmoke-Status: Error"); - die(tr("Unable to find file name")); - } - //split - $fname=strtolower(trim(substr($data,0,$pos))); - $data=substr($data,$pos+1); - //syntax check - if(ereg("^[a-z0-9_]+\\.[a-z0-9_]+(,[a-z0-9_]+)?$",$fname)===false){ - header("X-MagicSmoke-Status: Error"); - die(tr("Illegal File Name")); - } - //store - global $db; - $r=$db->update("template",array("description"=>$data),"filename=".$db->escapeString($fname)); - if($r===false || $r<1){ - header("X-MagicSmoke-Status: Error"); - die(tr("Template file does not exist")); - } - header("X-MagicSmoke-Status: Ok"); -} - -function deleteTemplate($fname) -{ - global $db; - $db->deleteRows("template","filename=".$db->escapeString($fname)); - header("X-MagicSmoke-Status: Ok"); - echo $hash; -} - -?> \ No newline at end of file diff --git a/www/translations/Makefile b/www/translations/Makefile index 187a932..ea4daa8 100644 --- a/www/translations/Makefile +++ b/www/translations/Makefile @@ -1,17 +1,17 @@ -LUP=lupdate -LRL=lrelease -XPT=xmlpatterns +LUPD=lupdate +LREL=lrelease +XPAT=xmlpatterns all: @echo Please chose a target: lupdate lrelease lupdate: - $(LUP) -extensions php .. -ts server_*.ts + $(LUPD) -extensions php .. -ts server_*.ts lrelease: for i in server_*.ts ; do \ - $(XPT) unify.xsl $$i > _$$i ; \ - $(LRL) _$$i ; \ + $(XPAT) unify.xsl $$i > _$$i ; \ + $(LREL) _$$i ; \ done clean: diff --git a/www/translations/server_de.ts b/www/translations/server_de.ts index ca1260e..829bebb 100644 --- a/www/translations/server_de.ts +++ b/www/translations/server_de.ts @@ -2590,98 +2590,98 @@ Verbleibender Betrag: %2 MachineUser - + User already exists. - + Username is invalid. - - - - - - - - + + + + + + + + User does not exist. - + Merge target user does not exist! - + User and merge target user are identical. - + Trying to assign non-existent role. - + Trying to assign non-existent host. - - - - + + + + Role does not exist. - - + + Trying to assign non-existent flag. - + Illegal role name. - + Role already exists. - + Trying to set an illegal right. - + Cannot delete special roles. - + Cannot set/create special hosts. - + Illegal host name. - + Cannot delete special hosts. Spezialhosts können nicht gelöscht werden. - + Host does not exist. @@ -2689,41 +2689,34 @@ Verbleibender Betrag: %2 Order - create order - Bestellung anlegen + Bestellung anlegen - invalidvalue voucher state - Gutscheinwert nicht zulässig + Gutscheinwert nicht zulässig - invalidprice voucher state - Gutscheinpreis nicht zulässig + Gutscheinpreis nicht zulässig - Shipping type not available to user. - Diese Versandoption ist privilegierten Nutzern vorbehalten. + Diese Versandoption ist privilegierten Nutzern vorbehalten. - Illegal shipping type. - Ungültige Versandoption. + Ungültige Versandoption. - order cancelled - Bestellung storniert + Bestellung storniert - reservation to order - Reservierung zu Bestellung gewandelt + Reservierung zu Bestellung gewandelt @@ -2745,45 +2738,38 @@ Verbleibender Betrag: %2 Nur 1 "passwd" Element erwartet. - + Unknown Host - + Host/User combination not allowed - - + Host authentication failed - - - + + User Authentication failed - + cannot set an empty password Leeres Passwort kann nicht gesetzt werden - + Ooops. Unable to find user. You have been deleted. Ups. Sie wurden gelöscht. - - Ooops. Internal storage error - cannot verify old password. - - - - + Wrong password. Request denied. @@ -2795,7 +2781,7 @@ Verbleibender Betrag: %2 SpecialHost - + _any beliebiger (auch unregistrierter) Host @@ -2811,29 +2797,24 @@ Verbleibender Betrag: %2 Ticket - The ticket is not valid. - Die Karte ist nicht gültig. + Die Karte ist nicht gültig. - The ticket has already been used. - Die Karte wurde bereits benutzt. + Die Karte wurde bereits benutzt. - The ticket has not been bought or is cancelled. - Die Karte wurde nicht gekauft oder ist zurückgegeben. + Die Karte wurde nicht gekauft oder ist zurückgegeben. - The ticket has not been paid. - Die Karte ist nicht bezahlt. + Die Karte ist nicht bezahlt. - The tickets order is in an invalid state or does not exist. - Die Bestellung dieser Karte ist in einem ungültigen Zustand oder existiert nicht. + Die Bestellung dieser Karte ist in einem ungültigen Zustand oder existiert nicht. @@ -3141,17 +3122,17 @@ Verbleibender Betrag: %2 Translation - + Format must be either 'ts' or 'qm'. - + Language invalid. - + Language unknown. @@ -3159,35 +3140,30 @@ Verbleibender Betrag: %2 Voucher - cancel voucher - Gutschein zurückgegeben + Gutschein zurückgegeben - empty voucher - Gutschein entleert + Gutschein entleert - create voucher - Gutschein angelegt + Gutschein angelegt - pay with voucher - mit Gutschein bezahlt + mit Gutschein bezahlt - pay with voucher outside system - mit Gutschein außerhalb des Systems bezahlt + mit Gutschein außerhalb des Systems bezahlt WOAddress - + Unable to deserialize object of type WOAddress: invalid XML. @@ -3195,17 +3171,17 @@ Verbleibender Betrag: %2 WOArtistAbstract - + Artist name must not be empty! - + An artist with this name already exists. - + Unable to deserialize object of type WOArtist: invalid XML. @@ -3213,7 +3189,7 @@ Verbleibender Betrag: %2 WOCartItem - + Unable to deserialize object of type WOCartItem: invalid XML. @@ -3228,47 +3204,67 @@ Verbleibender Betrag: %2 WOCartOrderAbstract - + Not a valid cart object. - + Lacking privileges to create a sale. - + Lacking privileges to create an order. - + + You do not have the privilege to sell tickets. + + + + + You do not have the privilege to sell vouchers. + + + + + You do not have the privilege to sell shop items. + + + + CreateOrder called from an unknown transaction. - + + Nothing in the cart. + + + + Reservations must not contain anything but tickets. - + DB error while inserting order. - + Ok Ok - + Invalid - + Unable to deserialize object of type WOCartOrder: invalid XML. @@ -3276,32 +3272,32 @@ Verbleibender Betrag: %2 WOCartTicket - + Unable to deserialize object of type WOCartTicket: invalid XML. - + Ok Ok - + EventOver - + TooLate - + Exhausted - + Invalid @@ -3309,30 +3305,37 @@ Verbleibender Betrag: %2 WOCartVoucher - - Unable to deserialize object of type WOCartVoucher: invalid XML. - + Ok + Ok + + + WOCartVoucherAbstract - + Ok Ok - + InvalidValue - + InvalidPrice + + + Unable to deserialize object of type WOCartVoucher: invalid XML. + + WOContact - + Unable to deserialize object of type WOContact: invalid XML. @@ -3340,7 +3343,7 @@ Verbleibender Betrag: %2 WOContactType - + Unable to deserialize object of type WOContactType: invalid XML. @@ -3348,7 +3351,7 @@ Verbleibender Betrag: %2 WOCountry - + Unable to deserialize object of type WOCountry: invalid XML. @@ -3356,58 +3359,94 @@ Verbleibender Betrag: %2 WOCustomerAbstract - - + + Not a valid customer object. - + + Customer does not exist in the database. - + Not a valid customer, cannot delete. - + This customer has orders in the system, cannot delete. - + Cannot merge a customer with itself. - + Country ID and name must contain values! - + Country ID exists! - + Country name exists! - + Contact Type names must not be empty! - + Contact Type already exists. - + + This email already exists in the database. + + + + + Not a valid customer. + + + + + Customer has no email address. + + + + + There is a problem with your mail client or your browser: please copy the URL into the browser manually and try again. + + + + + This user does not exist. + + + + + The passcode supplied by your browser is either invalid or expired. + + + + + The password does not match or is empty, please use the back button of your browser and try again. + + + + Unable to deserialize object of type WOCustomer: invalid XML. @@ -3415,7 +3454,7 @@ Verbleibender Betrag: %2 WOCustomerInfo - + Unable to deserialize object of type WOCustomerInfo: invalid XML. @@ -3423,37 +3462,37 @@ Verbleibender Betrag: %2 WOEventAbstract - + The event to be created must be a valid event object! - + The event to be changed must be a valid event object! - + The event is not valid. - + You do not have the privilege to cancel events. - + This is not a valid event. - + The event ID is not valid. - + Unable to deserialize object of type WOEvent: invalid XML. @@ -3461,7 +3500,7 @@ Verbleibender Betrag: %2 WOEventPriceAbstract - + Unable to deserialize object of type WOEventPrice: invalid XML. @@ -3469,7 +3508,7 @@ Verbleibender Betrag: %2 WOFlagAbstract - + Unable to deserialize object of type WOFlag: invalid XML. @@ -3477,7 +3516,7 @@ Verbleibender Betrag: %2 WOHost - + Unable to deserialize object of type WOHost: invalid XML. @@ -3485,7 +3524,7 @@ Verbleibender Betrag: %2 WOItemInfo - + Unable to deserialize object of type WOItemInfo: invalid XML. @@ -3504,227 +3543,265 @@ Verbleibender Betrag: %2 WOOrderAbstract - + Invalid shipping ID. - - - - - - + + + + + + Order ID is not valid. - + Order has already been shipped. - + Order is in the wrong state. - - - + + + Amount to be paid must be positive. - - - - - - + + + + + + Voucher is not valid! - - - + + + Voucher cannot be used: it has not been paid for. - + Amount to be refunded must be positive. - + Invalid Order ID. - + This order is not a reservation. - + This ticket cannot be returned! - - - + + + Internal error: ticket for unknown event. - + This ticket is for a past event and you do not have the privilege to return it. - + This voucher has already been used, cannot return it. - + Ticket or voucher not found. - + Invalid order ID. - + The order is in the wrong status or you do not have the privilege to cancel it. - + This order contains a ticket that cannot be returned. - + This order contains a ticket that is for a past event and you do not have the privilege to cancel it. - + This order contains a voucher that has already been used. - - + + Invalid ticket ID. - + The ticket cannot be changed anymore or you do not have the privilege. - + The ticket is for an event in the past and you do not have the privilege to change it. - + Invalid price category. - + Category is not valid for this event. - + You do not have access to this category on this event. - + Internal error: negative voucher. - + Placed - + Sent - + Sold Verkauft - + Cancelled - + Reserved Reserviert - + Closed - + Unable to deserialize object of type WOOrder: invalid XML. - WOOrderInfoAbstract + WOOrderAudit - + Placed - + Sent - + Sold Verkauft - + Cancelled - + Reserved Reserviert + + Closed + + + + + Unable to deserialize object of type WOOrderAudit: invalid XML. + + + + + WOOrderInfoAbstract + + + Placed + + + + + Sent + + + + + Sold + Verkauft + + + + Cancelled + + + + Reserved + Reserviert + + + Closed - + Unable to deserialize object of type WOOrderInfo: invalid XML. @@ -3732,22 +3809,22 @@ Verbleibender Betrag: %2 WOPriceCategoryAbstract - + New Category must be a valid object. - + Category must be a valid object. - + Category does not exist. - + Unable to deserialize object of type WOPriceCategory: invalid XML. @@ -3755,7 +3832,7 @@ Verbleibender Betrag: %2 WORoleAbstract - + Unable to deserialize object of type WORole: invalid XML. @@ -3763,30 +3840,38 @@ Verbleibender Betrag: %2 WORoomAbstract - + Room already exists - + Unable to deserialize object of type WORoom: invalid XML. + WOServerFormatAbstract + + + Unable to deserialize object of type WOServerFormat: invalid XML. + + + + WOShippingAbstract - + Shipping type not found. - + Error while updating shipping information. - + Unable to deserialize object of type WOShipping: invalid XML. @@ -3794,13 +3879,13 @@ Verbleibender Betrag: %2 WOTemplateAbstract - - + + No such template. - + Unable to deserialize object of type WOTemplate: invalid XML. @@ -3808,7 +3893,7 @@ Verbleibender Betrag: %2 WOTemplateInfo - + Unable to deserialize object of type WOTemplateInfo: invalid XML. @@ -3827,100 +3912,108 @@ Verbleibender Betrag: %2 WOTicketAbstract - + Reserved Reserviert - + Ordered - + Used Benutzt - + Cancelled - + Refund - + MaskBlock - + MaskPay - + MaskUsable - + MaskReturnable - + MaskChangeable - + Unable to deserialize object of type WOTicket: invalid XML. + WOTicketAudit + + + Unable to deserialize object of type WOTicketAudit: invalid XML. + + + + WOTicketUse - + Ok Ok - + NotFound - + WrongEvent - + AlreadyUsed - + NotUsable - + Unpaid - + InvalidEvent - + Unable to deserialize object of type WOTicketUse: invalid XML. @@ -3928,7 +4021,7 @@ Verbleibender Betrag: %2 WOUser - + Unable to deserialize object of type WOUser: invalid XML. @@ -3936,110 +4029,164 @@ Verbleibender Betrag: %2 WOVoucher - - Unable to deserialize object of type WOVoucher: invalid XML. - + Ok + Ok + + + WOVoucherAbstract - + Ok Ok - + InvalidValue - + InvalidPrice + + + Unable to deserialize object of type WOVoucher: invalid XML. + + + + + WOVoucherAudit + + + Unable to deserialize object of type WOVoucherAudit: invalid XML. + + + + + WOWebCartAbstract + + + Unable to deserialize object of type WOWebCart: invalid XML. + + + + + WOWebSessionAbstract + + + Unable to deserialize object of type WOWebSession: invalid XML. + + + + + WebSite + + + An error occured, contact the server admin for details. + + _PrivilegeNames - + ChangeEvent:CancelEvent - + CreateOrder:AnyVoucherValue - + CreateOrder:DiffVoucherValuePrice - + CreateOrder:LateSale - + CreateOrder:AfterTheFactSale - + CreateOrder:CanOrder - + CreateOrder:CanSell - + + CreateOrder:CanOrderTicket + + + + + CreateOrder:CanOrderVoucher + + + + + CreateOrder:CanOrderItem + + + + CreateReservation:LateReserve - + CancelOrder:CancelSentOrder - + CancelOrder:CancelPastTickets - + OrderChangeShipping:ChangePrice - + OrderMarkShipped:SetTime - + ReturnTicketVoucher:ReturnPastTicket - + ChangeTicketPrice:ChangeUsedTicket - + ChangeTicketPrice:ChangePastTicket - + ChangeTicketPriceCategory:ChangeUsedTicket - + ChangeTicketPriceCategory:ChangePastTicket @@ -4047,467 +4194,507 @@ Verbleibender Betrag: %2 _TransactionNames - + Backup Sicherung - + GetLanguage - + GetValidFlags - + SetFlag - + DeleteFlag - + ServerInfo - + Login Login - + Logout - + GetMyRoles - + GetMyRights - + ChangeMyPassword - + GetAllUsers - + GetUser - + CreateUser - + ChangePassword - + DeleteUser - + SetUserDescription - + GetUserRoles - + SetUserRoles - + GetUserHosts - + SetUserHosts - + SetUserFlags - + GetAllRoles - + GetRole - + CreateRole - + SetRoleDescription - + SetRoleRights - + DeleteRole - + SetRoleFlags - + GetAllRightNames - + GetAllHostNames - + GetAllHosts - + SetHost - + DeleteHost - + GetAllContactTypes - + CreateContactType - + GetCustomer - + GetAllCustomerNames - + CreateCustomer - + ChangeCustomer - + + ChangeCustomerMail + + + + DeleteCustomer - + GetAddress - + GetAllCountries - + CreateCountry - + + ResetCustomerPassword + + + + GetAllArtists - + CreateArtist - + GetAllPriceCategories - + CreatePriceCategory - + ChangePriceCategory - + GetEvent - + GetAllEvents - + GetEventList - + CreateEvent - + ChangeEvent - + CancelEvent - + GetAllRooms - + CreateRoom - + GetEventSummary - + GetTicket - + GetVoucher - + + GetVoucherAudit + + + + + GetOrderAudit + + + + GetOrder - + GetOrderList - + GetOrdersByEvents - + GetOrdersByCustomer - + GetOrderByBarcode - + CreateOrder - + CreateReservation - + ReservationToOrder - + CancelOrder - + OrderPay - + OrderRefund - + UseVoucher - + DeductVoucher - + EmptyVoucher - + OrderChangeShipping - + OrderMarkShipped - + OrderAddComment - + OrderChangeComments - + ReturnTicketVoucher - + ChangeTicketPrice - + ChangeTicketPriceCategory - + GetAllShipping - + ChangeShipping - + CreateShipping - + DeleteShipping - + GetValidVoucherPrices - + UseTicket - + GetEntranceEvents - + + WebCartAddTicket + + + + + WebCartRemoveTicket + + + + + WebCartAddVoucher + + + + + WebCartRemoveVoucher + + + + GetTemplateList - + GetTemplate - + SetTemplate - + SetTemplateDescription - + DeleteTemplate diff --git a/www/translations/server_en.ts b/www/translations/server_en.ts index f7ca432..3d2373b 100644 --- a/www/translations/server_en.ts +++ b/www/translations/server_en.ts @@ -31,184 +31,137 @@ MachineUser - + User already exists. - + Username is invalid. - - - - - - - - + + + + + + + + User does not exist. - + Merge target user does not exist! - + User and merge target user are identical. - + Trying to assign non-existent role. - + Trying to assign non-existent host. - - - - + + + + Role does not exist. - - + + Trying to assign non-existent flag. - + Illegal role name. - + Role already exists. - + Trying to set an illegal right. - + Cannot delete special roles. - + Cannot set/create special hosts. - + Illegal host name. - + Cannot delete special hosts. - + Host does not exist. - Order - - - create order - - - - - invalidvalue - voucher state - - - - - invalidprice - voucher state - - - - - Shipping type not available to user. - - - - - Illegal shipping type. - - - - - order cancelled - - - - - reservation to order - - - - Session - + Unknown Host - + Host/User combination not allowed - - + Host authentication failed - - - + + User Authentication failed - + cannot set an empty password - + Ooops. Unable to find user. You have been deleted. - - Ooops. Internal storage error - cannot verify old password. - - - - + Wrong password. Request denied. @@ -216,7 +169,7 @@ SpecialHost - + _any any host (even unregistered ones) @@ -230,34 +183,6 @@ - Ticket - - - The ticket is not valid. - - - - - The ticket has already been used. - - - - - The ticket has not been bought or is cancelled. - - - - - The ticket has not been paid. - - - - - The tickets order is in an invalid state or does not exist. - - - - TransactionNames:: serverinfo @@ -539,53 +464,25 @@ Translation - + Format must be either 'ts' or 'qm'. - + Language invalid. - + Language unknown. - Voucher - - - cancel voucher - - - - - empty voucher - - - - - create voucher - - - - - pay with voucher - - - - - pay with voucher outside system - - - - WOAddress - + Unable to deserialize object of type WOAddress: invalid XML. @@ -593,17 +490,17 @@ WOArtistAbstract - + Artist name must not be empty! - + An artist with this name already exists. - + Unable to deserialize object of type WOArtist: invalid XML. @@ -611,7 +508,7 @@ WOCartItem - + Unable to deserialize object of type WOCartItem: invalid XML. @@ -619,47 +516,67 @@ WOCartOrderAbstract - + Not a valid cart object. - + Lacking privileges to create a sale. - + Lacking privileges to create an order. - + + You do not have the privilege to sell tickets. + + + + + You do not have the privilege to sell vouchers. + + + + + You do not have the privilege to sell shop items. + + + + CreateOrder called from an unknown transaction. - + + Nothing in the cart. + + + + Reservations must not contain anything but tickets. - + DB error while inserting order. - + Ok - + Invalid - + Unable to deserialize object of type WOCartOrder: invalid XML. @@ -667,63 +584,63 @@ WOCartTicket - + Unable to deserialize object of type WOCartTicket: invalid XML. - + Ok - + EventOver - + TooLate - + Exhausted - + Invalid - WOCartVoucher + WOCartVoucherAbstract - - Unable to deserialize object of type WOCartVoucher: invalid XML. - - - - + Ok - + InvalidValue - + InvalidPrice + + + Unable to deserialize object of type WOCartVoucher: invalid XML. + + WOContact - + Unable to deserialize object of type WOContact: invalid XML. @@ -731,7 +648,7 @@ WOContactType - + Unable to deserialize object of type WOContactType: invalid XML. @@ -739,7 +656,7 @@ WOCountry - + Unable to deserialize object of type WOCountry: invalid XML. @@ -747,58 +664,94 @@ WOCustomerAbstract - - + + Not a valid customer object. - + + Customer does not exist in the database. - + Not a valid customer, cannot delete. - + This customer has orders in the system, cannot delete. - + Cannot merge a customer with itself. - + Country ID and name must contain values! - + Country ID exists! - + Country name exists! - + Contact Type names must not be empty! - + Contact Type already exists. - + + This email already exists in the database. + + + + + Not a valid customer. + + + + + Customer has no email address. + + + + + There is a problem with your mail client or your browser: please copy the URL into the browser manually and try again. + + + + + This user does not exist. + + + + + The passcode supplied by your browser is either invalid or expired. + + + + + The password does not match or is empty, please use the back button of your browser and try again. + + + + Unable to deserialize object of type WOCustomer: invalid XML. @@ -806,7 +759,7 @@ WOCustomerInfo - + Unable to deserialize object of type WOCustomerInfo: invalid XML. @@ -814,37 +767,37 @@ WOEventAbstract - + The event to be created must be a valid event object! - + The event to be changed must be a valid event object! - + The event is not valid. - + You do not have the privilege to cancel events. - + This is not a valid event. - + The event ID is not valid. - + Unable to deserialize object of type WOEvent: invalid XML. @@ -852,7 +805,7 @@ WOEventPriceAbstract - + Unable to deserialize object of type WOEventPrice: invalid XML. @@ -860,7 +813,7 @@ WOFlagAbstract - + Unable to deserialize object of type WOFlag: invalid XML. @@ -868,7 +821,7 @@ WOHost - + Unable to deserialize object of type WOHost: invalid XML. @@ -876,7 +829,7 @@ WOItemInfo - + Unable to deserialize object of type WOItemInfo: invalid XML. @@ -884,227 +837,265 @@ WOOrderAbstract - + Invalid shipping ID. - - - - - - + + + + + + Order ID is not valid. - + Order has already been shipped. - + Order is in the wrong state. - - - + + + Amount to be paid must be positive. - - - - - - + + + + + + Voucher is not valid! - - - + + + Voucher cannot be used: it has not been paid for. - + Amount to be refunded must be positive. - + Invalid Order ID. - + This order is not a reservation. - + This ticket cannot be returned! - - - + + + Internal error: ticket for unknown event. - + This ticket is for a past event and you do not have the privilege to return it. - + This voucher has already been used, cannot return it. - + Ticket or voucher not found. - + Invalid order ID. - + The order is in the wrong status or you do not have the privilege to cancel it. - + This order contains a ticket that cannot be returned. - + This order contains a ticket that is for a past event and you do not have the privilege to cancel it. - + This order contains a voucher that has already been used. - - + + Invalid ticket ID. - + The ticket cannot be changed anymore or you do not have the privilege. - + The ticket is for an event in the past and you do not have the privilege to change it. - + Invalid price category. - + Category is not valid for this event. - + You do not have access to this category on this event. - + Internal error: negative voucher. - + Placed - + Sent - + Sold - + Cancelled - + Reserved - + Closed - + Unable to deserialize object of type WOOrder: invalid XML. - WOOrderInfoAbstract + WOOrderAudit - + Placed - + Sent - + Sold - + Cancelled - + Reserved + + Closed + + + + + Unable to deserialize object of type WOOrderAudit: invalid XML. + + + + + WOOrderInfoAbstract + + + Placed + + + + + Sent + + + + + Sold + + + + + Cancelled + + + + Reserved + + + + Closed - + Unable to deserialize object of type WOOrderInfo: invalid XML. @@ -1112,22 +1103,22 @@ WOPriceCategoryAbstract - + New Category must be a valid object. - + Category must be a valid object. - + Category does not exist. - + Unable to deserialize object of type WOPriceCategory: invalid XML. @@ -1135,7 +1126,7 @@ WORoleAbstract - + Unable to deserialize object of type WORole: invalid XML. @@ -1143,30 +1134,38 @@ WORoomAbstract - + Room already exists - + Unable to deserialize object of type WORoom: invalid XML. + WOServerFormatAbstract + + + Unable to deserialize object of type WOServerFormat: invalid XML. + + + + WOShippingAbstract - + Shipping type not found. - + Error while updating shipping information. - + Unable to deserialize object of type WOShipping: invalid XML. @@ -1174,13 +1173,13 @@ WOTemplateAbstract - - + + No such template. - + Unable to deserialize object of type WOTemplate: invalid XML. @@ -1188,7 +1187,7 @@ WOTemplateInfo - + Unable to deserialize object of type WOTemplateInfo: invalid XML. @@ -1196,100 +1195,108 @@ WOTicketAbstract - + Reserved - + Ordered - + Used - + Cancelled - + Refund - + MaskBlock - + MaskPay - + MaskUsable - + MaskReturnable - + MaskChangeable - + Unable to deserialize object of type WOTicket: invalid XML. + WOTicketAudit + + + Unable to deserialize object of type WOTicketAudit: invalid XML. + + + + WOTicketUse - + Ok - + NotFound - + WrongEvent - + AlreadyUsed - + NotUsable - + Unpaid - + InvalidEvent - + Unable to deserialize object of type WOTicketUse: invalid XML. @@ -1297,118 +1304,165 @@ WOUser - + Unable to deserialize object of type WOUser: invalid XML. - WOVoucher + WOVoucherAbstract + + + Ok + + + + + InvalidValue + + - + + InvalidPrice + + + + Unable to deserialize object of type WOVoucher: invalid XML. + + + WOVoucherAudit - - Ok + + Unable to deserialize object of type WOVoucherAudit: invalid XML. + + + WOWebCartAbstract - - InvalidValue + + Unable to deserialize object of type WOWebCart: invalid XML. + + + WOWebSessionAbstract - - InvalidPrice + + Unable to deserialize object of type WOWebSession: invalid XML. + + + + + WebSite + + + An error occured, contact the server admin for details. _PrivilegeNames - + ChangeEvent:CancelEvent - + CreateOrder:AnyVoucherValue - + CreateOrder:DiffVoucherValuePrice - + CreateOrder:LateSale - + CreateOrder:AfterTheFactSale - + CreateOrder:CanOrder - + CreateOrder:CanSell - + + CreateOrder:CanOrderTicket + + + + + CreateOrder:CanOrderVoucher + + + + + CreateOrder:CanOrderItem + + + + CreateReservation:LateReserve - + CancelOrder:CancelSentOrder - + CancelOrder:CancelPastTickets - + OrderChangeShipping:ChangePrice - + OrderMarkShipped:SetTime - + ReturnTicketVoucher:ReturnPastTicket - + ChangeTicketPrice:ChangeUsedTicket - + ChangeTicketPrice:ChangePastTicket - + ChangeTicketPriceCategory:ChangeUsedTicket - + ChangeTicketPriceCategory:ChangePastTicket @@ -1416,467 +1470,507 @@ _TransactionNames - + Backup - + GetLanguage - + GetValidFlags - + SetFlag - + DeleteFlag - + ServerInfo - + Login - + Logout - + GetMyRoles - + GetMyRights - + ChangeMyPassword - + GetAllUsers - + GetUser - + CreateUser - + ChangePassword - + DeleteUser - + SetUserDescription - + GetUserRoles - + SetUserRoles - + GetUserHosts - + SetUserHosts - + SetUserFlags - + GetAllRoles - + GetRole - + CreateRole - + SetRoleDescription - + SetRoleRights - + DeleteRole - + SetRoleFlags - + GetAllRightNames - + GetAllHostNames - + GetAllHosts - + SetHost - + DeleteHost - + GetAllContactTypes - + CreateContactType - + GetCustomer - + GetAllCustomerNames - + CreateCustomer - + ChangeCustomer - + + ChangeCustomerMail + + + + DeleteCustomer - + GetAddress - + GetAllCountries - + CreateCountry - + + ResetCustomerPassword + + + + GetAllArtists - + CreateArtist - + GetAllPriceCategories - + CreatePriceCategory - + ChangePriceCategory - + GetEvent - + GetAllEvents - + GetEventList - + CreateEvent - + ChangeEvent - + CancelEvent - + GetAllRooms - + CreateRoom - + GetEventSummary - + GetTicket - + GetVoucher - + + GetVoucherAudit + + + + + GetOrderAudit + + + + GetOrder - + GetOrderList - + GetOrdersByEvents - + GetOrdersByCustomer - + GetOrderByBarcode - + CreateOrder - + CreateReservation - + ReservationToOrder - + CancelOrder - + OrderPay - + OrderRefund - + UseVoucher - + DeductVoucher - + EmptyVoucher - + OrderChangeShipping - + OrderMarkShipped - + OrderAddComment - + OrderChangeComments - + ReturnTicketVoucher - + ChangeTicketPrice - + ChangeTicketPriceCategory - + GetAllShipping - + ChangeShipping - + CreateShipping - + DeleteShipping - + GetValidVoucherPrices - + UseTicket - + GetEntranceEvents - + + WebCartAddTicket + + + + + WebCartRemoveTicket + + + + + WebCartAddVoucher + + + + + WebCartRemoveVoucher + + + + GetTemplateList - + GetTemplate - + SetTemplate - + SetTemplateDescription - + DeleteTemplate