added some translatable items in PHP source
authorkonrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Sat, 1 Mar 2008 17:40:53 +0000 (17:40 +0000)
committerkonrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Sat, 1 Mar 2008 17:40:53 +0000 (17:40 +0000)
git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@100 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

src/smoke.pro
src/smoke_de.ts
src/smoke_de_SAX.ts
www/inc/machine/host.php
www/inc/machine/session.php
www/machine.php

index c52c87b..1686e0e 100644 (file)
@@ -35,6 +35,8 @@ SOURCES = \
        user.cpp \
        host.cpp \
        checkdlg.cpp
+
+#some PHP files are listed below to scan them for translatable items:
 HEADERS = \
        keygen.h \
        mainwindow.h \
@@ -48,7 +50,8 @@ HEADERS = \
        host.h \
        checkdlg.h \
        ../www/machine.php \
-       ../www/inc/machine/session.php
+       ../www/inc/machine/session.php \
+       ../www/inc/machine/host.php
 
 RESOURCES += files.qrc
 
index ecee680..6261bd9 100644 (file)
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="287"/>
+        <location filename="../www/inc/machine/session.php" line="331"/>
         <source>_admin</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="531"/>
+        <source>unable to parse XML data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/host.php" line="89"/>
+        <source>Cannot delete special hosts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="132"/>
+        <source>missing some authentication data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="204"/>
+        <source>Not authenticated. Can&apos;t change password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="536"/>
+        <source>expected exactly one passwd element</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="544"/>
+        <source>cannot set an empty password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="230"/>
+        <source>Ooops. Unable to find user. You have been deleted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="235"/>
+        <source>Wrong password. Session hijacked, terminating it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="367"/>
+        <source>invalid user name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="327"/>
+        <source>expected exactly 1 ACL element</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="425"/>
+        <source>unknown user name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="409"/>
+        <source>expected exactly 1 Hosts element</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="549"/>
+        <source>Unable to change this password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="21"/>
+        <source>setmypasswd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="21"/>
+        <source>setpasswd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="31"/>
+        <source>Invalid Request, please use the MagicSmoke Client with this page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="81"/>
+        <source>Invalid or missing sessionid, or session timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="93"/>
+        <source>Session not yet authenticated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="105"/>
+        <source>You do not have the right to execute this transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="221"/>
+        <source>Internal Error: unknown command, hiccup in code structure.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MCheckDialog</name>
@@ -300,434 +400,657 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MMainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="63"/>
+        <location filename="mainwindow.cpp" line="64"/>
         <source>Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="67"/>
+        <location filename="mainwindow.cpp" line="68"/>
         <source>Alternate Hostname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="70"/>
+        <location filename="mainwindow.cpp" line="71"/>
         <source>Server URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="73"/>
+        <location filename="mainwindow.cpp" line="74"/>
         <source>Proxy:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="94"/>
+        <location filename="mainwindow.cpp" line="95"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="97"/>
+        <location filename="mainwindow.cpp" line="98"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="185"/>
+        <location filename="mainwindow.cpp" line="186"/>
         <source>New Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="185"/>
+        <location filename="mainwindow.cpp" line="186"/>
         <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="mainwindow.cpp" line="82"/>
+        <location filename="mainwindow.cpp" line="83"/>
         <source>Proxy Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="85"/>
+        <location filename="mainwindow.cpp" line="86"/>
         <source>Proxy Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="297"/>
+        <location filename="mainwindow.cpp" line="315"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="210"/>
+        <location filename="mainwindow.cpp" line="211"/>
         <source>Unable to log in. Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="44"/>
+        <location filename="mainwindow.cpp" line="45"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="45"/>
+        <location filename="mainwindow.cpp" line="46"/>
         <source>&amp;New Profile...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="46"/>
+        <location filename="mainwindow.cpp" line="47"/>
         <source>&amp;Save Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="48"/>
+        <location filename="mainwindow.cpp" line="49"/>
         <source>&amp;Close Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="49"/>
+        <location filename="mainwindow.cpp" line="50"/>
         <source>&amp;Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="104"/>
+        <location filename="mainwindow.cpp" line="105"/>
         <source>new Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="106"/>
+        <location filename="mainwindow.cpp" line="107"/>
         <source>save Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="109"/>
+        <location filename="mainwindow.cpp" line="110"/>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="50"/>
+        <location filename="mainwindow.cpp" line="51"/>
         <source>&amp;Language...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="52"/>
+        <location filename="mainwindow.cpp" line="53"/>
         <source>&amp;Export Host Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="53"/>
+        <location filename="mainwindow.cpp" line="54"/>
         <source>&amp;Import Host Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="54"/>
+        <location filename="mainwindow.cpp" line="55"/>
         <source>&amp;Generate Host Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="243"/>
+        <location filename="mainwindow.cpp" line="256"/>
         <source>Export Key to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="252"/>
+        <location filename="mainwindow.cpp" line="265"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="276"/>
         <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="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="266"/>
