summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorSimon Rettberg2022-10-30 20:34:08 +0100
committerSimon Rettberg2022-10-30 20:34:08 +0100
commit04f190f2741885a9d8d9ee5653a418c4614a936d (patch)
tree57411fd7aa8069af94323976e9c19cc4d8772166 /i18n
parentModernize cmake file and project structure a bit (diff)
downloadpvs2-04f190f2741885a9d8d9ee5653a418c4614a936d.tar.gz
pvs2-04f190f2741885a9d8d9ee5653a418c4614a936d.tar.xz
pvs2-04f190f2741885a9d8d9ee5653a418c4614a936d.zip
Update translation files
Diffstat (limited to 'i18n')
-rw-r--r--i18n/client/pvsclient_ar_JO.ts74
-rw-r--r--i18n/client/pvsclient_de_DE.ts74
-rw-r--r--i18n/client/pvsclient_es_MX.ts74
-rw-r--r--i18n/client/pvsclient_fr_FR.ts74
-rw-r--r--i18n/client/pvsclient_pl_PL.ts74
-rw-r--r--i18n/server/pvsmgr_ar_JO.ts6
-rw-r--r--i18n/server/pvsmgr_de_DE.ts184
-rw-r--r--i18n/server/pvsmgr_es_MX.ts178
-rw-r--r--i18n/server/pvsmgr_fr_FR.ts178
-rw-r--r--i18n/server/pvsmgr_pl_PL.ts178
10 files changed, 537 insertions, 557 deletions
diff --git a/i18n/client/pvsclient_ar_JO.ts b/i18n/client/pvsclient_ar_JO.ts
index af303f5..f443bdb 100644
--- a/i18n/client/pvsclient_ar_JO.ts
+++ b/i18n/client/pvsclient_ar_JO.ts
@@ -4,107 +4,107 @@
<context>
<name>ConnectWindow</name>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="77"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="81"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="82"/>
<source>Connected to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="89"/>
<source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="87"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
<source>&amp;Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
<source>Ready to connect.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="94"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="98"/>
<source>Scanning for session %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="97"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="101"/>
<source>Found session, connecting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="100"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="104"/>
<source>Waiting for server challenge...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="103"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="107"/>
<source>Replied to challenge, sent own...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="110"/>
<source>Logging in...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="111"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="115"/>
<source>Invalid certificate.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="114"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="118"/>
<source>Invalid TLS hash: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="117"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="121"/>
<source>Unknown state :-(</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="260"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="264"/>
<source>Session Name...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="23"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="23"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="51"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="51"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="57"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="57"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="76"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="76"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="82"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="82"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="152"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="152"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="198"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="198"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
@@ -112,12 +112,12 @@
<context>
<name>InformationDialog</name>
<message>
- <location filename="../../src/client/informationdialog/informationdialog.cpp" line="11"/>
+ <location filename="../../src/client/informationdialog/informationdialog.cpp" line="15"/>
<source>&lt;h1&gt;system information&lt;/h1&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/informationdialog/informationdialog.cpp" line="33"/>
+ <location filename="../../src/client/informationdialog/informationdialog.cpp" line="37"/>
<source>hostname</source>
<translation type="unfinished"></translation>
</message>
@@ -125,59 +125,59 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="169"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="180"/>
<source>&amp;Connect...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="170"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="181"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="172"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="183"/>
<source>&amp;Information...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="173"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="184"/>
<source>&amp;What&apos;s this?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="174"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="185"/>
<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="359"/>
<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="380"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="478"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="489"/>
<source>About PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="479"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="490"/>
<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="365"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="403"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/toolbar.ui" line="76"/>
- <location filename="../../gui/client/toolbar.ui" line="79"/>
+ <location filename="../../src/client/toolbar/toolbar.ui" line="76"/>
+ <location filename="../../src/client/toolbar/toolbar.ui" line="79"/>
<source>Menu</source>
<translation type="unfinished"></translation>
</message>
@@ -185,7 +185,7 @@
<context>
<name>VncWindow</name>
<message>
- <location filename="../../src/client/vnc/vncwindow.cpp" line="375"/>
+ <location filename="../../src/client/vnc/vncwindow.cpp" line="368"/>
<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 4a3bfa2..c053421 100644
--- a/i18n/client/pvsclient_de_DE.ts
+++ b/i18n/client/pvsclient_de_DE.ts
@@ -4,107 +4,107 @@
<context>
<name>ConnectWindow</name>
<message>
- <location filename="../../gui/client/connect.ui" line="23"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="23"/>
<source>Connect to PVS session</source>
<translation>Verbinde zu PVS Sitzung</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="51"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="51"/>
<source>Connection</source>
<translation>Verbindung</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="57"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="57"/>
<source>Connect to</source>
<translation>Verbinden zu</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="76"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="76"/>
<source>Manual Connection</source>
<translation>Manuelle Verbindung</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="82"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="82"/>
<source>Session Name</source>
<translation>Sitzungsname</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="152"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="152"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="198"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="198"/>
<source>Connect</source>
<translation>Verbinden</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="77"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="81"/>
<source>&amp;Disconnect</source>
<translation>&amp;Trennen</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="82"/>
<source>Connected to %1</source>
<translation>Verbunden zu %1</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="89"/>
<source>&amp;Stop</source>
<translation>&amp;Stop</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="87"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
<source>&amp;Connect</source>
<translation>&amp;Verbinden</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
<source>Ready to connect.</source>
<translation>Bereit für Verbindung.</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="94"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="98"/>
<source>Scanning for session %1.</source>
<translation>Suche nach Sitzung %1.</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="97"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="101"/>
<source>Found session, connecting...</source>
<translation>Sitzung gefunden, verbinden...</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="100"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="104"/>
<source>Waiting for server challenge...</source>
<translation>Warte auf Server Challenge...</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="103"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="107"/>
<source>Replied to challenge, sent own...</source>
<translation>Challenge beantwortet, sende eigene...</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="110"/>
<source>Logging in...</source>
<translation>Einloggen...</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="111"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="115"/>
<source>Invalid certificate.</source>
<translation>Ungültiges Zertifikat.</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="114"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="118"/>
<source>Invalid TLS hash: %1.</source>
<translation>Ungültiger TLS-Hash %1.</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="117"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="121"/>
<source>Unknown state :-(</source>
<translation>Unbekannter Zustand :-(</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="260"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="264"/>
<source>Session Name...</source>
<translation>Sitzungsname...</translation>
</message>
@@ -112,12 +112,12 @@
<context>
<name>InformationDialog</name>
<message>
- <location filename="../../src/client/informationdialog/informationdialog.cpp" line="11"/>
+ <location filename="../../src/client/informationdialog/informationdialog.cpp" line="15"/>
<source>&lt;h1&gt;system information&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Systeminformation&lt;/h1&gt;</translation>
</message>
<message>
- <location filename="../../src/client/informationdialog/informationdialog.cpp" line="33"/>
+ <location filename="../../src/client/informationdialog/informationdialog.cpp" line="37"/>
<source>hostname</source>
<translation>Hostname</translation>
</message>
@@ -125,59 +125,59 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="169"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="180"/>
<source>&amp;Connect...</source>
<translation>&amp;Verbinden...</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="170"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="181"/>
<source>&amp;Disconnect</source>
<translation>&amp;Trennen</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="172"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="183"/>
<source>&amp;Information...</source>
<translation>System&amp;information</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="173"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="184"/>
<source>&amp;What&apos;s this?</source>
<translation>&amp;Was ist das hier?</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="174"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="185"/>
<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="359"/>
<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="380"/>
<source>Offline</source>
<translation>Offline</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="478"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="489"/>
<source>About PVS Client</source>
<translation>Über PVS Client</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="479"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="490"/>
<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="365"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="403"/>
<source>Online</source>
<translation>Online</translation>
</message>
<message>
- <location filename="../../gui/client/toolbar.ui" line="76"/>
- <location filename="../../gui/client/toolbar.ui" line="79"/>
+ <location filename="../../src/client/toolbar/toolbar.ui" line="76"/>
+ <location filename="../../src/client/toolbar/toolbar.ui" line="79"/>
<source>Menu</source>
<translation>Menü</translation>
</message>
@@ -185,7 +185,7 @@
<context>
<name>VncWindow</name>
<message>
- <location filename="../../src/client/vnc/vncwindow.cpp" line="375"/>
+ <location filename="../../src/client/vnc/vncwindow.cpp" line="368"/>
<source>Connecting...</source>
<translation>Verbinden...</translation>
</message>
diff --git a/i18n/client/pvsclient_es_MX.ts b/i18n/client/pvsclient_es_MX.ts
index 13e143e..73f5524 100644
--- a/i18n/client/pvsclient_es_MX.ts
+++ b/i18n/client/pvsclient_es_MX.ts
@@ -4,107 +4,107 @@
<context>
<name>ConnectWindow</name>
<message>
- <location filename="../../gui/client/connect.ui" line="23"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="23"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="51"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="51"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="57"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="57"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="76"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="76"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="82"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="82"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="152"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="152"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="198"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="198"/>
<source>Connect</source>
<translation type="unfinished">Conectar</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="77"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="81"/>
<source>&amp;Disconnect</source>
<translation type="unfinished">&amp;Desconectar</translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="82"/>
<source>Connected to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="89"/>
<source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="87"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
<source>&amp;Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
<source>Ready to connect.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="94"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="98"/>
<source>Scanning for session %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="97"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="101"/>
<source>Found session, connecting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="100"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="104"/>
<source>Waiting for server challenge...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="103"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="107"/>
<source>Replied to challenge, sent own...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="110"/>
<source>Logging in...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="111"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="115"/>
<source>Invalid certificate.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="114"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="118"/>
<source>Invalid TLS hash: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="117"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="121"/>
<source>Unknown state :-(</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="260"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="264"/>
<source>Session Name...</source>
<translation type="unfinished"></translation>
</message>
@@ -112,12 +112,12 @@
<context>
<name>InformationDialog</name>
<message>
- <location filename="../../src/client/informationdialog/informationdialog.cpp" line="11"/>
+ <location filename="../../src/client/informationdialog/informationdialog.cpp" line="15"/>
<source>&lt;h1&gt;system information&lt;/h1&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/informationdialog/informationdialog.cpp" line="33"/>
+ <location filename="../../src/client/informationdialog/informationdialog.cpp" line="37"/>
<source>hostname</source>
<translation type="unfinished"></translation>
</message>
@@ -125,59 +125,59 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="169"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="180"/>
<source>&amp;Connect...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="170"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="181"/>
<source>&amp;Disconnect</source>
<translation type="unfinished">&amp;Desconectar</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="172"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="183"/>
<source>&amp;Information...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="173"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="184"/>
<source>&amp;What&apos;s this?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="174"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="185"/>
<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="359"/>
<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="380"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="478"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="489"/>
<source>About PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="479"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="490"/>
<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="365"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="403"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/toolbar.ui" line="76"/>
- <location filename="../../gui/client/toolbar.ui" line="79"/>
+ <location filename="../../src/client/toolbar/toolbar.ui" line="76"/>
+ <location filename="../../src/client/toolbar/toolbar.ui" line="79"/>
<source>Menu</source>
<translation type="unfinished">Menu</translation>
</message>
@@ -185,7 +185,7 @@
<context>
<name>VncWindow</name>
<message>
- <location filename="../../src/client/vnc/vncwindow.cpp" line="375"/>
+ <location filename="../../src/client/vnc/vncwindow.cpp" line="368"/>
<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 af303f5..f443bdb 100644
--- a/i18n/client/pvsclient_fr_FR.ts
+++ b/i18n/client/pvsclient_fr_FR.ts
@@ -4,107 +4,107 @@
<context>
<name>ConnectWindow</name>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="77"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="81"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="82"/>
<source>Connected to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="89"/>
<source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="87"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
<source>&amp;Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
<source>Ready to connect.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="94"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="98"/>
<source>Scanning for session %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="97"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="101"/>
<source>Found session, connecting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="100"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="104"/>
<source>Waiting for server challenge...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="103"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="107"/>
<source>Replied to challenge, sent own...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="110"/>
<source>Logging in...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="111"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="115"/>
<source>Invalid certificate.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="114"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="118"/>
<source>Invalid TLS hash: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="117"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="121"/>
<source>Unknown state :-(</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="260"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="264"/>
<source>Session Name...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="23"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="23"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="51"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="51"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="57"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="57"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="76"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="76"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="82"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="82"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="152"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="152"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="198"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="198"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
@@ -112,12 +112,12 @@
<context>
<name>InformationDialog</name>
<message>
- <location filename="../../src/client/informationdialog/informationdialog.cpp" line="11"/>
+ <location filename="../../src/client/informationdialog/informationdialog.cpp" line="15"/>
<source>&lt;h1&gt;system information&lt;/h1&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/informationdialog/informationdialog.cpp" line="33"/>
+ <location filename="../../src/client/informationdialog/informationdialog.cpp" line="37"/>
<source>hostname</source>
<translation type="unfinished"></translation>
</message>
@@ -125,59 +125,59 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="169"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="180"/>
<source>&amp;Connect...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="170"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="181"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="172"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="183"/>
<source>&amp;Information...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="173"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="184"/>
<source>&amp;What&apos;s this?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="174"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="185"/>
<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="359"/>
<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="380"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="478"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="489"/>
<source>About PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="479"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="490"/>
<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="365"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="403"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/toolbar.ui" line="76"/>
- <location filename="../../gui/client/toolbar.ui" line="79"/>
+ <location filename="../../src/client/toolbar/toolbar.ui" line="76"/>
+ <location filename="../../src/client/toolbar/toolbar.ui" line="79"/>
<source>Menu</source>
<translation type="unfinished"></translation>
</message>
@@ -185,7 +185,7 @@
<context>
<name>VncWindow</name>
<message>
- <location filename="../../src/client/vnc/vncwindow.cpp" line="375"/>
+ <location filename="../../src/client/vnc/vncwindow.cpp" line="368"/>
<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 af303f5..f443bdb 100644
--- a/i18n/client/pvsclient_pl_PL.ts
+++ b/i18n/client/pvsclient_pl_PL.ts
@@ -4,107 +4,107 @@
<context>
<name>ConnectWindow</name>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="77"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="81"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="82"/>
<source>Connected to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="89"/>
<source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="87"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
<source>&amp;Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
<source>Ready to connect.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="94"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="98"/>
<source>Scanning for session %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="97"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="101"/>
<source>Found session, connecting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="100"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="104"/>
<source>Waiting for server challenge...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="103"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="107"/>
<source>Replied to challenge, sent own...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="110"/>
<source>Logging in...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="111"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="115"/>
<source>Invalid certificate.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="114"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="118"/>
<source>Invalid TLS hash: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="117"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="121"/>
<source>Unknown state :-(</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/connectwindow/connectwindow.cpp" line="260"/>
+ <location filename="../../src/client/connectwindow/connectwindow.cpp" line="264"/>
<source>Session Name...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="23"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="23"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="51"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="51"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="57"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="57"/>
<source>Connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="76"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="76"/>
<source>Manual Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="82"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="82"/>
<source>Session Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="152"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="152"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/connect.ui" line="198"/>
+ <location filename="../../src/client/connectwindow/connectwindow.ui" line="198"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
@@ -112,12 +112,12 @@
<context>
<name>InformationDialog</name>
<message>
- <location filename="../../src/client/informationdialog/informationdialog.cpp" line="11"/>
+ <location filename="../../src/client/informationdialog/informationdialog.cpp" line="15"/>
<source>&lt;h1&gt;system information&lt;/h1&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/informationdialog/informationdialog.cpp" line="33"/>
+ <location filename="../../src/client/informationdialog/informationdialog.cpp" line="37"/>
<source>hostname</source>
<translation type="unfinished"></translation>
</message>
@@ -125,59 +125,59 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="169"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="180"/>
<source>&amp;Connect...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="170"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="181"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="172"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="183"/>
<source>&amp;Information...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="173"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="184"/>
<source>&amp;What&apos;s this?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="174"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="185"/>
<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="359"/>
<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="380"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="478"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="489"/>
<source>About PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="479"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="490"/>
<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="365"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="403"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/client/toolbar.ui" line="76"/>
- <location filename="../../gui/client/toolbar.ui" line="79"/>
+ <location filename="../../src/client/toolbar/toolbar.ui" line="76"/>
+ <location filename="../../src/client/toolbar/toolbar.ui" line="79"/>
<source>Menu</source>
<translation type="unfinished"></translation>
</message>
@@ -185,7 +185,7 @@
<context>
<name>VncWindow</name>
<message>
- <location filename="../../src/client/vnc/vncwindow.cpp" line="375"/>
+ <location filename="../../src/client/vnc/vncwindow.cpp" line="368"/>
<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 6a6b73c..b3e0d35 100644
--- a/i18n/server/pvsmgr_ar_JO.ts
+++ b/i18n/server/pvsmgr_ar_JO.ts
@@ -90,10 +90,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Selected client is currently online.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>No projection destination available.</source>
<translation type="unfinished"></translation>
</message>
@@ -260,7 +256,7 @@ not belonging to the current room layout?</source>
</message>
</context>
<context>
- <name>QCoreApplication</name>
+ <name>QObject</name>
<message>
<source>OpenSSL error</source>
<comment>CertManager</comment>
diff --git a/i18n/server/pvsmgr_de_DE.ts b/i18n/server/pvsmgr_de_DE.ts
index 0cac3ed..94104d9 100644
--- a/i18n/server/pvsmgr_de_DE.ts
+++ b/i18n/server/pvsmgr_de_DE.ts
@@ -1,10 +1,10 @@
<?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>
- <location filename="../../src/server/connectionframe/connectionframe.cpp" line="103"/>
+ <location filename="../../src/server/connectionframe/connectionframe.cpp" line="109"/>
<source>EXAM-MODE</source>
<translation>KLAUSURMODUS</translation>
</message>
@@ -25,300 +25,296 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
- <location filename="../../gui/server_normal/mainwindow.ui" line="167"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="164"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="167"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="88"/>
<source>Exit</source>
<translation>Beenden</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="43"/>
<source>No tutor defined.</source>
<translation>Kein Tutor definiert.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="44"/>
<source>Tutor is offline.</source>
<translation>Tutor ist offline.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="45"/>
<source>Please select a projection source.</source>
<translation>Bitte eine Projektionsquelle auswählen.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
<source>The projection source is offline.</source>
<translation>Die Projektionsquelle ist offline.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
<source>Please select a projection destination.</source>
<translation>Bitte ein Projektionsziel auswählen.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
<source>The projection destination is offline.</source>
<translation>Das Projektionsziel ist offline.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
<source>Selected projection target is tutor.</source>
<translation>Das ausgewählte Projektionsziel ist Tutor.</translation>
</message>
<message>
- <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="54"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
<source>No projection destination available.</source>
<translation>Kein Projektionsziel verfügbar.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="70"/>
<source>Reload Room</source>
<translation>Raum neu laden</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="418"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="406"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="654"/>
<source>Question</source>
<translation>Frage</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="418"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="406"/>
<source>Are you sure you want to exit?</source>
<translation>Wollen Sie den PVS-Manager wirklich beenden?</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="654"/>
<source>Do you want to delete and disconnect any clients
not belonging to the current room layout?</source>
<translation>Möchten Sie alle Teilnehmer, die nicht zum aktuellen Raumplan gehören, aus der Sitzung entfernen?</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1008"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1015"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1051"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1282"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1018"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1054"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1290"/>
<source>Selection</source>
<translation>Auswahl</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1290"/>
<source>This client is still connected.</source>
<translation>Dieser Client ist noch verbunden.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1289"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="779"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1293"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1289"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1293"/>
<source>Are you sure you want to delete the selected client?</source>
<translation>Möchten Sie den gewählten Client löschen?</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="656"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="642"/>
<source>Session Name: %1 [click to edit]</source>
<translation>Sitzungsname: %1 [anklicken editiert]</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="789"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="776"/>
<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="792"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="780"/>
<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="854"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="856"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="858"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="886"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="888"/>
- <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="935"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="937"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="939"/>
- <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="841"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="843"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="845"/>
+ <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="877"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="879"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="881"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="938"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="940"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="942"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="944"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="946"/>
<source>Projection</source>
<translation>Projektion</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1008"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1051"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1282"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1054"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
<source>No client is selected.</source>
<translation>Kein Client ausgewählt.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1015"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1018"/>
<source>The selected client is not connected.</source>
<translation>Ausgewählter Client ist nicht verbunden.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="89"/>
<source>Lock or Unlock all Clients</source>
<translation>Alle Clients sperren oder entsperren</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="170"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="170"/>
<source>Ctrl+Q</source>
<translation>Strg+Q</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="185"/>
<source>Lock/Unlock all clients</source>
<translation>Alle Clients (ent)sperren</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="182"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="182"/>
<source>This will show a black screen on all connected clients, except the tutor&apos;s client.</source>
<translation>Schaltet alle Bildschirme schwarz und deaktiviert Maus/Tastatur. Der Tutor ist von dieser Funktion ausgenommen.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="197"/>
<source>Stream currently selected client&apos;s screen content to the tutor&apos;s client.</source>
<translation>Übertrage den Bildschirminhalt des gewählten Clients an den Tutor.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="209"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="209"/>
<source>Stream currently selected client&apos;s screen content to the tutor&apos;s client while showing a locked black screen on all other clients.</source>
<translation>Der Bildschirm des gewählten Clients wird an den Tutor übertragen, während alle anderen Teilnehmer einen Schwarzen Bildschirm sehen.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="233"/>
<source>Stream the tutor&apos;s screen contents to everyone.</source>
<translation>Bildschirminhalt des Tutors an alle verbundenen Clients übertragen.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="248"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="248"/>
<source>Reset</source>
<translation>Reset</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="245"/>
<source>Unlock all clients, stop any running screen content streaming.</source>
<translation>Ausgangszustand wiederherstellen: Alle Clients entsperren, alle laufenden Bildschirmübertragungen abbrechen.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="251"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="251"/>
<source>R</source>
<translation>R</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="263"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="263"/>
<source>Declare tutor</source>
<translation>Zum Tutor ernennen</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="260"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="260"/>
<source>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</source>
<translation>Den aktuell gewählten Client zum Tutor ernennen. Der Client des Tutors wird vom Bildschirmsperren ausgenommen, und dient als fixer Endpunkt für Bildschirmübertragungen.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="212"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="212"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation>Gewählten Client an Tutor übertragen, andere Teilnehmer sperren</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="266"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="266"/>
<source>T</source>
<translation>T</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="293"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="293"/>
<source>Show this help text.</source>
<translation>Diese Hilfe anzeigen.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="299"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="314"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="314"/>
<source>Load a new room layout</source>
<translation>Neuen Raumplan laden</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="311"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="311"/>
<source>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</source>
<translation>Zeigt eine Liste aller vordefinierten Räume an. Wird ein neuer Raumplan geladen, werden alle aktuell verbundenen Clients getrennt.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="323"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="323"/>
<source>Lock or unlock the selected client only.</source>
<translation>Gewählten Client (ent)sperren.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="329"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="329"/>
<source>L</source>
<translation>L</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="188"/>
<source>Ctrl+A</source>
<translation>Strg+A</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="200"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="200"/>
<source>Student&apos;s Screen to Tutor</source>
<translation>Gewählten Client an Tutor übertragen</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="224"/>
<source>Tutor&apos;s Screen to Student</source>
<translation>Tutorenbildschirm an gewählten Client</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="221"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="221"/>
<source>Stream the tutor&apos;s screen contents to the currently selected client.</source>
<translation>Den Bildschirminhalt des Tutors an alle verbundenen Clients übertragen.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="236"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="236"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation>Tutorenbildschirm an alle</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="278"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="278"/>
<source>Delete Client</source>
<translation>Lösche Client</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="275"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="275"/>
<source>Delete currently selected client. Only allowed for disconnected clients.</source>
<translation>Den gewählten Client löschen. Nur möglich bei nicht verbundenen Clients.</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="281"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="281"/>
<source>Del</source>
<translation>Entf</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="296"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="296"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="326"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="326"/>
<source>Lock/Unlock single client</source>
<translation>Einzelnen Client (ent)sperren</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="120"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="120"/>
<source>toolBar</source>
<translation>toolBar</translation>
</message>
@@ -326,37 +322,37 @@ Note that all clients will be deleted.</source>
<context>
<name>NumericKeyboard</name>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="20"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="20"/>
<source>GroupBox</source>
<translation>GroupBox</translation>
</message>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="23"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="23"/>
<source>Keyboard</source>
<translation>Tastatur</translation>
</message>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="48"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="48"/>
<source>Del</source>
<translation>C</translation>
</message>
</context>
<context>
- <name>QCoreApplication</name>
+ <name>QObject</name>
<message>
- <location filename="../../src/server/net/certmanager.cpp" line="69"/>
+ <location filename="../../src/server/net/certmanager.cpp" line="70"/>
<source>OpenSSL error</source>
<comment>CertManager</comment>
- <translation>OpenSSL-Fehler</translation>
+ <translation type="unfinished">OpenSSL-Fehler</translation>
</message>
<message>
- <location filename="../../src/server/net/certmanager.cpp" line="70"/>
+ <location filename="../../src/server/net/certmanager.cpp" line="71"/>
<source>Could not generate certificates for secure connections.
PVS will not work.
Press OK to quit.</source>
<comment>CertManager</comment>
- <translation>Konnte kein Zertifikat + Schlüssel für gesicherte Verbindungen erzeugen.
+ <translation type="unfinished">Konnte kein Zertifikat + Schlüssel für gesicherte Verbindungen erzeugen.
PVS wird nicht funktionieren.
OK beendet den PVS-Manager.</translation>
@@ -365,12 +361,12 @@ OK beendet den PVS-Manager.</translation>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../gui/server_normal/reloadroom.ui" line="14"/>
+ <location filename="../../src/server/reloadroomwindow/reloadroomwindow.ui" line="14"/>
<source>Reload Room</source>
<translation>Raum neu laden</translation>
</message>
<message>
- <location filename="../../gui/server_normal/reloadroom.ui" line="28"/>
+ <location filename="../../src/server/reloadroomwindow/reloadroomwindow.ui" line="28"/>
<source>Choose room configuration to reload:</source>
<translation>Wählen Sie den neuzuladenden Raum:</translation>
</message>
@@ -378,17 +374,17 @@ OK beendet den PVS-Manager.</translation>
<context>
<name>SessionName</name>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="23"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.ui" line="23"/>
<source>Set session name</source>
<translation>Sitzungsname eingeben</translation>
</message>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="29"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.ui" line="29"/>
<source>New session name</source>
<translation>Neuer Sitzungsname</translation>
</message>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="58"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.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 71a62ed..883dd93 100644
--- a/i18n/server/pvsmgr_es_MX.ts
+++ b/i18n/server/pvsmgr_es_MX.ts
@@ -4,7 +4,7 @@
<context>
<name>ConnectionFrame</name>
<message>
- <location filename="../../src/server/connectionframe/connectionframe.cpp" line="103"/>
+ <location filename="../../src/server/connectionframe/connectionframe.cpp" line="109"/>
<source>EXAM-MODE</source>
<translation type="unfinished"></translation>
</message>
@@ -25,300 +25,296 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
- <location filename="../../gui/server_normal/mainwindow.ui" line="167"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="164"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="167"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="88"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="43"/>
<source>No tutor defined.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="44"/>
<source>Tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="45"/>
<source>Please select a projection source.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
<source>The projection source is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
<source>Please select a projection destination.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
<source>The projection destination is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <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="54"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
<source>No projection destination available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="70"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="418"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="406"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="654"/>
<source>Question</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="418"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="406"/>
<source>Are you sure you want to exit?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="654"/>
<source>Do you want to delete and disconnect any clients
not belonging to the current room layout?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1008"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1015"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1051"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1282"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1018"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1054"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1290"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1290"/>
<source>This client is still connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1289"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="779"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1293"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1289"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1293"/>
<source>Are you sure you want to delete the selected client?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="656"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="642"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="789"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="776"/>
<source>No item selected, please select room!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="792"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="780"/>
<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="854"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="856"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="858"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="886"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="888"/>
- <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="935"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="937"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="939"/>
- <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="841"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="843"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="845"/>
+ <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="877"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="879"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="881"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="938"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="940"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="942"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="944"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="946"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1008"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1051"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1282"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1054"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1015"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1018"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="89"/>
<source>Lock or Unlock all Clients</source>
<translation>Bloquear o desbloquear todos los clientes</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="170"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="170"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="185"/>
<source>Lock/Unlock all clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="182"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="182"/>
<source>This will show a black screen on all connected clients, except the tutor&apos;s client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="200"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="200"/>
<source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="197"/>
<source>Stream currently selected client&apos;s screen content to the tutor&apos;s client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="209"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="209"/>
<source>Stream currently selected client&apos;s screen content to the tutor&apos;s client while showing a locked black screen on all other clients.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="233"/>
<source>Stream the tutor&apos;s screen contents to everyone.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="248"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="248"/>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="245"/>
<source>Unlock all clients, stop any running screen content streaming.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="251"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="251"/>
<source>R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="263"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="263"/>
<source>Declare tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="260"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="260"/>
<source>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="212"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="212"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="266"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="266"/>
<source>T</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="293"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="293"/>
<source>Show this help text.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="299"/>
<source>F1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="314"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="314"/>
<source>Load a new room layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="311"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="311"/>
<source>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="323"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="323"/>
<source>Lock or unlock the selected client only.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="329"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="329"/>
<source>L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="224"/>
<source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="221"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="221"/>
<source>Stream the tutor&apos;s screen contents to the currently selected client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="236"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="236"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="278"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="278"/>
<source>Delete Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="275"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="275"/>
<source>Delete currently selected client. Only allowed for disconnected clients.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="281"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="281"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="296"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="296"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="326"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="326"/>
<source>Lock/Unlock single client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="188"/>
<source>Ctrl+A</source>
<translation>Ctrl+A</translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="120"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="120"/>
<source>toolBar</source>
<translation>Barra de herramientas</translation>
</message>
@@ -326,31 +322,31 @@ Note that all clients will be deleted.</source>
<context>
<name>NumericKeyboard</name>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="20"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="20"/>
<source>GroupBox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="23"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="23"/>
<source>Keyboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="48"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="48"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>QCoreApplication</name>
+ <name>QObject</name>
<message>
- <location filename="../../src/server/net/certmanager.cpp" line="69"/>
+ <location filename="../../src/server/net/certmanager.cpp" line="70"/>
<source>OpenSSL error</source>
<comment>CertManager</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/net/certmanager.cpp" line="70"/>
+ <location filename="../../src/server/net/certmanager.cpp" line="71"/>
<source>Could not generate certificates for secure connections.
PVS will not work.
@@ -362,12 +358,12 @@ Press OK to quit.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../gui/server_normal/reloadroom.ui" line="14"/>
+ <location filename="../../src/server/reloadroomwindow/reloadroomwindow.ui" line="14"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/reloadroom.ui" line="28"/>
+ <location filename="../../src/server/reloadroomwindow/reloadroomwindow.ui" line="28"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -375,17 +371,17 @@ Press OK to quit.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="23"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.ui" line="23"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="29"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.ui" line="29"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="58"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.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 3c49f17..11e2790 100644
--- a/i18n/server/pvsmgr_fr_FR.ts
+++ b/i18n/server/pvsmgr_fr_FR.ts
@@ -4,7 +4,7 @@
<context>
<name>ConnectionFrame</name>
<message>
- <location filename="../../src/server/connectionframe/connectionframe.cpp" line="103"/>
+ <location filename="../../src/server/connectionframe/connectionframe.cpp" line="109"/>
<source>EXAM-MODE</source>
<translation type="unfinished"></translation>
</message>
@@ -25,300 +25,296 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
- <location filename="../../gui/server_normal/mainwindow.ui" line="167"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="164"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="167"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="88"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="43"/>
<source>No tutor defined.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="44"/>
<source>Tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="45"/>
<source>Please select a projection source.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
<source>The projection source is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
<source>Please select a projection destination.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
<source>The projection destination is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <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="54"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
<source>No projection destination available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="70"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="418"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="406"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="654"/>
<source>Question</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="418"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="406"/>
<source>Are you sure you want to exit?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="654"/>
<source>Do you want to delete and disconnect any clients
not belonging to the current room layout?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1008"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1015"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1051"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1282"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1018"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1054"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1290"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1290"/>
<source>This client is still connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1289"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="779"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1293"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1289"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1293"/>
<source>Are you sure you want to delete the selected client?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="656"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="642"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="789"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="776"/>
<source>No item selected, please select room!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="792"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="780"/>
<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="854"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="856"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="858"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="886"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="888"/>
- <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="935"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="937"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="939"/>
- <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="841"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="843"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="845"/>
+ <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="877"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="879"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="881"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="938"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="940"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="942"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="944"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="946"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1008"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1051"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1282"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1054"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1015"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1018"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="89"/>
<source>Lock or Unlock all Clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="170"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="170"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="185"/>
<source>Lock/Unlock all clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="182"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="182"/>
<source>This will show a black screen on all connected clients, except the tutor&apos;s client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="197"/>
<source>Stream currently selected client&apos;s screen content to the tutor&apos;s client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="209"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="209"/>
<source>Stream currently selected client&apos;s screen content to the tutor&apos;s client while showing a locked black screen on all other clients.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="233"/>
<source>Stream the tutor&apos;s screen contents to everyone.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="248"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="248"/>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="245"/>
<source>Unlock all clients, stop any running screen content streaming.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="251"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="251"/>
<source>R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="263"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="263"/>
<source>Declare tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="260"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="260"/>
<source>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="212"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="212"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="266"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="266"/>
<source>T</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="293"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="293"/>
<source>Show this help text.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="299"/>
<source>F1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="314"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="314"/>
<source>Load a new room layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="311"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="311"/>
<source>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="323"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="323"/>
<source>Lock or unlock the selected client only.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="329"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="329"/>
<source>L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="188"/>
<source>Ctrl+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="200"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="200"/>
<source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="224"/>
<source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="221"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="221"/>
<source>Stream the tutor&apos;s screen contents to the currently selected client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="236"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="236"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="278"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="278"/>
<source>Delete Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="275"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="275"/>
<source>Delete currently selected client. Only allowed for disconnected clients.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="281"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="281"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="296"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="296"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="326"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="326"/>
<source>Lock/Unlock single client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="120"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="120"/>
<source>toolBar</source>
<translation type="unfinished"></translation>
</message>
@@ -326,31 +322,31 @@ Note that all clients will be deleted.</source>
<context>
<name>NumericKeyboard</name>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="20"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="20"/>
<source>GroupBox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="23"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="23"/>
<source>Keyboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="48"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="48"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>QCoreApplication</name>
+ <name>QObject</name>
<message>
- <location filename="../../src/server/net/certmanager.cpp" line="69"/>
+ <location filename="../../src/server/net/certmanager.cpp" line="70"/>
<source>OpenSSL error</source>
<comment>CertManager</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/net/certmanager.cpp" line="70"/>
+ <location filename="../../src/server/net/certmanager.cpp" line="71"/>
<source>Could not generate certificates for secure connections.
PVS will not work.
@@ -362,12 +358,12 @@ Press OK to quit.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../gui/server_normal/reloadroom.ui" line="14"/>
+ <location filename="../../src/server/reloadroomwindow/reloadroomwindow.ui" line="14"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/reloadroom.ui" line="28"/>
+ <location filename="../../src/server/reloadroomwindow/reloadroomwindow.ui" line="28"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -375,17 +371,17 @@ Press OK to quit.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="23"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.ui" line="23"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="29"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.ui" line="29"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="58"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.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 3c49f17..11e2790 100644
--- a/i18n/server/pvsmgr_pl_PL.ts
+++ b/i18n/server/pvsmgr_pl_PL.ts
@@ -4,7 +4,7 @@
<context>
<name>ConnectionFrame</name>
<message>
- <location filename="../../src/server/connectionframe/connectionframe.cpp" line="103"/>
+ <location filename="../../src/server/connectionframe/connectionframe.cpp" line="109"/>
<source>EXAM-MODE</source>
<translation type="unfinished"></translation>
</message>
@@ -25,300 +25,296 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
- <location filename="../../gui/server_normal/mainwindow.ui" line="167"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="164"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="167"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="88"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="43"/>
<source>No tutor defined.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="44"/>
<source>Tutor is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="45"/>
<source>Please select a projection source.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="46"/>
<source>The projection source is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="47"/>
<source>Please select a projection destination.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="51"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="48"/>
<source>The projection destination is offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="52"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="49"/>
<source>Selected projection target is tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <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="54"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="50"/>
<source>No projection destination available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="70"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="418"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="406"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="654"/>
<source>Question</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="418"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="406"/>
<source>Are you sure you want to exit?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="654"/>
<source>Do you want to delete and disconnect any clients
not belonging to the current room layout?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1008"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1015"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1051"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1282"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1018"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1054"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1290"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1290"/>
<source>This client is still connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1289"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="779"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1293"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1289"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1293"/>
<source>Are you sure you want to delete the selected client?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="656"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="642"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="789"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="776"/>
<source>No item selected, please select room!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="792"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="780"/>
<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="854"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="856"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="858"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="886"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="888"/>
- <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="935"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="937"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="939"/>
- <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="841"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="843"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="845"/>
+ <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="877"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="879"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="881"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="938"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="940"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="942"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="944"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="946"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1008"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1051"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1282"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1011"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1054"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1286"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1015"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1018"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="89"/>
<source>Lock or Unlock all Clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="170"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="170"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="185"/>
<source>Lock/Unlock all clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="182"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="182"/>
<source>This will show a black screen on all connected clients, except the tutor&apos;s client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="197"/>
<source>Stream currently selected client&apos;s screen content to the tutor&apos;s client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="209"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="209"/>
<source>Stream currently selected client&apos;s screen content to the tutor&apos;s client while showing a locked black screen on all other clients.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="233"/>
<source>Stream the tutor&apos;s screen contents to everyone.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="248"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="248"/>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="245"/>
<source>Unlock all clients, stop any running screen content streaming.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="251"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="251"/>
<source>R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="263"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="263"/>
<source>Declare tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="260"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="260"/>
<source>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="212"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="212"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="266"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="266"/>
<source>T</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="293"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="293"/>
<source>Show this help text.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="299"/>
<source>F1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="314"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="314"/>
<source>Load a new room layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="311"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="311"/>
<source>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="323"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="323"/>
<source>Lock or unlock the selected client only.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="329"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="329"/>
<source>L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="188"/>
<source>Ctrl+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="200"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="200"/>
<source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="224"/>
<source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="221"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="221"/>
<source>Stream the tutor&apos;s screen contents to the currently selected client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="236"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="236"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="278"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="278"/>
<source>Delete Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="275"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="275"/>
<source>Delete currently selected client. Only allowed for disconnected clients.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="281"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="281"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="296"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="296"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="326"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="326"/>
<source>Lock/Unlock single client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/mainwindow.ui" line="120"/>
+ <location filename="../../src/server/mainwindow/mainwindow.ui" line="120"/>
<source>toolBar</source>
<translation type="unfinished"></translation>
</message>
@@ -326,31 +322,31 @@ Note that all clients will be deleted.</source>
<context>
<name>NumericKeyboard</name>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="20"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="20"/>
<source>GroupBox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="23"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="23"/>
<source>Keyboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/numerickeyboard.ui" line="48"/>
+ <location filename="../../src/server/numerickeyboard/numerickeyboard.ui" line="48"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>QCoreApplication</name>
+ <name>QObject</name>
<message>
- <location filename="../../src/server/net/certmanager.cpp" line="69"/>
+ <location filename="../../src/server/net/certmanager.cpp" line="70"/>
<source>OpenSSL error</source>
<comment>CertManager</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/net/certmanager.cpp" line="70"/>
+ <location filename="../../src/server/net/certmanager.cpp" line="71"/>
<source>Could not generate certificates for secure connections.
PVS will not work.
@@ -362,12 +358,12 @@ Press OK to quit.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../gui/server_normal/reloadroom.ui" line="14"/>
+ <location filename="../../src/server/reloadroomwindow/reloadroomwindow.ui" line="14"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/reloadroom.ui" line="28"/>
+ <location filename="../../src/server/reloadroomwindow/reloadroomwindow.ui" line="28"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -375,17 +371,17 @@ Press OK to quit.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="23"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.ui" line="23"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="29"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.ui" line="29"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../gui/server_normal/sessionname.ui" line="58"/>
+ <location filename="../../src/server/sessionnamewindow/sessionnamewindow.ui" line="58"/>
<source>Random name</source>
<translation type="unfinished"></translation>
</message>