summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-09-05 16:20:36 +0200
committerBjörn Hagemeister2014-09-05 16:20:36 +0200
commit27109b3f281378991799bd3467f5ca25b72cd96d (patch)
tree559de77ed5f5a10a876988afba88ea6b46584395
parentFixed segfault occuring after not choosing a room for reload room configuration. (diff)
downloadpvs2-27109b3f281378991799bd3467f5ca25b72cd96d.tar.gz
pvs2-27109b3f281378991799bd3467f5ca25b72cd96d.tar.xz
pvs2-27109b3f281378991799bd3467f5ca25b72cd96d.zip
Changed Icon for reload room configuration and added some translations.
-rw-r--r--gui/server_normal/mainwindow.ui4
-rw-r--r--i18n/client/pvsclient_ar_JO.ts34
-rw-r--r--i18n/client/pvsclient_de_DE.ts34
-rw-r--r--i18n/client/pvsclient_es_MX.ts34
-rw-r--r--i18n/client/pvsclient_fr_FR.ts34
-rw-r--r--i18n/client/pvsclient_pl_PL.ts34
-rw-r--r--i18n/server/pvsmgr_ar_JO.ts123
-rw-r--r--i18n/server/pvsmgr_de_DE.ts124
-rw-r--r--i18n/server/pvsmgr_es_MX.ts123
-rw-r--r--i18n/server/pvsmgr_fr_FR.ts123
-rw-r--r--i18n/server/pvsmgr_pl_PL.ts123
-rw-r--r--pvsmgr.qrc2
-rw-r--r--src/server/mainwindow/mainwindow.cpp6
13 files changed, 427 insertions, 371 deletions
diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui
index fe87433..755e021 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
- <height>640</height>
+ <height>716</height>
</rect>
</property>
<property name="windowTitle">
@@ -225,7 +225,7 @@
<action name="actionReload_Room_Configuration">
<property name="icon">
<iconset resource="../../pvsmgr.qrc">
- <normaloff>:/refresh</normaloff>:/refresh</iconset>
+ <normaloff>:/reloadClassroom</normaloff>:/reloadClassroom</iconset>
</property>
<property name="text">
<string>Reload Room Configuration</string>
diff --git a/i18n/client/pvsclient_ar_JO.ts b/i18n/client/pvsclient_ar_JO.ts
index 3b38013..6ecdc20 100644
--- a/i18n/client/pvsclient_ar_JO.ts
+++ b/i18n/client/pvsclient_ar_JO.ts
@@ -24,8 +24,8 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../build/ui_connect.h" line="153"/>
<location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
- <location filename="../../trbuild/ui_connect.h" line="153"/>
<source>Ready to connect; please enter session name.</source>
<translation type="unfinished"></translation>
</message>
@@ -70,22 +70,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="151"/>
+ <location filename="../../build/ui_connect.h" line="151"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="152"/>
+ <location filename="../../build/ui_connect.h" line="152"/>
<source>Session Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="154"/>
+ <location filename="../../build/ui_connect.h" line="154"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="155"/>
+ <location filename="../../build/ui_connect.h" line="155"/>
<source>Hide</source>
<translation type="unfinished"></translation>
</message>
@@ -93,54 +93,54 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="101"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="92"/>
<source>Set &amp;session ID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="102"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="93"/>
<source>&amp;Was ist das hier?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="103"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="94"/>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="262"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="252"/>
<source>Streaming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="283"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="273"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="341"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="331"/>
<source>Über PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
<source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="268"/>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="295"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="258"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="285"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_toolbar.h" line="156"/>
+ <location filename="../../build/ui_toolbar.h" line="156"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_toolbar.h" line="158"/>
- <location filename="../../trbuild/ui_toolbar.h" line="160"/>
+ <location filename="../../build/ui_toolbar.h" line="158"/>
+ <location filename="../../build/ui_toolbar.h" line="160"/>
<source>Menu</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/client/pvsclient_de_DE.ts b/i18n/client/pvsclient_de_DE.ts
index f757ab3..2a0dedb 100644
--- a/i18n/client/pvsclient_de_DE.ts
+++ b/i18n/client/pvsclient_de_DE.ts
@@ -4,22 +4,22 @@
<context>
<name>ConnectWindow</name>
<message>
- <location filename="../../trbuild/ui_connect.h" line="151"/>
+ <location filename="../../build/ui_connect.h" line="151"/>
<source>Connect to PVS session</source>
<translation type="unfinished">Verbinde zu PVS Sitzung</translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="152"/>
+ <location filename="../../build/ui_connect.h" line="152"/>
<source>Session Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="154"/>
+ <location filename="../../build/ui_connect.h" line="154"/>
<source>Connect</source>
<translation type="unfinished">Verbinden</translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="155"/>
+ <location filename="../../build/ui_connect.h" line="155"/>
<source>Hide</source>
<translation type="unfinished">Ausblenden</translation>
</message>
@@ -44,8 +44,8 @@
<translation>&amp;Verbinden</translation>
</message>
<message>
+ <location filename="../../build/ui_connect.h" line="153"/>
<location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
- <location filename="../../trbuild/ui_connect.h" line="153"/>
<source>Ready to connect; please enter session name.</source>
<translation>Bereit für Verbindung; Bitte den Sitzungsname eingeben.</translation>
</message>
@@ -93,54 +93,54 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="101"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="92"/>
<source>Set &amp;session ID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="102"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="93"/>
<source>&amp;Was ist das hier?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="103"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="94"/>
<source>&amp;Quit</source>
<translation>&amp;Beenden</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="262"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="252"/>
<source>Streaming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="283"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="273"/>
<source>Offline</source>
<translation>Offline</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="341"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="331"/>
<source>Über PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
<source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="268"/>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="295"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="258"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="285"/>
<source>Online</source>
<translation>Online</translation>
</message>
<message>
- <location filename="../../trbuild/ui_toolbar.h" line="156"/>
+ <location filename="../../build/ui_toolbar.h" line="156"/>
<source>Form</source>
<translation type="unfinished">Form</translation>
</message>
<message>
- <location filename="../../trbuild/ui_toolbar.h" line="158"/>
- <location filename="../../trbuild/ui_toolbar.h" line="160"/>
+ <location filename="../../build/ui_toolbar.h" line="158"/>
+ <location filename="../../build/ui_toolbar.h" line="160"/>
<source>Menu</source>
<translation type="unfinished">Menü</translation>
</message>
diff --git a/i18n/client/pvsclient_es_MX.ts b/i18n/client/pvsclient_es_MX.ts
index 4d57b78..8014e15 100644
--- a/i18n/client/pvsclient_es_MX.ts
+++ b/i18n/client/pvsclient_es_MX.ts
@@ -4,22 +4,22 @@
<context>
<name>ConnectWindow</name>
<message>
- <location filename="../../trbuild/ui_connect.h" line="151"/>
+ <location filename="../../build/ui_connect.h" line="151"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="152"/>
+ <location filename="../../build/ui_connect.h" line="152"/>
<source>Session Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="154"/>
+ <location filename="../../build/ui_connect.h" line="154"/>
<source>Connect</source>
<translation type="unfinished">Conectar</translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="155"/>
+ <location filename="../../build/ui_connect.h" line="155"/>
<source>Hide</source>
<translation type="unfinished"></translation>
</message>
@@ -44,8 +44,8 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../build/ui_connect.h" line="153"/>
<location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
- <location filename="../../trbuild/ui_connect.h" line="153"/>
<source>Ready to connect; please enter session name.</source>
<translation type="unfinished"></translation>
</message>
@@ -93,54 +93,54 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="101"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="92"/>
<source>Set &amp;session ID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="102"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="93"/>
<source>&amp;Was ist das hier?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="103"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="94"/>
<source>&amp;Quit</source>
<translation type="unfinished">&amp;Cerrar</translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="262"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="252"/>
<source>Streaming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="283"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="273"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="341"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="331"/>
<source>Über PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
<source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="268"/>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="295"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="258"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="285"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_toolbar.h" line="156"/>
+ <location filename="../../build/ui_toolbar.h" line="156"/>
<source>Form</source>
<translation type="unfinished">de</translation>
</message>
<message>
- <location filename="../../trbuild/ui_toolbar.h" line="158"/>
- <location filename="../../trbuild/ui_toolbar.h" line="160"/>
+ <location filename="../../build/ui_toolbar.h" line="158"/>
+ <location filename="../../build/ui_toolbar.h" line="160"/>
<source>Menu</source>
<translation type="unfinished">Menu</translation>
</message>
diff --git a/i18n/client/pvsclient_fr_FR.ts b/i18n/client/pvsclient_fr_FR.ts
index 3b38013..6ecdc20 100644
--- a/i18n/client/pvsclient_fr_FR.ts
+++ b/i18n/client/pvsclient_fr_FR.ts
@@ -24,8 +24,8 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../build/ui_connect.h" line="153"/>
<location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
- <location filename="../../trbuild/ui_connect.h" line="153"/>
<source>Ready to connect; please enter session name.</source>
<translation type="unfinished"></translation>
</message>
@@ -70,22 +70,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="151"/>
+ <location filename="../../build/ui_connect.h" line="151"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="152"/>
+ <location filename="../../build/ui_connect.h" line="152"/>
<source>Session Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="154"/>
+ <location filename="../../build/ui_connect.h" line="154"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="155"/>
+ <location filename="../../build/ui_connect.h" line="155"/>
<source>Hide</source>
<translation type="unfinished"></translation>
</message>
@@ -93,54 +93,54 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="101"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="92"/>
<source>Set &amp;session ID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="102"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="93"/>
<source>&amp;Was ist das hier?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="103"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="94"/>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="262"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="252"/>
<source>Streaming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="283"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="273"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="341"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="331"/>
<source>Über PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
<source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="268"/>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="295"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="258"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="285"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_toolbar.h" line="156"/>
+ <location filename="../../build/ui_toolbar.h" line="156"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_toolbar.h" line="158"/>
- <location filename="../../trbuild/ui_toolbar.h" line="160"/>
+ <location filename="../../build/ui_toolbar.h" line="158"/>
+ <location filename="../../build/ui_toolbar.h" line="160"/>
<source>Menu</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/client/pvsclient_pl_PL.ts b/i18n/client/pvsclient_pl_PL.ts
index 3b38013..6ecdc20 100644
--- a/i18n/client/pvsclient_pl_PL.ts
+++ b/i18n/client/pvsclient_pl_PL.ts
@@ -24,8 +24,8 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../build/ui_connect.h" line="153"/>
<location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
- <location filename="../../trbuild/ui_connect.h" line="153"/>
<source>Ready to connect; please enter session name.</source>
<translation type="unfinished"></translation>
</message>
@@ -70,22 +70,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="151"/>
+ <location filename="../../build/ui_connect.h" line="151"/>
<source>Connect to PVS session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="152"/>
+ <location filename="../../build/ui_connect.h" line="152"/>
<source>Session Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="154"/>
+ <location filename="../../build/ui_connect.h" line="154"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_connect.h" line="155"/>
+ <location filename="../../build/ui_connect.h" line="155"/>
<source>Hide</source>
<translation type="unfinished"></translation>
</message>
@@ -93,54 +93,54 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="101"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="92"/>
<source>Set &amp;session ID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="102"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="93"/>
<source>&amp;Was ist das hier?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="103"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="94"/>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="262"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="252"/>
<source>Streaming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="283"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="273"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="341"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="331"/>
<source>Über PVS Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="332"/>
<source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="268"/>
- <location filename="../../src/client/toolbar/toolbar.cpp" line="295"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="258"/>
+ <location filename="../../src/client/toolbar/toolbar.cpp" line="285"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_toolbar.h" line="156"/>
+ <location filename="../../build/ui_toolbar.h" line="156"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_toolbar.h" line="158"/>
- <location filename="../../trbuild/ui_toolbar.h" line="160"/>
+ <location filename="../../build/ui_toolbar.h" line="158"/>
+ <location filename="../../build/ui_toolbar.h" line="160"/>
<source>Menu</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/server/pvsmgr_ar_JO.ts b/i18n/server/pvsmgr_ar_JO.ts
index 6601559..634bedb 100644
--- a/i18n/server/pvsmgr_ar_JO.ts
+++ b/i18n/server/pvsmgr_ar_JO.ts
@@ -4,52 +4,52 @@
<context>
<name>Help</name>
<message>
- <location filename="../../trbuild/ui_help.h" line="322"/>
+ <location filename="../../build/ui_help.h" line="322"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="324"/>
+ <location filename="../../build/ui_help.h" line="324"/>
<source>Lock all connected students screens.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="326"/>
+ <location filename="../../build/ui_help.h" line="326"/>
<source>Start projection from tutor to all connected students.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="328"/>
+ <location filename="../../build/ui_help.h" line="328"/>
<source>Start projection from tutor to selected student.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="330"/>
+ <location filename="../../build/ui_help.h" line="330"/>
<source>Start projection from selected student to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="332"/>
+ <location filename="../../build/ui_help.h" line="332"/>
<source>Start projection from selected student to tutor and blank all others.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="334"/>
+ <location filename="../../build/ui_help.h" line="334"/>
<source>Stop running projections.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="335"/>
+ <location filename="../../build/ui_help.h" line="335"/>
<source>Set selected client to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="338"/>
+ <location filename="../../build/ui_help.h" line="338"/>
<source>Refresh classroom configuration after choosing the room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="339"/>
+ <location filename="../../build/ui_help.h" line="339"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -57,141 +57,152 @@
<context>
<name>MainWindow</name>
<message>
+ <location filename="../../build/ui_mainwindow.h" line="167"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="84"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="167"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="573"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="575"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="980"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="641"/>
+ <source>Sure, You want to change SessionName again?
+All Clients will be deleted afterwards.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="670"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="718"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="722"/>
+ <source>No item selected, please select room!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="725"/>
<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="779"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="781"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="783"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="812"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="814"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="816"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="818"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="787"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="789"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="791"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="820"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="851"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="853"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="855"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="857"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="822"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="824"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="826"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="828"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="859"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="891"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="893"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="895"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="897"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="861"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="863"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="865"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="867"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="899"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="901"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="903"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="905"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="907"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="980"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../build/ui_mainwindow.h" line="172"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="85"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="172"/>
<source>Lock or Unlock all Clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="164"/>
+ <location filename="../../build/ui_mainwindow.h" line="164"/>
<source>PVS2 Manager</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="165"/>
+ <location filename="../../build/ui_mainwindow.h" line="165"/>
<source>&amp;Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="169"/>
+ <location filename="../../build/ui_mainwindow.h" line="169"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="170"/>
+ <location filename="../../build/ui_mainwindow.h" line="170"/>
<source>lock</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="174"/>
+ <location filename="../../build/ui_mainwindow.h" line="174"/>
<source>Ctrl+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="175"/>
+ <location filename="../../build/ui_mainwindow.h" line="175"/>
<source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="176"/>
+ <location filename="../../build/ui_mainwindow.h" line="176"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="177"/>
+ <location filename="../../build/ui_mainwindow.h" line="177"/>
<source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="178"/>
+ <location filename="../../build/ui_mainwindow.h" line="178"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="179"/>
+ <location filename="../../build/ui_mainwindow.h" line="179"/>
<source>Stop Projection on every Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="180"/>
+ <location filename="../../build/ui_mainwindow.h" line="180"/>
<source>SetAsTutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="182"/>
+ <location filename="../../build/ui_mainwindow.h" line="182"/>
<source>Set current Frame as Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="184"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="186"/>
+ <location filename="../../build/ui_mainwindow.h" line="184"/>
+ <location filename="../../build/ui_mainwindow.h" line="186"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="188"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="190"/>
+ <location filename="../../build/ui_mainwindow.h" line="188"/>
+ <location filename="../../build/ui_mainwindow.h" line="190"/>
<source>Reload Room Configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="193"/>
+ <location filename="../../build/ui_mainwindow.h" line="193"/>
<source>toolBar</source>
<translation type="unfinished"></translation>
</message>
@@ -199,12 +210,12 @@ Note that all clients will be deleted.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../trbuild/ui_reloadroom.h" line="68"/>
+ <location filename="../../build/ui_reloadroom.h" line="68"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_reloadroom.h" line="69"/>
+ <location filename="../../build/ui_reloadroom.h" line="69"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -212,17 +223,17 @@ Note that all clients will be deleted.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="71"/>
+ <location filename="../../build/ui_sessionname.h" line="71"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="72"/>
+ <location filename="../../build/ui_sessionname.h" line="72"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="73"/>
+ <location filename="../../build/ui_sessionname.h" line="73"/>
<source>Random name</source>
<translation type="unfinished"></translation>
</message>
diff --git a/i18n/server/pvsmgr_de_DE.ts b/i18n/server/pvsmgr_de_DE.ts
index 8a00161..7cb13ef 100644
--- a/i18n/server/pvsmgr_de_DE.ts
+++ b/i18n/server/pvsmgr_de_DE.ts
@@ -4,52 +4,52 @@
<context>
<name>Help</name>
<message>
- <location filename="../../trbuild/ui_help.h" line="322"/>
+ <location filename="../../build/ui_help.h" line="322"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="338"/>
+ <location filename="../../build/ui_help.h" line="338"/>
<source>Refresh classroom configuration after choosing the room.</source>
<translation>Lade nach Raumauswahl entsprechende Raumkonfiguration neu.</translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="339"/>
+ <location filename="../../build/ui_help.h" line="339"/>
<source>Cancel</source>
<translation>Abbruch</translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="334"/>
+ <location filename="../../build/ui_help.h" line="334"/>
<source>Stop running projections.</source>
<translation>Alle Projektionen abbrechen.</translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="332"/>
+ <location filename="../../build/ui_help.h" line="332"/>
<source>Start projection from selected student to tutor and blank all others.</source>
<translation>Projektion des ausgewählten Studierendens an Tutor; alle anderen ausblenden.</translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="330"/>
+ <location filename="../../build/ui_help.h" line="330"/>
<source>Start projection from selected student to tutor.</source>
<translation>Startet Projektion von ausgewähltem Studierenden an Tutor.</translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="328"/>
+ <location filename="../../build/ui_help.h" line="328"/>
<source>Start projection from tutor to selected student.</source>
<translation>Startet Projektion von Tutor an ausgewählten Studierenden.</translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="326"/>
+ <location filename="../../build/ui_help.h" line="326"/>
<source>Start projection from tutor to all connected students.</source>
<translation>Startet Projektion von Tutor an alle verbundenen Studierenden.</translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="324"/>
+ <location filename="../../build/ui_help.h" line="324"/>
<source>Lock all connected students screens.</source>
<translation>Alle verbundenen Studierendenbildschirme sperren.</translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="335"/>
+ <location filename="../../build/ui_help.h" line="335"/>
<source>Set selected client to tutor.</source>
<translation>Ausgewählten Klienten als Tutor festlegen.</translation>
</message>
@@ -57,141 +57,153 @@
<context>
<name>MainWindow</name>
<message>
+ <location filename="../../build/ui_mainwindow.h" line="167"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="84"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="167"/>
<source>Exit</source>
<translation>Ausgang</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="573"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="575"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="980"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>Selection</source>
<translation>Auswahl</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="641"/>
+ <source>Sure, You want to change SessionName again?
+All Clients will be deleted afterwards.</source>
+ <translation>Sicher, dass Sie den Sitzungsname erneut ändern wollen?
+Danach werden alle Clienten gelöscht sein.</translation>
+ </message>
+ <message>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="670"/>
<source>Session Name: %1 [click to edit]</source>
<translation>Sitzungsname: %1 [anklicken editiert]</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="718"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="722"/>
+ <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="725"/>
<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="779"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="781"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="783"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="812"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="814"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="816"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="818"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="787"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="789"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="791"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="820"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="851"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="853"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="855"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="857"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="822"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="824"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="826"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="828"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="859"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="891"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="893"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="895"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="897"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="861"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="863"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="865"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="867"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="899"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="901"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="903"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="905"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="907"/>
<source>Projection</source>
<translation>Projektion</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="980"/>
<source>No client is selected.</source>
<translation>Kein Klient ausgewählt.</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>The selected client is not connected.</source>
<translation>Ausgewählter Klient ist nicht verbunden.</translation>
</message>
<message>
+ <location filename="../../build/ui_mainwindow.h" line="172"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="85"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="172"/>
<source>Lock or Unlock all Clients</source>
<translation>Alle Klienten sperren oder entsperren</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="164"/>
+ <location filename="../../build/ui_mainwindow.h" line="164"/>
<source>PVS2 Manager</source>
<translation>PVS2-Manager</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="165"/>
+ <location filename="../../build/ui_mainwindow.h" line="165"/>
<source>&amp;Exit</source>
<translation>&amp;Abbruch</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="169"/>
+ <location filename="../../build/ui_mainwindow.h" line="169"/>
<source>Ctrl+Q</source>
<translation>Strg+Q</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="170"/>
+ <location filename="../../build/ui_mainwindow.h" line="170"/>
<source>lock</source>
<translation>lock</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="174"/>
+ <location filename="../../build/ui_mainwindow.h" line="174"/>
<source>Ctrl+A</source>
<translation>Strg+A</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="175"/>
+ <location filename="../../build/ui_mainwindow.h" line="175"/>
<source>Student&apos;s Screen to Tutor</source>
<translation>Studierendenbildschirm an Tutor</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="176"/>
+ <location filename="../../build/ui_mainwindow.h" line="176"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation>Studierendenbildschirm an Tutor; alle anderen ausgeblendet</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="177"/>
+ <location filename="../../build/ui_mainwindow.h" line="177"/>
<source>Tutor&apos;s Screen to Student</source>
<translation>Tutorenbildschirm an Studierenden</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="178"/>
+ <location filename="../../build/ui_mainwindow.h" line="178"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation>Tutorenbildschirm an alle</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="179"/>
+ <location filename="../../build/ui_mainwindow.h" line="179"/>
<source>Stop Projection on every Client</source>
<translation>Projektion an alle Klienten abbrechen</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="180"/>
+ <location filename="../../build/ui_mainwindow.h" line="180"/>
<source>SetAsTutor</source>
<translation>AlsTutorSetzen</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="182"/>
+ <location filename="../../build/ui_mainwindow.h" line="182"/>
<source>Set current Frame as Tutor</source>
<translation>Derzeitigen Rahmen als Tutor festlegen</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="184"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="186"/>
+ <location filename="../../build/ui_mainwindow.h" line="184"/>
+ <location filename="../../build/ui_mainwindow.h" line="186"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="188"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="190"/>
+ <location filename="../../build/ui_mainwindow.h" line="188"/>
+ <location filename="../../build/ui_mainwindow.h" line="190"/>
<source>Reload Room Configuration</source>
<translation>Neu laden der Raumkonfiguration</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="193"/>
+ <location filename="../../build/ui_mainwindow.h" line="193"/>
<source>toolBar</source>
<translation>toolBar</translation>
</message>
@@ -199,12 +211,12 @@ Note that all clients will be deleted.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../trbuild/ui_reloadroom.h" line="68"/>
+ <location filename="../../build/ui_reloadroom.h" line="68"/>
<source>Reload Room</source>
<translation>Raum neu laden</translation>
</message>
<message>
- <location filename="../../trbuild/ui_reloadroom.h" line="69"/>
+ <location filename="../../build/ui_reloadroom.h" line="69"/>
<source>Choose room configuration to reload:</source>
<translation>Wählen Sie den neuzuladenden Raum:</translation>
</message>
@@ -212,17 +224,17 @@ Note that all clients will be deleted.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="71"/>
+ <location filename="../../build/ui_sessionname.h" line="71"/>
<source>Set session name</source>
<translation>Sitzungsname eingeben</translation>
</message>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="72"/>
+ <location filename="../../build/ui_sessionname.h" line="72"/>
<source>New session name</source>
<translation>Neuer Sitzungsname</translation>
</message>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="73"/>
+ <location filename="../../build/ui_sessionname.h" line="73"/>
<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 6e8334b..0e50939 100644
--- a/i18n/server/pvsmgr_es_MX.ts
+++ b/i18n/server/pvsmgr_es_MX.ts
@@ -4,52 +4,52 @@
<context>
<name>Help</name>
<message>
- <location filename="../../trbuild/ui_help.h" line="322"/>
+ <location filename="../../build/ui_help.h" line="322"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="324"/>
+ <location filename="../../build/ui_help.h" line="324"/>
<source>Lock all connected students screens.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="326"/>
+ <location filename="../../build/ui_help.h" line="326"/>
<source>Start projection from tutor to all connected students.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="328"/>
+ <location filename="../../build/ui_help.h" line="328"/>
<source>Start projection from tutor to selected student.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="330"/>
+ <location filename="../../build/ui_help.h" line="330"/>
<source>Start projection from selected student to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="332"/>
+ <location filename="../../build/ui_help.h" line="332"/>
<source>Start projection from selected student to tutor and blank all others.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="334"/>
+ <location filename="../../build/ui_help.h" line="334"/>
<source>Stop running projections.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="335"/>
+ <location filename="../../build/ui_help.h" line="335"/>
<source>Set selected client to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="338"/>
+ <location filename="../../build/ui_help.h" line="338"/>
<source>Refresh classroom configuration after choosing the room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="339"/>
+ <location filename="../../build/ui_help.h" line="339"/>
<source>Cancel</source>
<translation type="unfinished">Cancelar</translation>
</message>
@@ -57,141 +57,152 @@
<context>
<name>MainWindow</name>
<message>
+ <location filename="../../build/ui_mainwindow.h" line="167"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="84"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="167"/>
<source>Exit</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="573"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="575"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="980"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="641"/>
+ <source>Sure, You want to change SessionName again?
+All Clients will be deleted afterwards.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="670"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="718"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="722"/>
+ <source>No item selected, please select room!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="725"/>
<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="779"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="781"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="783"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="812"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="814"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="816"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="818"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="787"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="789"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="791"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="820"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="851"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="853"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="855"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="857"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="822"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="824"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="826"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="828"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="859"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="891"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="893"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="895"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="897"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="861"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="863"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="865"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="867"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="899"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="901"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="903"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="905"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="907"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="980"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../build/ui_mainwindow.h" line="172"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="85"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="172"/>
<source>Lock or Unlock all Clients</source>
<translation>Bloquear o desbloquear todos los clientes</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="164"/>
+ <location filename="../../build/ui_mainwindow.h" line="164"/>
<source>PVS2 Manager</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="165"/>
+ <location filename="../../build/ui_mainwindow.h" line="165"/>
<source>&amp;Exit</source>
<translation>&amp;Salir</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="169"/>
+ <location filename="../../build/ui_mainwindow.h" line="169"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="175"/>
+ <location filename="../../build/ui_mainwindow.h" line="175"/>
<source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="176"/>
+ <location filename="../../build/ui_mainwindow.h" line="176"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="177"/>
+ <location filename="../../build/ui_mainwindow.h" line="177"/>
<source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="178"/>
+ <location filename="../../build/ui_mainwindow.h" line="178"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="179"/>
+ <location filename="../../build/ui_mainwindow.h" line="179"/>
<source>Stop Projection on every Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="180"/>
+ <location filename="../../build/ui_mainwindow.h" line="180"/>
<source>SetAsTutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="182"/>
+ <location filename="../../build/ui_mainwindow.h" line="182"/>
<source>Set current Frame as Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="184"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="186"/>
+ <location filename="../../build/ui_mainwindow.h" line="184"/>
+ <location filename="../../build/ui_mainwindow.h" line="186"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="188"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="190"/>
+ <location filename="../../build/ui_mainwindow.h" line="188"/>
+ <location filename="../../build/ui_mainwindow.h" line="190"/>
<source>Reload Room Configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="170"/>
+ <location filename="../../build/ui_mainwindow.h" line="170"/>
<source>lock</source>
<translation>bloquear</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="174"/>
+ <location filename="../../build/ui_mainwindow.h" line="174"/>
<source>Ctrl+A</source>
<translation>Ctrl+A</translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="193"/>
+ <location filename="../../build/ui_mainwindow.h" line="193"/>
<source>toolBar</source>
<translation>Barra de herramientas</translation>
</message>
@@ -199,12 +210,12 @@ Note that all clients will be deleted.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../trbuild/ui_reloadroom.h" line="68"/>
+ <location filename="../../build/ui_reloadroom.h" line="68"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_reloadroom.h" line="69"/>
+ <location filename="../../build/ui_reloadroom.h" line="69"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -212,17 +223,17 @@ Note that all clients will be deleted.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="71"/>
+ <location filename="../../build/ui_sessionname.h" line="71"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="72"/>
+ <location filename="../../build/ui_sessionname.h" line="72"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="73"/>
+ <location filename="../../build/ui_sessionname.h" line="73"/>
<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 6601559..634bedb 100644
--- a/i18n/server/pvsmgr_fr_FR.ts
+++ b/i18n/server/pvsmgr_fr_FR.ts
@@ -4,52 +4,52 @@
<context>
<name>Help</name>
<message>
- <location filename="../../trbuild/ui_help.h" line="322"/>
+ <location filename="../../build/ui_help.h" line="322"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="324"/>
+ <location filename="../../build/ui_help.h" line="324"/>
<source>Lock all connected students screens.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="326"/>
+ <location filename="../../build/ui_help.h" line="326"/>
<source>Start projection from tutor to all connected students.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="328"/>
+ <location filename="../../build/ui_help.h" line="328"/>
<source>Start projection from tutor to selected student.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="330"/>
+ <location filename="../../build/ui_help.h" line="330"/>
<source>Start projection from selected student to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="332"/>
+ <location filename="../../build/ui_help.h" line="332"/>
<source>Start projection from selected student to tutor and blank all others.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="334"/>
+ <location filename="../../build/ui_help.h" line="334"/>
<source>Stop running projections.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="335"/>
+ <location filename="../../build/ui_help.h" line="335"/>
<source>Set selected client to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="338"/>
+ <location filename="../../build/ui_help.h" line="338"/>
<source>Refresh classroom configuration after choosing the room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="339"/>
+ <location filename="../../build/ui_help.h" line="339"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -57,141 +57,152 @@
<context>
<name>MainWindow</name>
<message>
+ <location filename="../../build/ui_mainwindow.h" line="167"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="84"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="167"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="573"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="575"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="980"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="641"/>
+ <source>Sure, You want to change SessionName again?
+All Clients will be deleted afterwards.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="670"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="718"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="722"/>
+ <source>No item selected, please select room!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="725"/>
<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="779"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="781"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="783"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="812"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="814"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="816"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="818"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="787"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="789"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="791"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="820"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="851"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="853"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="855"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="857"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="822"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="824"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="826"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="828"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="859"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="891"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="893"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="895"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="897"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="861"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="863"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="865"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="867"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="899"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="901"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="903"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="905"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="907"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="980"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../build/ui_mainwindow.h" line="172"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="85"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="172"/>
<source>Lock or Unlock all Clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="164"/>
+ <location filename="../../build/ui_mainwindow.h" line="164"/>
<source>PVS2 Manager</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="165"/>
+ <location filename="../../build/ui_mainwindow.h" line="165"/>
<source>&amp;Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="169"/>
+ <location filename="../../build/ui_mainwindow.h" line="169"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="170"/>
+ <location filename="../../build/ui_mainwindow.h" line="170"/>
<source>lock</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="174"/>
+ <location filename="../../build/ui_mainwindow.h" line="174"/>
<source>Ctrl+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="175"/>
+ <location filename="../../build/ui_mainwindow.h" line="175"/>
<source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="176"/>
+ <location filename="../../build/ui_mainwindow.h" line="176"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="177"/>
+ <location filename="../../build/ui_mainwindow.h" line="177"/>
<source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="178"/>
+ <location filename="../../build/ui_mainwindow.h" line="178"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="179"/>
+ <location filename="../../build/ui_mainwindow.h" line="179"/>
<source>Stop Projection on every Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="180"/>
+ <location filename="../../build/ui_mainwindow.h" line="180"/>
<source>SetAsTutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="182"/>
+ <location filename="../../build/ui_mainwindow.h" line="182"/>
<source>Set current Frame as Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="184"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="186"/>
+ <location filename="../../build/ui_mainwindow.h" line="184"/>
+ <location filename="../../build/ui_mainwindow.h" line="186"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="188"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="190"/>
+ <location filename="../../build/ui_mainwindow.h" line="188"/>
+ <location filename="../../build/ui_mainwindow.h" line="190"/>
<source>Reload Room Configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="193"/>
+ <location filename="../../build/ui_mainwindow.h" line="193"/>
<source>toolBar</source>
<translation type="unfinished"></translation>
</message>
@@ -199,12 +210,12 @@ Note that all clients will be deleted.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../trbuild/ui_reloadroom.h" line="68"/>
+ <location filename="../../build/ui_reloadroom.h" line="68"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_reloadroom.h" line="69"/>
+ <location filename="../../build/ui_reloadroom.h" line="69"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -212,17 +223,17 @@ Note that all clients will be deleted.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="71"/>
+ <location filename="../../build/ui_sessionname.h" line="71"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="72"/>
+ <location filename="../../build/ui_sessionname.h" line="72"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="73"/>
+ <location filename="../../build/ui_sessionname.h" line="73"/>
<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 6601559..634bedb 100644
--- a/i18n/server/pvsmgr_pl_PL.ts
+++ b/i18n/server/pvsmgr_pl_PL.ts
@@ -4,52 +4,52 @@
<context>
<name>Help</name>
<message>
- <location filename="../../trbuild/ui_help.h" line="322"/>
+ <location filename="../../build/ui_help.h" line="322"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="324"/>
+ <location filename="../../build/ui_help.h" line="324"/>
<source>Lock all connected students screens.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="326"/>
+ <location filename="../../build/ui_help.h" line="326"/>
<source>Start projection from tutor to all connected students.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="328"/>
+ <location filename="../../build/ui_help.h" line="328"/>
<source>Start projection from tutor to selected student.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="330"/>
+ <location filename="../../build/ui_help.h" line="330"/>
<source>Start projection from selected student to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="332"/>
+ <location filename="../../build/ui_help.h" line="332"/>
<source>Start projection from selected student to tutor and blank all others.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="334"/>
+ <location filename="../../build/ui_help.h" line="334"/>
<source>Stop running projections.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="335"/>
+ <location filename="../../build/ui_help.h" line="335"/>
<source>Set selected client to tutor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="338"/>
+ <location filename="../../build/ui_help.h" line="338"/>
<source>Refresh classroom configuration after choosing the room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_help.h" line="339"/>
+ <location filename="../../build/ui_help.h" line="339"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -57,141 +57,152 @@
<context>
<name>MainWindow</name>
<message>
+ <location filename="../../build/ui_mainwindow.h" line="167"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="84"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="167"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="573"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="575"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="980"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="668"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="641"/>
+ <source>Sure, You want to change SessionName again?
+All Clients will be deleted afterwards.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="670"/>
<source>Session Name: %1 [click to edit]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="718"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="722"/>
+ <source>No item selected, please select room!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="725"/>
<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="779"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="781"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="783"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="812"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="814"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="816"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="818"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="787"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="789"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="791"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="820"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="851"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="853"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="855"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="857"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="822"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="824"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="826"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="828"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="859"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="891"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="893"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="895"/>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="897"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="861"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="863"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="865"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="867"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="899"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="901"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="903"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="905"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="907"/>
<source>Projection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="972"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="980"/>
<source>No client is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/server/mainwindow/mainwindow.cpp" line="979"/>
+ <location filename="../../src/server/mainwindow/mainwindow.cpp" line="987"/>
<source>The selected client is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../build/ui_mainwindow.h" line="172"/>
<location filename="../../src/server/mainwindow/mainwindow.cpp" line="85"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="172"/>
<source>Lock or Unlock all Clients</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="164"/>
+ <location filename="../../build/ui_mainwindow.h" line="164"/>
<source>PVS2 Manager</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="165"/>
+ <location filename="../../build/ui_mainwindow.h" line="165"/>
<source>&amp;Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="169"/>
+ <location filename="../../build/ui_mainwindow.h" line="169"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="170"/>
+ <location filename="../../build/ui_mainwindow.h" line="170"/>
<source>lock</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="174"/>
+ <location filename="../../build/ui_mainwindow.h" line="174"/>
<source>Ctrl+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="175"/>
+ <location filename="../../build/ui_mainwindow.h" line="175"/>
<source>Student&apos;s Screen to Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="176"/>
+ <location filename="../../build/ui_mainwindow.h" line="176"/>
<source>Student&apos;s Screen to Tutor, others blanked</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="177"/>
+ <location filename="../../build/ui_mainwindow.h" line="177"/>
<source>Tutor&apos;s Screen to Student</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="178"/>
+ <location filename="../../build/ui_mainwindow.h" line="178"/>
<source>Tutor&apos;s Screen to Everyone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="179"/>
+ <location filename="../../build/ui_mainwindow.h" line="179"/>
<source>Stop Projection on every Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="180"/>
+ <location filename="../../build/ui_mainwindow.h" line="180"/>
<source>SetAsTutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="182"/>
+ <location filename="../../build/ui_mainwindow.h" line="182"/>
<source>Set current Frame as Tutor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="184"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="186"/>
+ <location filename="../../build/ui_mainwindow.h" line="184"/>
+ <location filename="../../build/ui_mainwindow.h" line="186"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="188"/>
- <location filename="../../trbuild/ui_mainwindow.h" line="190"/>
+ <location filename="../../build/ui_mainwindow.h" line="188"/>
+ <location filename="../../build/ui_mainwindow.h" line="190"/>
<source>Reload Room Configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_mainwindow.h" line="193"/>
+ <location filename="../../build/ui_mainwindow.h" line="193"/>
<source>toolBar</source>
<translation type="unfinished"></translation>
</message>
@@ -199,12 +210,12 @@ Note that all clients will be deleted.</source>
<context>
<name>ReloadRoom</name>
<message>
- <location filename="../../trbuild/ui_reloadroom.h" line="68"/>
+ <location filename="../../build/ui_reloadroom.h" line="68"/>
<source>Reload Room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_reloadroom.h" line="69"/>
+ <location filename="../../build/ui_reloadroom.h" line="69"/>
<source>Choose room configuration to reload:</source>
<translation type="unfinished"></translation>
</message>
@@ -212,17 +223,17 @@ Note that all clients will be deleted.</source>
<context>
<name>SessionName</name>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="71"/>
+ <location filename="../../build/ui_sessionname.h" line="71"/>
<source>Set session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="72"/>
+ <location filename="../../build/ui_sessionname.h" line="72"/>
<source>New session name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../trbuild/ui_sessionname.h" line="73"/>
+ <location filename="../../build/ui_sessionname.h" line="73"/>
<source>Random name</source>
<translation type="unfinished"></translation>
</message>
diff --git a/pvsmgr.qrc b/pvsmgr.qrc
index ad2f845..def6181 100644
--- a/pvsmgr.qrc
+++ b/pvsmgr.qrc
@@ -16,7 +16,7 @@
<file alias="student2tutorextension">icons/student2tutor_extension.svg</file>
<file alias="helpme">icons/help.svg</file>
<file alias="trash">icons/trash.svg</file>
- <file alias="refresh">icons/refresh.svg</file>
+ <file alias="reloadClassroom">icons/reloadClassroom.svg</file>
<file alias="AUTHORS">AUTHORS</file>
<file alias="TRANSLATION">TRANSLATION</file>
<file alias="pvsmgr.qm">build/pvsmgr_de_DE.qm</file>
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index d34a60b..7072aec 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -638,8 +638,8 @@ void MainWindow::onSessionNameClick()
_countSessionNameUpdate++;
if (_countSessionNameUpdate > 1)
{
- int ret = QMessageBox::question(this, "Warning", "Sure, You want to change SessionName again?\n"
- "All Clients will be deleted afterwards.", 0, 1, 2);
+ int ret = QMessageBox::question(this, "Warning", tr("Sure, You want to change SessionName again?\n"
+ "All Clients will be deleted afterwards."), 0, 1, 2);
if (ret == 1)
{
_sessionNameWindow->show(Global::sessionName());
@@ -719,7 +719,7 @@ void MainWindow::onReloadRoomOk()
{
if (_reloadWindow->ui->roomList->currentItem() == NULL)
{
- QMessageBox::critical(this, "Warning", tr("No Item selected, please select Item!"), 0, 1);
+ QMessageBox::critical(this, "Warning", tr("No item selected, please select room!"), 0, 1);
return;
}
int ret = QMessageBox::QMessageBox::question(this, "Warning", tr("Are you sure you want to reload the room?\n"