+        <location filename="mainwindow.cpp" line="279"/>
         <source>Import Key from File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="275"/>
+        <location filename="mainwindow.cpp" line="288"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="287"/>
+        <location filename="mainwindow.cpp" line="300"/>
         <source>This is not a host key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="292"/>
+        <location filename="mainwindow.cpp" line="310"/>
         <source>This host key file does not contain a valid key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="297"/>
+        <location filename="mainwindow.cpp" line="315"/>
         <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="mainwindow.cpp" line="241"/>
+        <source>New Host Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="241"/>
+        <source>Please enter a name for the new host:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="244"/>
+        <source>The host name must only consist of letters, digits and underscore. It must start with a letter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="305"/>
+        <source>This host key file does not contain a valid host name.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MOverview</name>
     <message>
-        <location filename="overview.cpp" line="41"/>
+        <location filename="overview.cpp" line="45"/>
         <source>&amp;Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="42"/>
+        <location filename="overview.cpp" line="46"/>
         <source>&amp;Re-Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="45"/>
+        <location filename="overview.cpp" line="50"/>
         <source>&amp;Close Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="47"/>
+        <location filename="overview.cpp" line="52"/>
         <source>&amp;Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="52"/>
+        <location filename="overview.cpp" line="57"/>
         <source>&amp;Customer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="63"/>
+        <location filename="overview.cpp" line="68"/>
         <source>C&amp;onfigure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="67"/>
+        <location filename="overview.cpp" line="72"/>
         <source>Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="209"/>
+        <location filename="overview.cpp" line="556"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="209"/>
+        <location filename="overview.cpp" line="250"/>
         <source>I was unable to renew the login at the server, the error was: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="43"/>
+        <location filename="overview.cpp" line="47"/>
         <source>&amp;Offline mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="50"/>
+        <location filename="overview.cpp" line="55"/>
         <source>&amp;New Event...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="53"/>
+        <location filename="overview.cpp" line="58"/>
         <source>&amp;Show all customers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="55"/>
+        <location filename="overview.cpp" line="60"/>
         <source>C&amp;art</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="56"/>
+        <location filename="overview.cpp" line="61"/>
         <source>Add &amp;Ticket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="57"/>
+        <location filename="overview.cpp" line="62"/>
         <source>Add &amp;Voucher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="58"/>
+        <location filename="overview.cpp" line="63"/>
         <source>&amp;Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="59"/>
+        <location filename="overview.cpp" line="64"/>
         <source>&amp;Abort Shopping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="61"/>
+        <location filename="overview.cpp" line="66"/>
         <source>&amp;Show all orders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="77"/>
+        <location filename="overview.cpp" line="82"/>
         <source>New Event...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="80"/>
+        <location filename="overview.cpp" line="85"/>
         <source>Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="84"/>
+        <location filename="overview.cpp" line="89"/>
         <source>Order Ticket...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="87"/>
+        <location filename="overview.cpp" line="94"/>
         <source>Shopping Cart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="96"/>
+        <location filename="overview.cpp" line="103"/>
         <source>Add Ticket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="97"/>
+        <location filename="overview.cpp" line="104"/>
         <source>Add Voucher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="98"/>
+        <location filename="overview.cpp" line="105"/>
         <source>Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="103"/>
+        <location filename="overview.cpp" line="110"/>
         <source>Customer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="108"/>
+        <location filename="overview.cpp" line="115"/>
         <source>Delivery Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="111"/>
+        <location filename="overview.cpp" line="118"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="118"/>
+        <location filename="overview.cpp" line="125"/>
         <source>Save Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="119"/>
+        <location filename="overview.cpp" line="126"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="181"/>
+        <location filename="overview.cpp" line="222"/>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="181"/>
+        <location filename="overview.cpp" line="222"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="184"/>
+        <location filename="overview.cpp" line="225"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="48"/>
+        <location filename="overview.cpp" line="53"/>
         <source>&amp;Update Event List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="49"/>
+        <location filename="overview.cpp" line="54"/>
         <source>&amp;Show/Edit details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="122"/>
+        <location filename="overview.cpp" line="129"/>
         <source>Users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="130"/>
+        <location filename="overview.cpp" line="137"/>
         <source>New User...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="133"/>
+        <location filename="overview.cpp" line="140"/>
         <source>Delete User...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="137"/>
+        <location filename="overview.cpp" line="144"/>
         <source>Description...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="140"/>
+        <location filename="overview.cpp" line="147"/>
         <source>Hosts...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="143"/>
+        <location filename="overview.cpp" line="150"/>
         <source>Roles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="149"/>
+        <location filename="overview.cpp" line="159"/>
         <source>Hosts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="239"/>
+        <location filename="overview.cpp" line="280"/>
         <source>Login Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="239"/>
+        <location filename="overview.cpp" line="280"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="254"/>
+        <location filename="overview.cpp" line="295"/>
         <source>New User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="254"/>
