summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
Diffstat (limited to 'i18n')
-rw-r--r--i18n/client/pvsclient_ar_JO.ts52
-rw-r--r--i18n/client/pvsclient_de_DE.ts52
-rw-r--r--i18n/client/pvsclient_es_MX.ts52
-rw-r--r--i18n/client/pvsclient_fr_FR.ts52
-rw-r--r--i18n/client/pvsclient_pl_PL.ts52
-rw-r--r--i18n/server/pvsmgr_ar_JO.ts231
-rw-r--r--i18n/server/pvsmgr_de_DE.ts219
-rw-r--r--i18n/server/pvsmgr_es_MX.ts219
-rw-r--r--i18n/server/pvsmgr_fr_FR.ts219
-rw-r--r--i18n/server/pvsmgr_pl_PL.ts219
10 files changed, 504 insertions, 863 deletions
diff --git a/i18n/client/pvsclient_ar_JO.ts b/i18n/client/pvsclient_ar_JO.ts
index 9edff17..61d4969 100644
--- a/i18n/client/pvsclient_ar_JO.ts
+++ b/i18n/client/pvsclient_ar_JO.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
<context>
<name>ConnectWindow</name>
<message>
@@ -79,37 +79,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="183"/>
+ <location filename="../../gui/client/connect.ui" line="23"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="184"/>
+ <location filename="../../gui/client/connect.ui" line="42"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="185"/>
+ <location filename="../../gui/client/connect.ui" line="48"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="186"/>
+ <location filename="../../gui/client/connect.ui" line="67"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="187"/>
+ <location filename="../../gui/client/connect.ui" line="73"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="188"/>
+ <location filename="../../gui/client/connect.ui" line="134"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="190"/>
+ <location filename="../../gui/client/connect.ui" line="180"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
@@ -130,79 +130,79 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="159"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="162"/>
<source>&amp;Connect...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="160"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="163"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="162"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="165"/>
<source>&amp;Information...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="163"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="166"/>
<source>&amp;What&apos;s this?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="164"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="167"/>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="348"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="337"/>
<source>Streaming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="369"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="358"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="445"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="471"/>
<source>About PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="446"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="472"/>
<source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="354"/>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="392"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="343"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="381"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="201"/>
+ <location filename="../../gui/client/toolbar.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="203"/>
- <location filename="../../bi18n/ui_toolbar.h" line="205"/>
+ <location filename="../../gui/client/toolbar.ui" line="94"/>
+ <location filename="../../gui/client/toolbar.ui" line="97"/>
<source>Menu</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="208"/>
+ <location filename="../../gui/client/toolbar.ui" line="192"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lock this workstation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="210"/>
+ <location filename="../../gui/client/toolbar.ui" line="195"/>
<source>Lock</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="211"/>
+ <location filename="../../gui/client/toolbar.ui" line="208"/>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
@@ -210,7 +210,7 @@
<context>
<name>VncWindow</name>
<message>
- <location filename="../../src/client/vnc/vncwindow.cpp" line="256"/>
+ <location filename="../../src/client/vnc/vncwindow.cpp" line="266"/>
<source>Connecting...</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/client/pvsclient_de_DE.ts b/i18n/client/pvsclient_de_DE.ts
index 781a84e..9695544 100644
--- a/i18n/client/pvsclient_de_DE.ts
+++ b/i18n/client/pvsclient_de_DE.ts
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="de_DE" sourcelanguage="en_US">
+<TS version="2.1" language="de_DE" sourcelanguage="en_US">
<context>
<name>ConnectWindow</name>
<message>
- <location filename="../../bi18n/ui_connect.h" line="183"/>
+ <location filename="../../gui/client/connect.ui" line="23"/>
<source>Connect to PVS session</source>
<translation>Verbinde zu PVS Sitzung</translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="184"/>
+ <location filename="../../gui/client/connect.ui" line="42"/>
<source>Connection</source>
<translation>Verbinden</translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="185"/>
+ <location filename="../../gui/client/connect.ui" line="48"/>
<source>Connect to</source>
<translation>Verbinden zu</translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="186"/>
+ <location filename="../../gui/client/connect.ui" line="67"/>
<source>Manual Connection</source>
<translation>Manuelle Verbindung</translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="187"/>
+ <location filename="../../gui/client/connect.ui" line="73"/>
<source>Session Name</source>
<translation>Sitzungsname</translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="188"/>
+ <location filename="../../gui/client/connect.ui" line="134"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="190"/>
+ <location filename="../../gui/client/connect.ui" line="180"/>
<source>Connect</source>
<translation>Verbinden</translation>
</message>
@@ -130,79 +130,79 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="159"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="162"/>
<source>&amp;Connect...</source>
<translation>&amp;Verbinden...</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="160"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="163"/>
<source>&amp;Disconnect</source>
<translation>&amp;Trennen</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="162"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="165"/>
<source>&amp;Information...</source>
<translation>System&amp;information</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="163"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="166"/>
<source>&amp;What&apos;s this?</source>
<translation>&amp;Was ist das hier?</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="164"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="167"/>
<source>&amp;Quit</source>
<translation>&amp;Beenden</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="348"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="337"/>
<source>Streaming</source>
<translation>Übertragung</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="369"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="358"/>
<source>Offline</source>
<translation>Offline</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="445"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="471"/>
<source>About PVS Client</source>
<translation>Über PVS Client</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="446"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="472"/>
<source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
<translation>Der PVS - Client ist Teil eines Softwaresystems für die Steuerung des virtuellen Datenverkehrs in den Poolräumen zwischen den Dozenten- und Studenten - PCs. Es wurde zur Vereinfachung des Informationsflusses und allgemeinem eLearning entwickelt.</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="354"/>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="392"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="343"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="381"/>
<source>Online</source>
<translation>Online</translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="201"/>
+ <location filename="../../gui/client/toolbar.ui" line="14"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="203"/>
- <location filename="../../bi18n/ui_toolbar.h" line="205"/>
+ <location filename="../../gui/client/toolbar.ui" line="94"/>
+ <location filename="../../gui/client/toolbar.ui" line="97"/>
<source>Menu</source>
<translation>Menü</translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="208"/>
+ <location filename="../../gui/client/toolbar.ui" line="192"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lock this workstation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Diesen Rechner sperren&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="210"/>
+ <location filename="../../gui/client/toolbar.ui" line="195"/>
<source>Lock</source>
<translation>Sperren</translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="211"/>
+ <location filename="../../gui/client/toolbar.ui" line="208"/>
<source>Switch</source>
<translation>Wechseln</translation>
</message>
@@ -210,7 +210,7 @@
<context>
<name>VncWindow</name>
<message>
- <location filename="../../src/client/vnc/vncwindow.cpp" line="256"/>
+ <location filename="../../src/client/vnc/vncwindow.cpp" line="266"/>
<source>Connecting...</source>
<translation>Verbinden...</translation>
</message>
diff --git a/i18n/client/pvsclient_es_MX.ts b/i18n/client/pvsclient_es_MX.ts
index a0e8bcc..6b1e16d 100644
--- a/i18n/client/pvsclient_es_MX.ts
+++ b/i18n/client/pvsclient_es_MX.ts
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="es_MX" sourcelanguage="en_US">
+<TS version="2.1" language="es_MX" sourcelanguage="en_US">
<context>
<name>ConnectWindow</name>
<message>
- <location filename="../../bi18n/ui_connect.h" line="183"/>
+ <location filename="../../gui/client/connect.ui" line="23"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="184"/>
+ <location filename="../../gui/client/connect.ui" line="42"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="185"/>
+ <location filename="../../gui/client/connect.ui" line="48"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="186"/>
+ <location filename="../../gui/client/connect.ui" line="67"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="187"/>
+ <location filename="../../gui/client/connect.ui" line="73"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="188"/>
+ <location filename="../../gui/client/connect.ui" line="134"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="190"/>
+ <location filename="../../gui/client/connect.ui" line="180"/>
<source>Connect</source>
<translation type="unfinished">Conectar</translation>
</message>
@@ -130,79 +130,79 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="159"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="162"/>
<source>&amp;Connect...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="160"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="163"/>
<source>&amp;Disconnect</source>
<translation type="unfinished">&amp;Desconectar</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="162"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="165"/>
<source>&amp;Information...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="163"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="166"/>
<source>&amp;What&apos;s this?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="164"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="167"/>
<source>&amp;Quit</source>
<translation type="unfinished">&amp;Cerrar</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="348"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="337"/>
<source>Streaming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="369"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="358"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="445"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="471"/>
<source>About PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="446"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="472"/>
<source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="354"/>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="392"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="343"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="381"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="201"/>
+ <location filename="../../gui/client/toolbar.ui" line="14"/>
<source>Form</source>
<translation type="unfinished">de</translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="203"/>
- <location filename="../../bi18n/ui_toolbar.h" line="205"/>
+ <location filename="../../gui/client/toolbar.ui" line="94"/>
+ <location filename="../../gui/client/toolbar.ui" line="97"/>
<source>Menu</source>
<translation type="unfinished">Menu</translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="208"/>
+ <location filename="../../gui/client/toolbar.ui" line="192"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lock this workstation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="210"/>
+ <location filename="../../gui/client/toolbar.ui" line="195"/>
<source>Lock</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="211"/>
+ <location filename="../../gui/client/toolbar.ui" line="208"/>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
@@ -210,7 +210,7 @@
<context>
<name>VncWindow</name>
<message>
- <location filename="../../src/client/vnc/vncwindow.cpp" line="256"/>
+ <location filename="../../src/client/vnc/vncwindow.cpp" line="266"/>
<source>Connecting...</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/client/pvsclient_fr_FR.ts b/i18n/client/pvsclient_fr_FR.ts
index 9edff17..61d4969 100644
--- a/i18n/client/pvsclient_fr_FR.ts
+++ b/i18n/client/pvsclient_fr_FR.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
<context>
<name>ConnectWindow</name>
<message>
@@ -79,37 +79,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="183"/>
+ <location filename="../../gui/client/connect.ui" line="23"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="184"/>
+ <location filename="../../gui/client/connect.ui" line="42"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="185"/>
+ <location filename="../../gui/client/connect.ui" line="48"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="186"/>
+ <location filename="../../gui/client/connect.ui" line="67"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="187"/>
+ <location filename="../../gui/client/connect.ui" line="73"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="188"/>
+ <location filename="../../gui/client/connect.ui" line="134"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="190"/>
+ <location filename="../../gui/client/connect.ui" line="180"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
@@ -130,79 +130,79 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="159"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="162"/>
<source>&amp;Connect...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="160"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="163"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="162"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="165"/>
<source>&amp;Information...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="163"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="166"/>
<source>&amp;What&apos;s this?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="164"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="167"/>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="348"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="337"/>
<source>Streaming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="369"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="358"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="445"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="471"/>
<source>About PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="446"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="472"/>
<source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="354"/>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="392"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="343"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="381"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="201"/>
+ <location filename="../../gui/client/toolbar.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="203"/>
- <location filename="../../bi18n/ui_toolbar.h" line="205"/>
+ <location filename="../../gui/client/toolbar.ui" line="94"/>
+ <location filename="../../gui/client/toolbar.ui" line="97"/>
<source>Menu</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="208"/>
+ <location filename="../../gui/client/toolbar.ui" line="192"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lock this workstation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="210"/>
+ <location filename="../../gui/client/toolbar.ui" line="195"/>
<source>Lock</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="211"/>
+ <location filename="../../gui/client/toolbar.ui" line="208"/>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
@@ -210,7 +210,7 @@
<context>
<name>VncWindow</name>
<message>
- <location filename="../../src/client/vnc/vncwindow.cpp" line="256"/>
+ <location filename="../../src/client/vnc/vncwindow.cpp" line="266"/>
<source>Connecting...</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/client/pvsclient_pl_PL.ts b/i18n/client/pvsclient_pl_PL.ts
index 9edff17..61d4969 100644
--- a/i18n/client/pvsclient_pl_PL.ts
+++ b/i18n/client/pvsclient_pl_PL.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
<context>
<name>ConnectWindow</name>
<message>
@@ -79,37 +79,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="183"/>
+ <location filename="../../gui/client/connect.ui" line="23"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="184"/>
+ <location filename="../../gui/client/connect.ui" line="42"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="185"/>
+ <location filename="../../gui/client/connect.ui" line="48"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="186"/>
+ <location filename="../../gui/client/connect.ui" line="67"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="187"/>
+ <location filename="../../gui/client/connect.ui" line="73"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="188"/>
+ <location filename="../../gui/client/connect.ui" line="134"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_connect.h" line="190"/>
+ <location filename="../../gui/client/connect.ui" line="180"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
@@ -130,79 +130,79 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="159"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="162"/>
<source>&amp;Connect...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="160"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="163"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="162"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="165"/>
<source>&amp;Information...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="163"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="166"/>
<source>&amp;What&apos;s this?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="164"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="167"/>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="348"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="337"/>
<source>Streaming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="369"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="358"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="445"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="471"/>
<source>About PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="446"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="472"/>
<source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="354"/>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="392"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="343"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="381"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="201"/>
+ <location filename="../../gui/client/toolbar.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="203"/>
- <location filename="../../bi18n/ui_toolbar.h" line="205"/>
+ <location filename="../../gui/client/toolbar.ui" line="94"/>
+ <location filename="../../gui/client/toolbar.ui" line="97"/>
<source>Menu</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="208"/>
+ <location filename="../../gui/client/toolbar.ui" line="192"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lock this workstation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="210"/>
+ <location filename="../../gui/client/toolbar.ui" line="195"/>
<source>Lock</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_toolbar.h" line="211"/>
+ <location filename="../../gui/client/toolbar.ui" line="208"/>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
@@ -210,7 +210,7 @@
<context>
<name>VncWindow</name>
<message>
- <location filename="../../src/client/vnc/vncwindow.cpp" line="256"/>
+ <location filename="../../src/client/vnc/vncwindow.cpp" line="266"/>
<source>Connecting...</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/server/pvsmgr_ar_JO.ts b/i18n/server/pvsmgr_ar_JO.ts
index a776887..1ad154e 100644
--- a/i18n/server/pvsmgr_ar_JO.ts
+++ b/i18n/server/pvsmgr_ar_JO.ts
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
<context>
<name>ConnectionFrame</name>
<message>
- <location filename="../../src/server/connectionframe/connectionframe.cpp" line="103"/>
<source>EXAM-MODE</source>
<translation type="unfinished"></translation>
</message>
@@ -12,57 +11,46 @@
<context>
<name>Help</name>
<message>
- <location filename="../../bi18n/ui_help.h" line="347"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="351"/>
+ <source>Refresh classroom configuration after choosing the room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Lock all connected students screens.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="353"/>
<source>Start projection from tutor to all connected students.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="355"/>
<source>Start projection from tutor to selected student.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="357"/>
<source>Start projection from selected student to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="359"/>
<source>Start projection from selected student to tutor and blank all others.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="363"/>
- <source>Delete selected client</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_help.h" line="365"/>
- <source>Stop running projections.</source>
+ <source>Set selected client to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="360"/>
- <source>Set selected client to tutor.</source>
+ <source>Delete selected client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="349"/>
- <source>Refresh classroom configuration after choosing the room.</source>
+ <source>Stop running projections.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="366"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -70,297 +58,175 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="208"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
- <source>Exit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="45"/>
- <source>No tutor defined.</source>
+ <source>toolBar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
- <source>Tutor is offline.</source>
+ <source>&amp;Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
- <source>Please select a projection source.</source>
+ <source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
- <source>The projection source is offline.</source>
+ <source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
- <source>Please select a projection destination.</source>
+ <source>lock</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
- <source>The projection destination is offline.</source>
+ <source>Lock or Unlock all Clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
- <source>Selected projection target is tutor.</source>
+ <source>Ctrl+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
- <source>Selected client is currently online.</source>
+ <source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="53"/>
- <source>No projection destination available.</source>
+ <source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1043"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1049"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1287"/>
- <source>Selection</source>
+ <source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1287"/>
- <source>This client is still connected.</source>
+ <source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1291"/>
- <source>Sure, You want to delete selected client?</source>
+ <source>Stop Projection on every Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="662"/>
- <source>Sure, You want to change SessionName again?
-All Clients will be deleted afterwards.</source>
+ <source>SetAsTutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="687"/>
- <source>Session Name: %1 [click to edit]</source>
+ <source>Set current Frame as Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="793"/>
- <source>No item selected, please select room!</source>
+ <source>Delete Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="796"/>
- <source>Are you sure you want to reload the room?
-Note that all clients will be deleted.</source>
+ <source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="858"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="860"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="862"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="890"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="892"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="894"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="896"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="898"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="928"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="930"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="932"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="934"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="936"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="966"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="968"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="970"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="974"/>
- <source>Projection</source>
+ <source>Reload Room Configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1043"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
- <source>No client is selected.</source>
+ <source>No tutor defined.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1049"/>
- <source>The selected client is not connected.</source>
+ <source>Tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="213"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
- <source>Lock or Unlock all Clients</source>
+ <source>Please select a projection source.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="205"/>
- <source>PVS2 Manager</source>
+ <source>The projection source is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="206"/>
- <source>&amp;Exit</source>
+ <source>Please select a projection destination.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="210"/>
- <source>Ctrl+Q</source>
+ <source>The projection destination is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="211"/>
- <source>lock</source>
+ <source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="215"/>
- <source>Ctrl+A</source>
+ <source>Selected client is currently online.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="216"/>
- <source>Student&apos;s Screen to Tutor</source>
+ <source>No projection destination available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="217"/>
- <source>Student&apos;s Screen to Tutor, others blanked</source>
+ <source>Sure, You want to change SessionName again?
+All Clients will be deleted afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="218"/>
- <source>Tutor&apos;s Screen to Student</source>
+ <source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="219"/>
- <source>Tutor&apos;s Screen to Everyone</source>
+ <source>No item selected, please select room!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="220"/>
- <source>Stop Projection on every Client</source>
+ <source>Are you sure you want to reload the room?
+Note that all clients will be deleted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="221"/>
- <source>SetAsTutor</source>
+ <source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="223"/>
- <source>Set current Frame as Tutor</source>
+ <source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="225"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="227"/>
- <source>Delete Client</source>
+ <source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="229"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="231"/>
- <source>Help</source>
+ <source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="233"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="235"/>
- <source>Reload Room Configuration</source>
+ <source>This client is still connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="238"/>
- <source>toolBar</source>
+ <source>Sure, You want to delete selected client?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NumericKeyboard</name>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="121"/>
<source>GroupBox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="122"/>
<source>Keyboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="123"/>
- <source>0</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="124"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="125"/>
- <source>1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="126"/>
- <source>8</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="127"/>
- <source>4</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="128"/>
- <source>2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="129"/>
- <source>5</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="130"/>
- <source>7</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="131"/>
- <source>3</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="132"/>
- <source>6</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="133"/>
- <source>9</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/server/net/certmanager.cpp" line="69"/>
<source>OpenSSL error</source>
<comment>CertManager</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/net/certmanager.cpp" line="70"/>
<source>Could not generate certificates for secure connections.
PVS will not work.
@@ -372,12 +238,10 @@ Press OK to quit.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../bi18n/ui_reloadroom.h" line="68"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_reloadroom.h" line="69"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -385,17 +249,14 @@ Press OK to quit.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="90"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="91"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="92"/>
<source>Random name</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/server/pvsmgr_de_DE.ts b/i18n/server/pvsmgr_de_DE.ts
index 4a3d7c3..9c6d0ae 100644
--- a/i18n/server/pvsmgr_de_DE.ts
+++ b/i18n/server/pvsmgr_de_DE.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="de_DE" sourcelanguage="en_US">
+<TS version="2.1" language="de_DE" sourcelanguage="en_US">
<context>
<name>ConnectionFrame</name>
<message>
@@ -12,57 +12,57 @@
<context>
<name>Help</name>
<message>
- <location filename="../../bi18n/ui_help.h" line="347"/>
+ <location filename="../../gui/server_normal/help.ui" line="20"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="349"/>
+ <location filename="../../gui/server_normal/help.ui" line="60"/>
<source>Refresh classroom configuration after choosing the room.</source>
<translation>Lade nach Raumauswahl entsprechende Raumkonfiguration neu.</translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="363"/>
+ <location filename="../../gui/server_normal/help.ui" line="500"/>
<source>Delete selected client</source>
<translation>Lösche ausgewählten Client</translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="366"/>
+ <location filename="../../gui/server_normal/help.ui" line="588"/>
<source>Cancel</source>
<translation>Abbruch</translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="365"/>
+ <location filename="../../gui/server_normal/help.ui" line="557"/>
<source>Stop running projections.</source>
<translation>Alle Projektionen abbrechen.</translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="359"/>
+ <location filename="../../gui/server_normal/help.ui" line="370"/>
<source>Start projection from selected student to tutor and blank all others.</source>
<translation>Projektion des ausgewählten Studierendens an Tutor; alle anderen ausblenden.</translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="357"/>
+ <location filename="../../gui/server_normal/help.ui" line="311"/>
<source>Start projection from selected student to tutor.</source>
<translation>Startet Projektion von ausgewähltem Studierenden an Tutor.</translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="355"/>
+ <location filename="../../gui/server_normal/help.ui" line="252"/>
<source>Start projection from tutor to selected student.</source>
<translation>Startet Projektion von Tutor an ausgewählten Studierenden.</translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="353"/>
+ <location filename="../../gui/server_normal/help.ui" line="193"/>
<source>Start projection from tutor to all connected students.</source>
<translation>Startet Projektion von Tutor an alle verbundenen Studierenden.</translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="351"/>
+ <location filename="../../gui/server_normal/help.ui" line="128"/>
<source>Lock all connected students screens.</source>
<translation>Alle verbundenen Studierendenbildschirme sperren.</translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="360"/>
+ <location filename="../../gui/server_normal/help.ui" line="407"/>
<source>Set selected client to tutor.</source>
<translation>Ausgewählten Klienten als Tutor festlegen.</translation>
</message>
@@ -70,216 +70,211 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="208"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="166"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="102"/>
<source>Exit</source>
<translation>Ausgang</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="45"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
<source>No tutor defined.</source>
<translation>Kein Tutor definiert.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
<source>Tutor is offline.</source>
<translation>Tutor ist offline.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
<source>Please select a projection source.</source>
<translation>Bitte eine Projektionsquelle auswählen.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
<source>The projection source is offline.</source>
<translation>Die Projektionsquelle ist offline.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
<source>Please select a projection destination.</source>
<translation>Bitte ein Projektionsziel auswählen.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
<source>The projection destination is offline.</source>
<translation>Das Projektionsziel ist offline.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
<source>Selected projection target is tutor.</source>
<translation>Das ausgwählte Projektionsziel ist Tutor.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="53"/>
<source>Selected client is currently online.</source>
<translation>Der ausgewählte Client ist derzeit online.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="53"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="54"/>
<source>No projection destination available.</source>
<translation>Kein Projektionsziel verfügbar.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1043"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1049"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1287"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1056"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1062"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1296"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1300"/>
<source>Selection</source>
<translation>Auswahl</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1287"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1300"/>
<source>This client is still connected.</source>
<translation>Dieser Client ist noch verbunden.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1291"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
<source>Sure, You want to delete selected client?</source>
<translation>Sicher, dass Sie den ausgewählten Clienten löschen wollen?</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="662"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="675"/>
<source>Sure, You want to change SessionName again?
All Clients will be deleted afterwards.</source>
<translation>Sicher, dass Sie den Sitzungsname erneut ändern wollen?
Danach werden alle Clienten gelöscht sein.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="687"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="700"/>
<source>Session Name: %1 [click to edit]</source>
<translation>Sitzungsname: %1 [anklicken editiert]</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="793"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="806"/>
<source>No item selected, please select room!</source>
<translation>Keine Auswahl getroffen, bitte einen Raum auswählen!</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="796"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="809"/>
<source>Are you sure you want to reload the room?
Note that all clients will be deleted.</source>
<translation>Wollen Sie den Raum wirklich neu laden? Beachten Sie, dass alle Clienten gelöscht werden.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="858"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="860"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="862"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="890"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="892"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="894"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="896"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="898"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="928"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="930"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="932"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="934"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="936"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="966"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="968"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="970"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="974"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="871"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="873"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="875"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="903"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="905"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="907"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="909"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="911"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="941"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="943"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="945"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="947"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="949"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="981"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="983"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="985"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>Projection</source>
<translation>Projektion</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1043"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1056"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1296"/>
<source>No client is selected.</source>
<translation>Kein Client ausgewählt.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1049"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1062"/>
<source>The selected client is not connected.</source>
<translation>Ausgewählter Client ist nicht verbunden.</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="213"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="184"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="103"/>
<source>Lock or Unlock all Clients</source>
<translation>Alle Klienten sperren oder entsperren</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="205"/>
- <source>PVS2 Manager</source>
- <translation>PVS2-Manager</translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_mainwindow.h" line="206"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="163"/>
<source>&amp;Exit</source>
<translation>&amp;Abbruch</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="210"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="169"/>
<source>Ctrl+Q</source>
<translation>Strg+Q</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="211"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="181"/>
<source>lock</source>
<translation>lock</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="215"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="187"/>
<source>Ctrl+A</source>
<translation>Strg+A</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="216"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="196"/>
<source>Student&apos;s Screen to Tutor</source>
<translation>Studierendenbildschirm an Tutor</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="217"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="205"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation>Studierendenbildschirm an Tutor; alle anderen ausgeblendet</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="218"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="214"/>
<source>Tutor&apos;s Screen to Student</source>
<translation>Tutorenbildschirm an Studierenden</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="219"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="223"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation>Tutorenbildschirm an alle</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="220"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="232"/>
<source>Stop Projection on every Client</source>
<translation>Projektion an alle Clienten abbrechen</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="221"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="241"/>
<source>SetAsTutor</source>
<translation>AlsTutorSetzen</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="223"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="244"/>
<source>Set current Frame as Tutor</source>
<translation>Derzeitigen Rahmen als Tutor festlegen</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="225"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="227"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="253"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="256"/>
<source>Delete Client</source>
<translation>Lösche Client</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="229"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="231"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="268"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="271"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="233"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="235"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="283"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="286"/>
<source>Reload Room Configuration</source>
<translation>Neu laden der Raumkonfiguration</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="238"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="120"/>
<source>toolBar</source>
<translation>toolBar</translation>
</message>
@@ -287,70 +282,20 @@ Note that all clients will be deleted.</source>
<context>
<name>NumericKeyboard</name>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="121"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="20"/>
<source>GroupBox</source>
<translation>GroupBox</translation>
</message>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="122"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="23"/>
<source>Keyboard</source>
<translation>Tastatur</translation>
</message>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="123"/>
- <source>0</source>
- <translation>0</translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="124"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="48"/>
<source>Del</source>
<translation>C</translation>
</message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="125"/>
- <source>1</source>
- <translation>1</translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="126"/>
- <source>8</source>
- <translation>8</translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="127"/>
- <source>4</source>
- <translation>4</translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="128"/>
- <source>2</source>
- <translation>2</translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="129"/>
- <source>5</source>
- <translation>5</translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="130"/>
- <source>7</source>
- <translation>7</translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="131"/>
- <source>3</source>
- <translation>3</translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="132"/>
- <source>6</source>
- <translation>6</translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="133"/>
- <source>9</source>
- <translation>9</translation>
- </message>
</context>
<context>
<name>QCoreApplication</name>
@@ -376,12 +321,12 @@ OK beendet den PVS-Manager</translation>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../bi18n/ui_reloadroom.h" line="68"/>
+ <location filename="../../gui/server_normal/reloadroom.ui" line="14"/>
<source>Reload Room</source>
<translation>Raum neu laden</translation>
</message>
<message>
- <location filename="../../bi18n/ui_reloadroom.h" line="69"/>
+ <location filename="../../gui/server_normal/reloadroom.ui" line="38"/>
<source>Choose room configuration to reload:</source>
<translation>Wählen Sie den neuzuladenden Raum:</translation>
</message>
@@ -389,17 +334,17 @@ OK beendet den PVS-Manager</translation>
<context>
<name>SessionName</name>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="90"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="23"/>
<source>Set session name</source>
<translation>Sitzungsname eingeben</translation>
</message>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="91"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="29"/>
<source>New session name</source>
<translation>Neuer Sitzungsname</translation>
</message>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="92"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="58"/>
<source>Random name</source>
<translation>Zufälliger Sitzungsname</translation>
</message>
diff --git a/i18n/server/pvsmgr_es_MX.ts b/i18n/server/pvsmgr_es_MX.ts
index 829da4e..b47934f 100644
--- a/i18n/server/pvsmgr_es_MX.ts
+++ b/i18n/server/pvsmgr_es_MX.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="es_MX" sourcelanguage="en_US">
+<TS version="2.1" language="es_MX" sourcelanguage="en_US">
<context>
<name>ConnectionFrame</name>
<message>
@@ -12,57 +12,57 @@
<context>
<name>Help</name>
<message>
- <location filename="../../bi18n/ui_help.h" line="347"/>
+ <location filename="../../gui/server_normal/help.ui" line="20"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="351"/>
+ <location filename="../../gui/server_normal/help.ui" line="128"/>
<source>Lock all connected students screens.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="353"/>
+ <location filename="../../gui/server_normal/help.ui" line="193"/>
<source>Start projection from tutor to all connected students.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="355"/>
+ <location filename="../../gui/server_normal/help.ui" line="252"/>
<source>Start projection from tutor to selected student.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="357"/>
+ <location filename="../../gui/server_normal/help.ui" line="311"/>
<source>Start projection from selected student to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="359"/>
+ <location filename="../../gui/server_normal/help.ui" line="370"/>
<source>Start projection from selected student to tutor and blank all others.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="363"/>
+ <location filename="../../gui/server_normal/help.ui" line="500"/>
<source>Delete selected client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="365"/>
+ <location filename="../../gui/server_normal/help.ui" line="557"/>
<source>Stop running projections.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="360"/>
+ <location filename="../../gui/server_normal/help.ui" line="407"/>
<source>Set selected client to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="349"/>
+ <location filename="../../gui/server_normal/help.ui" line="60"/>
<source>Refresh classroom configuration after choosing the room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="366"/>
+ <location filename="../../gui/server_normal/help.ui" line="588"/>
<source>Cancel</source>
<translation type="unfinished">Cancelar</translation>
</message>
@@ -70,215 +70,210 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="208"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="166"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="102"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="45"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
<source>No tutor defined.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
<source>Tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
<source>Please select a projection source.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
<source>The projection source is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
<source>Please select a projection destination.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
<source>The projection destination is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="53"/>
<source>Selected client is currently online.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="53"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="54"/>
<source>No projection destination available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1043"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1049"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1287"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1056"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1062"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1296"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1300"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1287"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1300"/>
<source>This client is still connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1291"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
<source>Sure, You want to delete selected client?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="662"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="675"/>
<source>Sure, You want to change SessionName again?
All Clients will be deleted afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="687"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="700"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="793"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="806"/>
<source>No item selected, please select room!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="796"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="809"/>
<source>Are you sure you want to reload the room?
Note that all clients will be deleted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="858"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="860"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="862"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="890"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="892"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="894"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="896"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="898"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="928"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="930"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="932"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="934"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="936"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="966"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="968"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="970"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="974"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="871"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="873"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="875"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="903"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="905"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="907"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="909"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="911"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="941"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="943"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="945"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="947"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="949"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="981"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="983"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="985"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1043"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1056"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1296"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1049"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1062"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="213"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="184"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="103"/>
<source>Lock or Unlock all Clients</source>
<translation>Bloquear o desbloquear todos los clientes</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="205"/>
- <source>PVS2 Manager</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_mainwindow.h" line="206"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="163"/>
<source>&amp;Exit</source>
<translation>&amp;Salir</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="210"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="169"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="216"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="196"/>
<source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="217"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="205"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="218"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="214"/>
<source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="219"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="223"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="220"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="232"/>
<source>Stop Projection on every Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="221"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="241"/>
<source>SetAsTutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="223"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="244"/>
<source>Set current Frame as Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="225"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="227"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="253"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="256"/>
<source>Delete Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="229"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="231"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="268"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="271"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="233"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="235"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="283"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="286"/>
<source>Reload Room Configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="211"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="181"/>
<source>lock</source>
<translation>bloquear</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="215"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="187"/>
<source>Ctrl+A</source>
<translation>Ctrl+A</translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="238"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="120"/>
<source>toolBar</source>
<translation>Barra de herramientas</translation>
</message>
@@ -286,70 +281,20 @@ Note that all clients will be deleted.</source>
<context>
<name>NumericKeyboard</name>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="121"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="20"/>
<source>GroupBox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="122"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="23"/>
<source>Keyboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="123"/>
- <source>0</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="124"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="48"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="125"/>
- <source>1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="126"/>
- <source>8</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="127"/>
- <source>4</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="128"/>
- <source>2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="129"/>
- <source>5</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="130"/>
- <source>7</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="131"/>
- <source>3</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="132"/>
- <source>6</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="133"/>
- <source>9</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>QCoreApplication</name>
@@ -372,12 +317,12 @@ Press OK to quit.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../bi18n/ui_reloadroom.h" line="68"/>
+ <location filename="../../gui/server_normal/reloadroom.ui" line="14"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_reloadroom.h" line="69"/>
+ <location filename="../../gui/server_normal/reloadroom.ui" line="38"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -385,17 +330,17 @@ Press OK to quit.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="90"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="23"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="91"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="29"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="92"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="58"/>
<source>Random name</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/server/pvsmgr_fr_FR.ts b/i18n/server/pvsmgr_fr_FR.ts
index a776887..f41176d 100644
--- a/i18n/server/pvsmgr_fr_FR.ts
+++ b/i18n/server/pvsmgr_fr_FR.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
<context>
<name>ConnectionFrame</name>
<message>
@@ -12,57 +12,57 @@
<context>
<name>Help</name>
<message>
- <location filename="../../bi18n/ui_help.h" line="347"/>
+ <location filename="../../gui/server_normal/help.ui" line="20"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="351"/>
+ <location filename="../../gui/server_normal/help.ui" line="128"/>
<source>Lock all connected students screens.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="353"/>
+ <location filename="../../gui/server_normal/help.ui" line="193"/>
<source>Start projection from tutor to all connected students.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="355"/>
+ <location filename="../../gui/server_normal/help.ui" line="252"/>
<source>Start projection from tutor to selected student.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="357"/>
+ <location filename="../../gui/server_normal/help.ui" line="311"/>
<source>Start projection from selected student to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="359"/>
+ <location filename="../../gui/server_normal/help.ui" line="370"/>
<source>Start projection from selected student to tutor and blank all others.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="363"/>
+ <location filename="../../gui/server_normal/help.ui" line="500"/>
<source>Delete selected client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="365"/>
+ <location filename="../../gui/server_normal/help.ui" line="557"/>
<source>Stop running projections.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="360"/>
+ <location filename="../../gui/server_normal/help.ui" line="407"/>
<source>Set selected client to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="349"/>
+ <location filename="../../gui/server_normal/help.ui" line="60"/>
<source>Refresh classroom configuration after choosing the room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="366"/>
+ <location filename="../../gui/server_normal/help.ui" line="588"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -70,215 +70,210 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="208"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="166"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="102"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="45"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
<source>No tutor defined.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
<source>Tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
<source>Please select a projection source.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
<source>The projection source is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
<source>Please select a projection destination.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
<source>The projection destination is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="53"/>
<source>Selected client is currently online.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="53"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="54"/>
<source>No projection destination available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1043"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1049"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1287"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1056"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1062"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1296"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1300"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1287"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1300"/>
<source>This client is still connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1291"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
<source>Sure, You want to delete selected client?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="662"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="675"/>
<source>Sure, You want to change SessionName again?
All Clients will be deleted afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="687"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="700"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="793"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="806"/>
<source>No item selected, please select room!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="796"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="809"/>
<source>Are you sure you want to reload the room?
Note that all clients will be deleted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="858"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="860"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="862"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="890"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="892"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="894"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="896"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="898"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="928"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="930"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="932"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="934"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="936"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="966"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="968"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="970"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="974"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="871"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="873"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="875"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="903"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="905"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="907"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="909"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="911"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="941"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="943"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="945"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="947"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="949"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="981"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="983"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="985"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1043"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1056"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1296"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1049"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1062"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="213"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="184"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="103"/>
<source>Lock or Unlock all Clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="205"/>
- <source>PVS2 Manager</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_mainwindow.h" line="206"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="163"/>
<source>&amp;Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="210"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="169"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="211"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="181"/>
<source>lock</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="215"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="187"/>
<source>Ctrl+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="216"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="196"/>
<source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="217"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="205"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="218"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="214"/>
<source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="219"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="223"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="220"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="232"/>
<source>Stop Projection on every Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="221"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="241"/>
<source>SetAsTutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="223"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="244"/>
<source>Set current Frame as Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="225"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="227"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="253"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="256"/>
<source>Delete Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="229"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="231"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="268"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="271"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="233"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="235"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="283"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="286"/>
<source>Reload Room Configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="238"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="120"/>
<source>toolBar</source>
<translation type="unfinished"></translation>
</message>
@@ -286,70 +281,20 @@ Note that all clients will be deleted.</source>
<context>
<name>NumericKeyboard</name>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="121"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="20"/>
<source>GroupBox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="122"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="23"/>
<source>Keyboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="123"/>
- <source>0</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="124"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="48"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="125"/>
- <source>1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="126"/>
- <source>8</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="127"/>
- <source>4</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="128"/>
- <source>2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="129"/>
- <source>5</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="130"/>
- <source>7</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="131"/>
- <source>3</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="132"/>
- <source>6</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="133"/>
- <source>9</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>QCoreApplication</name>
@@ -372,12 +317,12 @@ Press OK to quit.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../bi18n/ui_reloadroom.h" line="68"/>
+ <location filename="../../gui/server_normal/reloadroom.ui" line="14"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_reloadroom.h" line="69"/>
+ <location filename="../../gui/server_normal/reloadroom.ui" line="38"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -385,17 +330,17 @@ Press OK to quit.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="90"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="23"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="91"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="29"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="92"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="58"/>
<source>Random name</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/server/pvsmgr_pl_PL.ts b/i18n/server/pvsmgr_pl_PL.ts
index a776887..f41176d 100644
--- a/i18n/server/pvsmgr_pl_PL.ts
+++ b/i18n/server/pvsmgr_pl_PL.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
<context>
<name>ConnectionFrame</name>
<message>
@@ -12,57 +12,57 @@
<context>
<name>Help</name>
<message>
- <location filename="../../bi18n/ui_help.h" line="347"/>
+ <location filename="../../gui/server_normal/help.ui" line="20"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="351"/>
+ <location filename="../../gui/server_normal/help.ui" line="128"/>
<source>Lock all connected students screens.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="353"/>
+ <location filename="../../gui/server_normal/help.ui" line="193"/>
<source>Start projection from tutor to all connected students.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="355"/>
+ <location filename="../../gui/server_normal/help.ui" line="252"/>
<source>Start projection from tutor to selected student.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="357"/>
+ <location filename="../../gui/server_normal/help.ui" line="311"/>
<source>Start projection from selected student to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="359"/>
+ <location filename="../../gui/server_normal/help.ui" line="370"/>
<source>Start projection from selected student to tutor and blank all others.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="363"/>
+ <location filename="../../gui/server_normal/help.ui" line="500"/>
<source>Delete selected client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="365"/>
+ <location filename="../../gui/server_normal/help.ui" line="557"/>
<source>Stop running projections.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="360"/>
+ <location filename="../../gui/server_normal/help.ui" line="407"/>
<source>Set selected client to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="349"/>
+ <location filename="../../gui/server_normal/help.ui" line="60"/>
<source>Refresh classroom configuration after choosing the room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_help.h" line="366"/>
+ <location filename="../../gui/server_normal/help.ui" line="588"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -70,215 +70,210 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="208"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="166"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="102"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="45"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
<source>No tutor defined.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
<source>Tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
<source>Please select a projection source.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
<source>The projection source is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
<source>Please select a projection destination.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
<source>The projection destination is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="53"/>
<source>Selected client is currently online.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="53"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="54"/>
<source>No projection destination available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1043"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1049"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1287"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1056"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1062"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1296"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1300"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1287"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1300"/>
<source>This client is still connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1291"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
<source>Sure, You want to delete selected client?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="662"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="675"/>
<source>Sure, You want to change SessionName again?
All Clients will be deleted afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="687"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="700"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="793"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="806"/>
<source>No item selected, please select room!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="796"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="809"/>
<source>Are you sure you want to reload the room?
Note that all clients will be deleted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="858"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="860"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="862"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="890"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="892"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="894"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="896"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="898"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="928"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="930"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="932"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="934"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="936"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="966"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="968"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="970"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="974"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="871"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="873"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="875"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="903"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="905"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="907"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="909"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="911"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="941"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="943"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="945"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="947"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="949"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="981"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="983"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="985"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1043"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1283"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1056"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1296"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1049"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1062"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="213"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="184"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="103"/>
<source>Lock or Unlock all Clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="205"/>
- <source>PVS2 Manager</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_mainwindow.h" line="206"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="163"/>
<source>&amp;Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="210"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="169"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="211"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="181"/>
<source>lock</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="215"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="187"/>
<source>Ctrl+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="216"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="196"/>
<source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="217"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="205"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="218"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="214"/>
<source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="219"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="223"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="220"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="232"/>
<source>Stop Projection on every Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="221"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="241"/>
<source>SetAsTutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="223"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="244"/>
<source>Set current Frame as Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="225"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="227"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="253"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="256"/>
<source>Delete Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="229"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="231"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="268"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="271"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="233"/>
- <location filename="../../bi18n/ui_mainwindow.h" line="235"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="283"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="286"/>
<source>Reload Room Configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_mainwindow.h" line="238"/>
+ <location filename="../../gui/server_normal/mainwindow.ui" line="120"/>
<source>toolBar</source>
<translation type="unfinished"></translation>
</message>
@@ -286,70 +281,20 @@ Note that all clients will be deleted.</source>
<context>
<name>NumericKeyboard</name>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="121"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="20"/>
<source>GroupBox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="122"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="23"/>
<source>Keyboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="123"/>
- <source>0</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="124"/>
+ <location filename="../../gui/server_normal/numerickeyboard.ui" line="48"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="125"/>
- <source>1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="126"/>
- <source>8</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="127"/>
- <source>4</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="128"/>
- <source>2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="129"/>
- <source>5</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="130"/>
- <source>7</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="131"/>
- <source>3</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="132"/>
- <source>6</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../bi18n/ui_numerickeyboard.h" line="133"/>
- <source>9</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>QCoreApplication</name>
@@ -372,12 +317,12 @@ Press OK to quit.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../bi18n/ui_reloadroom.h" line="68"/>
+ <location filename="../../gui/server_normal/reloadroom.ui" line="14"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_reloadroom.h" line="69"/>
+ <location filename="../../gui/server_normal/reloadroom.ui" line="38"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -385,17 +330,17 @@ Press OK to quit.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="90"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="23"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="91"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="29"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../bi18n/ui_sessionname.h" line="92"/>
+ <location filename="../../gui/server_normal/sessionname.ui" line="58"/>
<source>Random name</source>
<translation type="unfinished"></translation>
</message>