+        <location filename="overview.cpp" line="295"/>
         <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="259"/>
+        <location filename="overview.cpp" line="300"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="259"/>
+        <location filename="overview.cpp" line="300"/>
         <source>The user name must contain only letters, digits, and underscores and must be at least one character long!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="280"/>
+        <location filename="overview.cpp" line="335"/>
         <source>Edit Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="280"/>
+        <location filename="overview.cpp" line="335"/>
         <source>Descriptionof user %1:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="overview.cpp" line="48"/>
+        <source>Change my &amp;Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="153"/>
+        <source>Set Password...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="167"/>
+        <source>New Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="170"/>
+        <source>Add This Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="173"/>
+        <source>Delete Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="177"/>
+        <source>Generate New Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="180"/>
+        <source>Import...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="183"/>
+        <source>Export...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="304"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="304"/>
+        <source>Please enter an initial password for the user:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="319"/>
+        <source>Delete User?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="319"/>
+        <source>Really delete user &apos;%1&apos;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="378"/>
+        <source>Error setting password: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="393"/>
+        <source>The password must be non-empty and both lines must match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="409"/>
+        <source>Host Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="409"/>
+        <source>Host Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="427"/>
+        <source>Create New Host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="427"/>
+        <source>Please enter a host name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="435"/>
+        <source>The key of this new host could only be generated with %1 bits entropy. Store anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="458"/>
+        <source>Delete this Host?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="458"/>
+        <source>Really delete host &apos;%1&apos;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="472"/>
+        <source>Change Host Key?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="472"/>
+        <source>Really change the key of host &apos;%1&apos;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="477"/>
+        <source>The new key of this host could only be generated with %1 bits entropy. Store anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="488"/>
+        <source>Import Key from File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="497"/>
+        <source>Unable to open file %1 for reading: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="509"/>
+        <source>This is not a host key file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="514"/>
+        <source>This host key file does not contain a valid host name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="519"/>
+        <source>This host key file does not contain a valid key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="524"/>
+        <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="542"/>
+        <source>This host cannot be exported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="547"/>
+        <source>Export Key to File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="556"/>
+        <source>Unable to open file %1 for writing: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MPasswordChange</name>
+    <message>
+        <location filename="overview.cpp" line="578"/>
+        <source>Change my password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="580"/>
+        <source>Reset password of user %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="584"/>
+        <source>Old Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="588"/>
+        <source>New Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="591"/>
+        <source>Repeat Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="599"/>
+        <source>Set Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="601"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MUserHost</name>
     <message>
-        <location filename="user.cpp" line="235"/>
+        <location filename="user.cpp" line="303"/>
         <source>_any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="user.cpp" line="235"/>
+        <location filename="user.cpp" line="303"/>
         <source>_online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="user.cpp" line="235"/>
+        <location filename="user.cpp" line="303"/>
         <source>_anon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -790,10 +1113,30 @@ At least %1 Bits of random are required.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="355"/>
+        <location filename="webrequest.cpp" line="325"/>
         <source>Error parsing EventList XML data (line %1 column %2): %3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="webrequest.cpp" line="277"/>
+        <source>Cannot change password, old password does not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webrequest.cpp" line="348"/>
+        <source>Error parsing RoomList XML data (line %1 column %2): %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webrequest.cpp" line="371"/>
+        <source>Error parsing UserList XML data (line %1 column %2): %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webrequest.cpp" line="394"/>
+        <source>Error parsing HostList XML data (line %1 column %2): %3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initkey</name>
index 0157dd1..95388d8 100644 (file)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="de">
-<defaultcodec></defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <translation>Lisde dor Gunden anguggn</translation>
     </message>
     <message>
-        <location filename="../www/inc/machine/session.php" line="287"/>
+        <location filename="../www/inc/machine/session.php" line="331"/>
         <source>_admin</source>
         <translation>Godd. Darf alles, gann alles, wees alles bessor.</translation>
     </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="531"/>
+        <source>unable to parse XML data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/host.php" line="89"/>
+        <source>Cannot delete special hosts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="132"/>
+        <source>missing some authentication data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="204"/>
+        <source>Not authenticated. Can&apos;t change password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="536"/>
+        <source>expected exactly one passwd element</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="544"/>
+        <source>cannot set an empty password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="230"/>
+        <source>Ooops. Unable to find user. You have been deleted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="235"/>
+        <source>Wrong password. Session hijacked, terminating it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="367"/>
+        <source>invalid user name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="327"/>
+        <source>expected exactly 1 ACL element</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="425"/>
+        <source>unknown user name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="409"/>
+        <source>expected exactly 1 Hosts element</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/inc/machine/session.php" line="549"/>
+        <source>Unable to change this password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="21"/>
+        <source>setmypasswd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="21"/>
+        <source>setpasswd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="31"/>
+        <source>Invalid Request, please use the MagicSmoke Client with this page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="81"/>
+        <source>Invalid or missing sessionid, or session timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="93"/>
+        <source>Session not yet authenticated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="105"/>
+        <source>You do not have the right to execute this transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../www/machine.php" line="221"/>
+        <source>Internal Error: unknown command, hiccup in code structure.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MCheckDialog</name>
@@ -301,215 +400,235 @@ At least %1 Bits of random are required.</source>
 <context>
     <name>MMainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="63"/>
+        <location filename="mainwindow.cpp" line="64"/>
         <source>Profile:</source>
         <translation>Brofiel:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="67"/>
+        <location filename="mainwindow.cpp" line="68"/>
         <source>Alternate Hostname:</source>
         <translation>Andror Reschnername:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="70"/>
+        <location filename="mainwindow.cpp" line="71"/>
         <source>Server URL:</source>
         <translation>URL vom diggen Reschnor:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="73"/>
+        <location filename="mainwindow.cpp" line="74"/>
         <source>Proxy:</source>
         <translation>Web-Broggsie:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="94"/>
+        <location filename="mainwindow.cpp" line="95"/>
         <source>Username:</source>
         <translation>Nudsorname:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="97"/>
+        <location filename="mainwindow.cpp" line="98"/>
         <source>Password:</source>
         <translation>Gans doll geheimer Gohd:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="185"/>
+        <location filename="mainwindow.cpp" line="186"/>
         <source>New Profile</source>
         <translation>Neues Brofiel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="185"/>
+        <location filename="mainwindow.cpp" line="186"/>
         <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>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="82"/>
+        <location filename="mainwindow.cpp" line="83"/>
         <source>Proxy Username:</source>
         <translation>Nudsername für&apos;n Broggsie:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="85"/>
+        <location filename="mainwindow.cpp" line="86"/>
         <source>Proxy Password:</source>
         <translation>Geheimer Gohd für&apos;n Broggsie:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="297"/>
+        <location filename="mainwindow.cpp" line="315"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="210"/>
+        <location filename="mainwindow.cpp" line="211"/>
         <source>Unable to log in. Error: %1</source>
         <translation>Isch gann nisch off&apos;n gross&apos;n Reschner. Der will nisch weil: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="44"/>
+        <location filename="mainwindow.cpp" line="45"/>
         <source>&amp;File</source>
         <translation>&amp;Dadai</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="45"/>
+        <location filename="mainwindow.cpp" line="46"/>
         <source>&amp;New Profile...</source>
         <translation>&amp;Neues Brofiel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="46"/>
+        <location filename="mainwindow.cpp" line="47"/>
         <source>&amp;Save Profile</source>
         <translation>Brofiel &amp;schbeichorn</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="48"/>
+        <location filename="mainwindow.cpp" line="49"/>
         <source>&amp;Close Window</source>
         <translation>Fänsdor &amp;zumach&apos;n</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="49"/>
+        <location filename="mainwindow.cpp" line="50"/>
         <source>&amp;Configure</source>
         <translation>&amp;Gonfiguriern</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="104"/>
+        <location filename="mainwindow.cpp" line="105"/>
         <source>new Profile</source>
         <translation>Neues Brofiel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="106"/>
+        <location filename="mainwindow.cpp" line="107"/>
         <source>save Profile</source>
         <translation>Brofiel schbeichorn</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="109"/>
+        <location filename="mainwindow.cpp" line="110"/>
         <source>Login</source>
         <translation>Droff offn&apos; Reschnor</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="50"/>
+        <location filename="mainwindow.cpp" line="51"/>
         <source>&amp;Language...</source>
         <translation>&amp;Schbrache...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="52"/>
+        <location filename="mainwindow.cpp" line="53"/>
         <source>&amp;Export Host Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="53"/>
+        <location filename="mainwindow.cpp" line="54"/>
         <source>&amp;Import Host Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="54"/>
+        <location filename="mainwindow.cpp" line="55"/>
         <source>&amp;Generate Host Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="243"/>
+        <location filename="mainwindow.cpp" line="256"/>
         <source>Export Key to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="252"/>
+        <location filename="mainwindow.cpp" line="265"/>
         <source>Unable to open file %1 for writing: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="276"/>
         <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="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="266"/>
+        <location filename="mainwindow.cpp" line="279"/>
         <source>Import Key from File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="275"/>
+        <location filename="mainwindow.cpp" line="288"/>
         <source>Unable to open file %1 for reading: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="287"/>
+        <location filename="mainwindow.cpp" line="300"/>
         <source>This is not a host key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="292"/>
+        <location filename="mainwindow.cpp" line="310"/>
         <source>This host key file does not contain a valid key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="297"/>
+        <location filename="mainwindow.cpp" line="315"/>
         <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="mainwindow.cpp" line="241"/>
+        <source>New Host Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="241"/>
+        <source>Please enter a name for the new host:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="244"/>
+        <source>The host name must only consist of letters, digits and underscore. It must start with a letter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="305"/>
+        <source>This host key file does not contain a valid host name.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MOverview</name>
     <message>
-        <location filename="overview.cpp" line="41"/>
+        <location filename="overview.cpp" line="45"/>
         <source>&amp;Session</source>
         <translation>&amp;Sidsung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="42"/>
+        <location filename="overview.cpp" line="46"/>
         <source>&amp;Re-Login</source>
         <translation>&amp;Noch&apos;ma einloggn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="45"/>
+        <location filename="overview.cpp" line="50"/>
         <source>&amp;Close Session</source>
         <translation>Sidsung &amp;Zumachn</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="47"/>
+        <location filename="overview.cpp" line="52"/>
         <source>&amp;Event</source>
         <translation>&amp;Veranschdaldung</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="52"/>
+        <location filename="overview.cpp" line="57"/>
         <source>&amp;Customer</source>
         <translation>&amp;Gunde</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="63"/>
+        <location filename="overview.cpp" line="68"/>
         <source>C&amp;onfigure</source>
         <translation>G&amp;onfiguriern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="67"/>
+        <location filename="overview.cpp" line="72"/>
         <source>Events</source>
         <translation>Veranschdaldungen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="209"/>
+        <location filename="overview.cpp" line="556"/>
         <source>Warning</source>
         <translation>Dumm gelaufen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="209"/>
+        <location filename="overview.cpp" line="250"/>
         <source>I was unable to renew the login at the server, the error was: %1</source>
         <translation>Isch gann de&apos; Verbindung off&apos;n gross&apos;n Reschner nisch erneuern. Der will nisch weil: %1</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="43"/>
+        <location filename="overview.cpp" line="47"/>
         <source>&amp;Offline mode</source>
         <translation>&amp;Ohne Neds und Dobbelden Boden</translation>
     </message>
@@ -519,221 +638,424 @@ At least %1 Bits of random are required.</source>
         <translation type="obsolete">&amp;Dedails anzeigen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="50"/>
+        <location filename="overview.cpp" line="55"/>
         <source>&amp;New Event...</source>
         <translation type="unfinished">Veranschdaldung &amp;absach&apos;n...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="53"/>
+        <location filename="overview.cpp" line="58"/>
         <source>&amp;Show all customers</source>
         <translation>&amp;Alle Gunden anzeigen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="55"/>
+        <location filename="overview.cpp" line="60"/>
         <source>C&amp;art</source>
         <translation>Eing&amp;aufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="56"/>
+        <location filename="overview.cpp" line="61"/>
         <source>Add &amp;Ticket</source>
         <translation>Ein&amp;driddsgarde hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="57"/>
+        <location filename="overview.cpp" line="62"/>
         <source>Add &amp;Voucher</source>
         <translation>&amp;Gudschein hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="58"/>
+        <location filename="overview.cpp" line="63"/>
         <source>&amp;Remove Item</source>
         <translation>Doch &amp;ni&apos; nehm&apos;</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="59"/>
+        <location filename="overview.cpp" line="64"/>
         <source>&amp;Abort Shopping</source>
         <translation>&amp;Eingauf Abbrechen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="61"/>
+        <location filename="overview.cpp" line="66"/>
         <source>&amp;Show all orders</source>
         <translation>&amp;Alle Beschdellungen anzeichen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="77"/>
+        <location filename="overview.cpp" line="82"/>
         <source>New Event...</source>
         <translation>Neue Veranschdaldung...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="80"/>
+        <location filename="overview.cpp" line="85"/>
         <source>Details...</source>
         <translation>Dedails anzeichen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="84"/>
+        <location filename="overview.cpp" line="89"/>
         <source>Order Ticket...</source>
         <translation>Eindriddsgarde beschdellen...</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="87"/>
+        <location filename="overview.cpp" line="94"/>
         <source>Shopping Cart</source>
         <translation>Eingaufswagen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="96"/>
+        <location filename="overview.cpp" line="103"/>
         <source>Add Ticket</source>
         <translation>Eindriddsgarde hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="97"/>
+        <location filename="overview.cpp" line="104"/>
         <source>Add Voucher</source>
         <translation>Gudschein hinzufüchen</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="98"/>
+        <location filename="overview.cpp" line="105"/>
         <source>Remove Item</source>
         <translation>Doch ni&apos; nehm&apos;</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="103"/>
+        <location filename="overview.cpp" line="110"/>
         <source>Customer:</source>
         <translation>Gunde:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="108"/>
+        <location filename="overview.cpp" line="115"/>
         <source>Delivery Address:</source>
         <translation>Adresse wo&apos;s Zeuch hin soll:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="111"/>
+        <location filename="overview.cpp" line="118"/>
         <source>Comments:</source>
         <translation>Wischdiches Gelaber und Gerede:</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="118"/>
+        <location filename="overview.cpp" line="125"/>
         <source>Save Order</source>
         <translation>Beschdellung abschbeichern</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="119"/>
+        <location filename="overview.cpp" line="126"/>
         <source>Clear</source>
         <translation>Wechwerfen und von vorne!</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="181"/>
+        <location filename="overview.cpp" line="222"/>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="181"/>
+        <location filename="overview.cpp" line="222"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="184"/>
+        <location filename="overview.cpp" line="225"/>
         <source>ddd MMMM d yyyy, h:mm ap</source>
         <comment>time format</comment>
         <translation>ddd, d.M.yyyy hh:mm</translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="48"/>
+        <location filename="overview.cpp" line="53"/>
         <source>&amp;Update Event List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="49"/>
+        <location filename="overview.cpp" line="54"/>
         <source>&amp;Show/Edit details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="122"/>
+        <location filename="overview.cpp" line="129"/>
         <source>Users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="130"/>
+        <location filename="overview.cpp" line="137"/>
         <source>New User...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="133"/>
+        <location filename="overview.cpp" line="140"/>
         <source>Delete User...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="137"/>
+        <location filename="overview.cpp" line="144"/>
         <source>Description...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="140"/>
+        <location filename="overview.cpp" line="147"/>
         <source>Hosts...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="143"/>
+        <location filename="overview.cpp" line="150"/>
         <source>Roles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="149"/>
+        <location filename="overview.cpp" line="159"/>
         <source>Hosts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="239"/>
+        <location filename="overview.cpp" line="280"/>
         <source>Login Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="239"/>
+        <location filename="overview.cpp" line="280"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="254"/>
+        <location filename="overview.cpp" line="295"/>
         <source>New User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="254"/>
+        <location filename="overview.cpp" line="295"/>
         <source>Please enter new user name (only letters, digits, and underscore allowed):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="259"/>
+        <location filename="overview.cpp" line="300"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="259"/>
+        <location filename="overview.cpp" line="300"/>
         <source>The user name must contain only letters, digits, and underscores and must be at least one character long!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="280"/>
+        <location filename="overview.cpp" line="335"/>
         <source>Edit Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overview.cpp" line="280"/>
+        <location filename="overview.cpp" line="335"/>
         <source>Descriptionof user %1:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="overview.cpp" line="48"/>
+        <source>Change my &amp;Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="153"/>
+        <source>Set Password...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="167"/>
+        <source>New Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="170"/>
+        <source>Add This Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="173"/>
+        <source>Delete Host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="177"/>
+        <source>Generate New Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="180"/>
+        <source>Import...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="183"/>
+        <source>Export...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="304"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="304"/>
+        <source>Please enter an initial password for the user:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="319"/>
+        <source>Delete User?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="319"/>
+        <source>Really delete user &apos;%1&apos;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="378"/>
+        <source>Error setting password: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="393"/>
+        <source>The password must be non-empty and both lines must match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="409"/>
+        <source>Host Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="409"/>
+        <source>Host Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="427"/>
+        <source>Create New Host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="427"/>
+        <source>Please enter a host name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="435"/>
+        <source>The key of this new host could only be generated with %1 bits entropy. Store anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="458"/>
+        <source>Delete this Host?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="458"/>
+        <source>Really delete host &apos;%1&apos;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="472"/>
+        <source>Change Host Key?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="472"/>
+        <source>Really change the key of host &apos;%1&apos;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="477"/>
+        <source>The new key of this host could only be generated with %1 bits entropy. Store anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="488"/>
+        <source>Import Key from File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="497"/>
+        <source>Unable to open file %1 for reading: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="509"/>
+        <source>This is not a host key file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="514"/>
+        <source>This host key file does not contain a valid host name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="519"/>
+        <source>This host key file does not contain a valid key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="524"/>
+        <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="542"/>
+        <source>This host cannot be exported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="547"/>
+        <source>Export Key to File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="556"/>
+        <source>Unable to open file %1 for writing: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MPasswordChange</name>
+    <message>
+        <location filename="overview.cpp" line="578"/>
+        <source>Change my password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="580"/>
+        <source>Reset password of user %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="584"/>
+        <source>Old Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="588"/>
+        <source>New Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="591"/>
+        <source>Repeat Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="599"/>
+        <source>Set Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="overview.cpp" line="601"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MUserHost</name>
     <message>
-        <location filename="user.cpp" line="235"/>
+        <location filename="user.cpp" line="303"/>
         <source>_any</source>
         <translation>Irschendeen Gombjudor</translation>
     </message>
     <message>
-        <location filename="user.cpp" line="235"/>
+        <location filename="user.cpp" line="303"/>
         <source>_online</source>
         <translation>De Webseidn</translation>
     </message>
     <message>
-        <location filename="user.cpp" line="235"/>
+        <location filename="user.cpp" line="303"/>
         <source>_anon</source>
         <translation>Annonühm</translation>
     </message>
@@ -796,10 +1118,30 @@ At least %1 Bits of random are required.</source>
         <translation>Isch gann misch ned anmälden.</translation>
     </message>
     <message>
-        <location filename="webrequest.cpp" line="355"/>
+        <location filename="webrequest.cpp" line="325"/>
         <source>Error parsing EventList XML data (line %1 column %2): %3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="webrequest.cpp" line="277"/>
+        <source>Cannot change password, old password does not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webrequest.cpp" line="348"/>
+        <source>Error parsing RoomList XML data (line %1 column %2): %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webrequest.cpp" line="371"/>
+        <source>Error parsing UserList XML data (line %1 column %2): %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="webrequest.cpp" line="394"/>
+        <source>Error parsing HostList XML data (line %1 column %2): %3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initkey</name>
index dd1bde3..d2bd545 100644 (file)
@@ -64,7 +64,7 @@ function parseHostXml($txt)
        $xml=new DOMDocument;
        if(!$xml->loadXML($txt)){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("unable to parse XML data");
+               die(tr("unable to parse XML data"));
        }
        $ret=array();
        foreach($xml->getElementsByTagName("Host") as $el){
@@ -86,7 +86,7 @@ function deleteHostXml($txt)
        //check syntax
        if(substr($hst,0,1)=="_"){
                header("X-MagicSmoke-Status: Error");
-               die("Cannot delete special hosts.");
+               die(tr("Cannot delete special hosts."));
        }
        //delete Host from users
        $db->deleteRows("userhosts","host=".$db->escapeString($hst));
index 32c563b..f509ba8 100644 (file)
@@ -107,7 +107,7 @@ class Session
                if(!$auth->loadXML($REQUESTDATA)){
                        header("X-MagicSmoke-Status: SyntaxError");
                        deleteSession();
-                       die("unable to parse XML data");
+                       die(tr("unable to parse XML data"));
                }
                $hostname="";$hostauth="";$username="";$userauth="";
                foreach($auth->getElementsByTagName("HostName") as $el)
@@ -129,7 +129,7 @@ class Session
                if($hostname=="" || $hostauth=="" || $username=="" || $userauth==""){
                        header("X-MagicSmoke-Status: SyntaxError");
                        deleteSession();
-                       die("missing some authentication data");
+                       die(tr("missing some authentication data"));
                }
                //get user data
                $ures=$db->select("users","*","uname=".$db->escapeString($username));
@@ -201,18 +201,18 @@ class Session
                //check whether I really can do that
                if(!$this->isAuthenticated()){
                        header("X-MagicSmoke-Status: Unauthenticated");
-                       die("Not authenticated. Can't change password.");
+                       die(tr("Not authenticated. Can't change password."));
                }
                //parse XML
                $dom=new DOMDocument;
                if(!$dom->loadXML($txt)){
                        header("X-MagicSmoke-Status: SyntaxError");
-                       die("unable to parse XML data");
+                       die(tr("unable to parse XML data"));
                }
                $nl=$dom->getElementsByTagName("SetMyPasswd");
                if($nl->length!=1){
                        header("X-MagicSmoke-Status: SyntaxError");
-                       die("expected exactly one passwd element");
+                       die(tr("expected exactly one passwd element"));
                }
                $spw=$nl->item(0);
                $old=$spw->getAttribute("oldpwd");
@@ -220,19 +220,19 @@ class Session
                //sanity check
                if($nwp==""){
                        header("X-MagicSmoke-Status: SyntaxError");
-                       die("cannot set an empty password");
+                       die(tr("cannot set an empty password"));
                }
                //check old password
                global $db;
                $res=$db->select("users","passwd","uname=".$db->escapeString($this->user));
                if(count($res)!=1){
                        header("X-MagicSmoke-Status: Error");
-                       die("Ooops. Unable to find user. You have been deleted.");
+                       die(tr("Ooops. Unable to find user. You have been deleted."));
                }
                if($old!=$res[0]["passwd"]){
                        header("X-MagicSmoke-Status: Error");
                        deleteSession();
-                       die("Wrong password. Session hijacked, terminating it.");
+                       die(tr("Wrong password. Session hijacked, terminating it."));
                }
                //set new password
                $db->update("users",array("passwd"=>$nwp),"uname=".$db->escapeString($this->user));
@@ -285,7 +285,7 @@ function getUserAclXml($user)
        $user=trim($user);
        if(ereg("^[A-Za-z0-9_]+$",$user)===false){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("invalid user name");
+               die(tr("invalid user name"));
        }
        //go on...
        global $db,$ALLOWEDREQUESTS;
@@ -318,13 +318,13 @@ function setUserAclXml($txt)
        $xml=new DOMDocument;
        if(!$xml->loadXML($txt)){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("unable to parse XML data");
+               die(tr("unable to parse XML data"));
        }
        //get user name
        $acl=$xml->getElementsByTagName("ACL");
        if($acl->length != 1){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("expected exactly 1 ACL element");
+               die(tr("expected exactly 1 ACL element"));
        }
        global $db,$ALLOWEDREQUESTS;
        $roles=$ALLOWEDREQUESTS;
@@ -336,7 +336,7 @@ function setUserAclXml($txt)
        if($res[0][0]!=1){
                header("X-MagicSmoke-Status: SyntaxError");
                $db->rollbackTransaction();
-               die("unknown user name");
+               die(tr("unknown user name"));
        }
        //update roles
        $acl=$xml->getElementsByTagName("Role");
@@ -364,7 +364,7 @@ function getUserHostsXml($user)
        $user=trim($user);
        if(ereg("^[A-Za-z0-9_]+$",$user)===false){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("invalid user name");
+               die(tr("invalid user name"));
        }
        //go on...
        global $db;
@@ -400,13 +400,13 @@ function setUserHostsXml($txt)
        $xml=new DOMDocument;
        if(!$xml->loadXML($txt)){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("unable to parse XML data");
+               die(tr("unable to parse XML data"));
        }
        //get user name
        $acl=$xml->getElementsByTagName("Hosts");
        if($acl->length != 1){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("expected exactly 1 Hosts element");
+               die(tr("expected exactly 1 Hosts element"));
        }
        global $db;
        //create list of hosts
@@ -422,7 +422,7 @@ function setUserHostsXml($txt)
        if($res[0][0]!=1){
                header("X-MagicSmoke-Status: SyntaxError");
                $db->rollbackTransaction();
-               die("unknown user name");
+               die(tr("unknown user name"));
        }
        //update roles
        $acl=$xml->getElementsByTagName("Host");
@@ -449,7 +449,7 @@ function parseUserXml($txt)
        $xml=new DOMDocument;
        if(!$xml->loadXML($txt)){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("unable to parse XML data");
+               die(tr("unable to parse XML data"));
        }
        $ret=array();
        foreach($xml->getElementsByTagName("User") as $el){
@@ -528,12 +528,12 @@ function setPasswdXml($txt)
        $dom=new DOMDocument;
        if(!$dom->loadXML($txt)){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("unable to parse XML data");
+               die(tr("unable to parse XML data"));
        }
        $nl=$dom->getElementsByTagName("SetPasswd");
        if($nl->length!=1){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("expected exactly one passwd element");
+               die(tr("expected exactly one passwd element"));
        }
        $spw=$nl->item(0);
        $usr=$spw->getAttribute("user");
@@ -541,12 +541,12 @@ function setPasswdXml($txt)
        //sanity check
        if($nwp==""){
                header("X-MagicSmoke-Status: SyntaxError");
-               die("cannot set an empty password");
+               die(tr("cannot set an empty password"));
        }
        //set new password
        if($db->update("users",array("passwd"=>$nwp),"uname=".$db->escapeString($usr))===false){
                header("X-MagicSmoke-Status: Error");
-               die("Unable to change this password.");
+               die(tr("Unable to change this password."));
        }else
                header("X-MagicSmoke-Status: Ok");
 }
index b52adc3..fecdf9e 100644 (file)
@@ -28,7 +28,7 @@ $ALLOWEDREQUESTS=array(
 $SMOKEREQUEST=strtolower($_SERVER["HTTP_X_MAGICSMOKE_REQUEST"]);
 if(!in_array($SMOKEREQUEST,$ALLOWEDREQUESTS)){
        header("X-MagicSmoke-Status: InvalidRequest");
-       die("Invalid Request, please use the MagicSmoke Client with this page.");
+       die(tr("Invalid Request, please use the MagicSmoke Client with this page."));
 }
 /**contains the low-level request data from the client*/
 $REQUESTDATA="";
@@ -78,7 +78,7 @@ if($SMOKEREQUEST=="closesession"){
 $session=new Session;
 if(!$session->isValid()){
        header("X-MagicSmoke-Status: Unauthenticated");
-       die("Invalid or missing sessionid, or session timed out.");
+       die(tr("Invalid or missing sessionid, or session timed out."));
 }
 
 //request session authentication
@@ -90,7 +90,7 @@ if($SMOKEREQUEST=="sessionauth"){
 //remainder must be authenticated
 if(!$session->isAuthenticated()){
        header("X-MagicSmoke-Status: Unauthenticated");
-       die("Session not yet authenticated.");
+       die(tr("Session not yet authenticated."));
 }
 
 //get roles of myself
@@ -102,7 +102,7 @@ if($SMOKEREQUEST=="getmyroles"){
 //check that we actually are allowed to do this
 if(!$session->canExecute($SMOKEREQUEST)){
        header("X-MagicSmoke-Status: NotAllowed");
-       die("You do not have the right to execute this transaction.");
+       die(tr("You do not have the right to execute this transaction."));
 }
 
 //get a list of events
@@ -218,5 +218,5 @@ if($SMOKEREQUEST=="deletehost"){
 
 //EOF
 header("X-MagicSmoke-Status: Error");
-die("Internal Error: unknown command, hiccup in code structure.");
+die(tr("Internal Error: unknown command, hiccup in code structure."));
 ?>
\ No newline at end of file