[server] Update help window translations

7 files changed, 656 insertions, 600 deletions

diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui
index c16d408..62b92f7 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -160,10 +160,10 @@ QLabel#examModeLabel {
      <normaloff>:/exit</normaloff>
      <normalon>:/exit</normalon>:/exit</iconset>
    </property>
-   <property name="toolTip">
+   <property name="text">
     <string>Exit</string>
    </property>
-   <property name="text">
+   <property name="toolTip">
     <string>Exit</string>
    </property>
    <property name="shortcut">
@@ -178,12 +178,12 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/lock</normaloff>:/lock</iconset>
    </property>
-   <property name="toolTip">
-    <string>Lock/Unlock all clients</string>
-   </property>
    <property name="text">
     <string>This will show a black screen on all connected clients, except the tutor's client.</string>
    </property>
+   <property name="toolTip">
+    <string>Lock/Unlock all clients</string>
+   </property>
    <property name="shortcut">
     <string>Ctrl+A</string>
    </property>
@@ -193,60 +193,60 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/student2tutor</normaloff>:/student2tutor</iconset>
    </property>
-   <property name="toolTip">
-    <string>Student's Screen to Tutor</string>
-   </property>
    <property name="text">
     <string>Stream currently selected client's screen content to the tutor's client.</string>
    </property>
+   <property name="toolTip">
+    <string>Student's Screen to Tutor</string>
+   </property>
   </action>
   <action name="action_StudentToTutorExclusive">
    <property name="icon">
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/student2tutorextension</normaloff>:/student2tutorextension</iconset>
    </property>
-   <property name="toolTip">
-    <string>Student's Screen to Tutor, others blanked.</string>
-   </property>
    <property name="text">
     <string>Stream currently selected client's screen content to the tutor's client while showing a locked black screen on all other clients.</string>
    </property>
+   <property name="toolTip">
+    <string>Student's Screen to Tutor, others blanked</string>
+   </property>
   </action>
   <action name="action_TutorToStudent">
    <property name="icon">
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/tutor2student</normaloff>:/tutor2student</iconset>
    </property>
-   <property name="toolTip">
-    <string>Tutor's Screen to Student</string>
-   </property>
    <property name="text">
     <string>Stream the tutor's screen contents to the currently selected client.</string>
    </property>
+   <property name="toolTip">
+    <string>Tutor's Screen to Student</string>
+   </property>
   </action>
   <action name="action_TutorToAll">
    <property name="icon">
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/tutor2all</normaloff>:/tutor2all</iconset>
    </property>
-   <property name="toolTip">
-    <string>Tutor's Screen to Everyone</string>
-   </property>
    <property name="text">
     <string>Stream the tutor's screen contents to everyone.</string>
    </property>
+   <property name="toolTip">
+    <string>Tutor's Screen to Everyone</string>
+   </property>
   </action>
   <action name="action_StopProjection">
    <property name="icon">
     <iconset resource="../../pvsclient.qrc">
      <normaloff>:/reset</normaloff>:/reset</iconset>
    </property>
-   <property name="toolTip">
-    <string>Reset</string>
-   </property>
    <property name="text">
     <string>Unlock all clients, stop any running screen content streaming.</string>
    </property>
+   <property name="toolTip">
+    <string>Reset</string>
+   </property>
    <property name="shortcut">
     <string>R</string>
    </property>
@@ -256,12 +256,12 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/dozent</normaloff>:/dozent</iconset>
    </property>
-   <property name="toolTip">
-    <string>Declare tutor</string>
-   </property>
    <property name="text">
     <string>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</string>
    </property>
+   <property name="toolTip">
+    <string>Declare tutor</string>
+   </property>
    <property name="shortcut">
     <string>T</string>
    </property>
@@ -271,12 +271,12 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/trash</normaloff>:/trash</iconset>
    </property>
-   <property name="toolTip">
-    <string>Delete Client</string>
-   </property>
    <property name="text">
     <string>Delete currently selected client. Only allowed for disconnected clients.</string>
    </property>
+   <property name="toolTip">
+    <string>Delete Client</string>
+   </property>
    <property name="shortcut">
     <string>Del</string>
    </property>
@@ -289,12 +289,12 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/helpme</normaloff>:/helpme</iconset>
    </property>
-   <property name="toolTip">
-    <string>Help</string>
-   </property>
    <property name="text">
     <string>Show this help text.</string>
    </property>
+   <property name="toolTip">
+    <string>Help</string>
+   </property>
    <property name="shortcut">
     <string>F1</string>
    </property>
@@ -307,24 +307,24 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/reloadClassroom</normaloff>:/reloadClassroom</iconset>
    </property>
-   <property name="toolTip">
-    <string>Load a new room layout</string>
-   </property>
    <property name="text">
     <string>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</string>
    </property>
+   <property name="toolTip">
+    <string>Load a new room layout</string>
+   </property>
   </action>
   <action name="action_LockSingle">
    <property name="icon">
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/lock-single</normaloff>:/lock-single</iconset>
    </property>
-   <property name="toolTip">
-    <string>Lock/Unlock single client</string>
-   </property>
    <property name="text">
     <string>Lock or unlock the selected client only.</string>
    </property>
+   <property name="toolTip">
+    <string>Lock/Unlock single client</string>
+   </property>
    <property name="shortcut">
     <string>L</string>
    </property>
diff --git a/i18n/client/pvsclient_de_DE.ts b/i18n/client/pvsclient_de_DE.ts
index 65f6298..ecc7338 100644
--- a/i18n/client/pvsclient_de_DE.ts
+++ b/i18n/client/pvsclient_de_DE.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE" sourcelanguage="en_US">
+<TS version="2.1" language="de_DE" sourcelanguage="en_US">
 <context>
     <name>ConnectWindow</name>
     <message>
diff --git a/i18n/server/pvsmgr_ar_JO.ts b/i18n/server/pvsmgr_ar_JO.ts
index 43a9baa..59be58b 100644
--- a/i18n/server/pvsmgr_ar_JO.ts
+++ b/i18n/server/pvsmgr_ar_JO.ts
@@ -9,222 +9,234 @@
     </message>
 </context>
 <context>
-    <name>Help</name>
+    <name>HelpWindow</name>
     <message>
-        <source>Form</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Refresh classroom configuration after choosing the room.</source>
+        <source>toolBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lock all connected students screens.</source>
+        <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start projection from tutor to all connected students.</source>
+        <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start projection from tutor to selected student.</source>
+        <source>Lock or Unlock all Clients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start projection from selected student to tutor.</source>
+        <source>Ctrl+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start projection from selected student to tutor and blank all others.</source>
+        <source>Student&apos;s Screen to Tutor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set selected client to tutor.</source>
+        <source>Tutor&apos;s Screen to Student</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete selected client</source>
+        <source>Tutor&apos;s Screen to Everyone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop running projections.</source>
+        <source>Delete Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
+        <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>toolBar</source>
+        <source>No tutor defined.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Exit</source>
+        <source>Tutor is offline.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exit</source>
+        <source>Please select a projection source.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ctrl+Q</source>
+        <source>The projection source is offline.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>lock</source>
+        <source>Please select a projection destination.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lock or Unlock all Clients</source>
+        <source>The projection destination is offline.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ctrl+A</source>
+        <source>Selected projection target is tutor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Student&apos;s Screen to Tutor</source>
+        <source>Selected client is currently online.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Student&apos;s Screen to Tutor, others blanked</source>
+        <source>No projection destination available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tutor&apos;s Screen to Student</source>
+        <source>Session Name: %1  [click to edit]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tutor&apos;s Screen to Everyone</source>
+        <source>No item selected, please select room!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Projection on every Client</source>
+        <source>Are you sure you want to reload the room?
+Note that all clients will be deleted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SetAsTutor</source>
+        <source>Projection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set current Frame as Tutor</source>
+        <source>Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Client</source>
+        <source>No client is selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
+        <source>The selected client is not connected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This client is still connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reload Room Configuration</source>
+        <source>Lock/Unlock single client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No tutor defined.</source>
+        <source>Reload Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tutor is offline.</source>
+        <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please select a projection source.</source>
+        <source>Are you sure you want to exit?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The projection source is offline.</source>
+        <source>Do you want to delete and disconnect any clients
+not belonging to the current room layout?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please select a projection destination.</source>
+        <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The projection destination is offline.</source>
+        <source>Are you sure you want to delete the selected client?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selected projection target is tutor.</source>
+        <source>Lock/Unlock all clients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selected client is currently online.</source>
+        <source>This will show a black screen on all connected clients, except the tutor&apos;s client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No projection destination available.</source>
+        <source>Stream currently selected client&apos;s screen content to the tutor&apos;s client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Session Name: %1  [click to edit]</source>
+        <source>Stream currently selected client&apos;s screen content to the tutor&apos;s client while showing a locked black screen on all other clients.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No item selected, please select room!</source>
+        <source>Stream the tutor&apos;s screen contents to the currently selected client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Are you sure you want to reload the room?
-Note that all clients will be deleted.</source>
+        <source>Stream the tutor&apos;s screen contents to everyone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Projection</source>
+        <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selection</source>
+        <source>Unlock all clients, stop any running screen content streaming.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No client is selected.</source>
+        <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The selected client is not connected.</source>
+        <source>Declare tutor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This client is still connected.</source>
+        <source>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lock/Unlock single client</source>
+        <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lock or unlock the selected client</source>
+        <source>Delete currently selected client. Only allowed for disconnected clients.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reload Room</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Question</source>
+        <source>Show this help text.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Are you sure you want to exit?</source>
+        <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to delete and disconnect any clients
-not belonging to the current room layout?</source>
+        <source>Load a new room layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Warning</source>
+        <source>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Are you sure you want to delete the selected client?</source>
+        <source>Lock or unlock the selected client only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Student&apos;s Screen to Tutor, others blanked</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/server/pvsmgr_de_DE.ts b/i18n/server/pvsmgr_de_DE.ts
index ec6ebe5..8b9e9ef 100644
--- a/i18n/server/pvsmgr_de_DE.ts
+++ b/i18n/server/pvsmgr_de_DE.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="de_DE" sourcelanguage="en_US">
+<TS version="2.0" language="de_DE" sourcelanguage="en_US">
 <context>
     <name>ConnectionFrame</name>
     <message>
@@ -10,68 +10,19 @@
     </message>
 </context>
 <context>
-    <name>Help</name>
+    <name>HelpWindow</name>
     <message>
-        <location filename="../../gui/server_normal/help.ui" line="20"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="60"/>
-        <source>Refresh classroom configuration after choosing the room.</source>
-        <translation>Lade nach Raumauswahl entsprechende Raumkonfiguration neu.</translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="500"/>
-        <source>Delete selected client</source>
-        <translation>Lösche ausgewählten Client</translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="588"/>
-        <source>Cancel</source>
-        <translation>Abbruch</translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="557"/>
-        <source>Stop running projections.</source>
-        <translation>Alle Projektionen abbrechen.</translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="370"/>
-        <source>Start projection from selected student to tutor and blank all others.</source>
-        <translation>Projektion des ausgewählten Studierendens an Tutor; alle anderen ausblenden.</translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="311"/>
-        <source>Start projection from selected student to tutor.</source>
-        <translation>Startet Projektion von ausgewähltem Studierenden an Tutor.</translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="252"/>
-        <source>Start projection from tutor to selected student.</source>
-        <translation>Startet Projektion von Tutor an ausgewählten Studierenden.</translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="193"/>
-        <source>Start projection from tutor to all connected students.</source>
-        <translation>Startet Projektion von Tutor an alle verbundenen Studierenden.</translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="128"/>
-        <source>Lock all connected students screens.</source>
-        <translation>Alle verbundenen Studierendenbildschirme sperren.</translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="407"/>
-        <source>Set selected client to tutor.</source>
-        <translation>Ausgewählten Client als Tutor festlegen.</translation>
+        <location filename="../../src/server/helpwindow/helpwindow.cpp" line="35"/>
+        <source>Close</source>
+        <translation>Schließen</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
         <location filename="../../gui/server_normal/mainwindow.ui" line="167"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="102"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
         <source>Exit</source>
         <translation>Beenden</translation>
     </message>
@@ -121,185 +72,245 @@
         <translation>Kein Projektionsziel verfügbar.</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="84"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
         <source>Reload Room</source>
         <translation>Raum neu laden</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="433"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="683"/>
         <source>Question</source>
         <translation>Frage</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="433"/>
         <source>Are you sure you want to exit?</source>
         <translation>Wollen Sie den PVS-Manager wirklich beenden?</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="683"/>
         <source>Do you want to delete and disconnect any clients
 not belonging to the current room layout?</source>
         <translation>Möchten Sie alle Teilnehmer, die nicht zum aktuellen Raumplan gehören, aus der Sitzung entfernen?</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1023"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1030"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1066"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1297"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1301"/>
         <source>Selection</source>
         <translation>Auswahl</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1301"/>
         <source>This client is still connected.</source>
         <translation>Dieser Client ist noch verbunden.</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
         <source>Are you sure you want to delete the selected client?</source>
         <translation>Möchten Sie den gewählten Client löschen?</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="672"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="671"/>
         <source>Session Name: %1  [click to edit]</source>
         <translation>Sitzungsname: %1  [anklicken editiert]</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="805"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="804"/>
         <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="808"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="807"/>
         <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="870"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="872"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="874"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="902"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="904"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="906"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="908"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="910"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="951"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="953"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="955"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="957"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="959"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="869"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="871"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="873"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="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"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="909"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="950"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="952"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="954"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="956"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="958"/>
         <source>Projection</source>
         <translation>Projektion</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1023"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1066"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1297"/>
         <source>No client is selected.</source>
         <translation>Kein Client ausgewählt.</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1030"/>
         <source>The selected client is not connected.</source>
         <translation>Ausgewählter Client ist nicht verbunden.</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="103"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
         <source>Lock or Unlock all Clients</source>
         <translation>Alle Clients sperren oder entsperren</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
-        <source>&amp;Exit</source>
-        <translation>&amp;Abbruch</translation>
-    </message>
-    <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="170"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="182"/>
-        <source>lock</source>
-        <translation>lock</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
+        <source>Lock/Unlock all clients</source>
+        <translation>Alle Clients (ent)sperren</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
-        <source>Ctrl+A</source>
-        <translation>Strg+A</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="182"/>
+        <source>This will show a black screen on all connected clients, except the tutor&apos;s client.</source>
+        <translation>Schaltet alle Bildschirme schwarz und deaktiviert Maus/Tastatur. Der Tutor ist von dieser Funktion ausgenommen.</translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
-        <source>Student&apos;s Screen to Tutor</source>
-        <translation>Studierendenbildschirm an Tutor</translation>
+        <source>Stream currently selected client&apos;s screen content to the tutor&apos;s client.</source>
+        <translation>Übertrage den Bildschirminhalt des gewählten Clients an den Tutor.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="209"/>
+        <source>Stream currently selected client&apos;s screen content to the tutor&apos;s client while showing a locked black screen on all other clients.</source>
+        <translation>Der Bildschirm des gewählten Clients wird an den Tutor übertragen, während alle anderen Teilnehmer einen Schwarzen Bildschirm sehen.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
+        <source>Stream the tutor&apos;s screen contents to everyone.</source>
+        <translation>Bildschirminhalt des Tutors an alle verbundenen Clients übertragen.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="248"/>
+        <source>Reset</source>
+        <translation>Reset</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
+        <source>Unlock all clients, stop any running screen content streaming.</source>
+        <translation>Ausgangszustand wiederherstellen: Alle Clients entsperren, alle laufenden Bildschirmübertragungen abbrechen.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="251"/>
+        <source>R</source>
+        <translation>R</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="206"/>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="263"/>
+        <source>Declare tutor</source>
+        <translation>Zum Tutor ernennen</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="260"/>
+        <source>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</source>
+        <translation>Den aktuell gewählten Client zum Tutor ernennen.  Der Client des Tutors wird vom Bildschirmsperren ausgenommen, und dient als fixer Endpunkt für Bildschirmübertragungen.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="212"/>
         <source>Student&apos;s Screen to Tutor, others blanked</source>
-        <translation>Studierendenbildschirm an Tutor; alle anderen ausgeblendet</translation>
+        <translation>Gewählten Client an Tutor übertragen, andere Teilnehmer sperren</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="215"/>
-        <source>Tutor&apos;s Screen to Student</source>
-        <translation>Tutorenbildschirm an Studierenden</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="266"/>
+        <source>T</source>
+        <translation>T</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
-        <source>Tutor&apos;s Screen to Everyone</source>
-        <translation>Tutorenbildschirm an alle</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="293"/>
+        <source>Show this help text.</source>
+        <translation>Diese Hilfe anzeigen.</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
-        <source>Stop Projection on every Client</source>
-        <translation>Projektion an alle Clients abbrechen</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
+        <source>F1</source>
+        <translation>F1</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="242"/>
-        <source>SetAsTutor</source>
-        <translation>AlsTutorSetzen</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="314"/>
+        <source>Load a new room layout</source>
+        <translation>Neuen Raumplan laden</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
-        <source>Set current Frame as Tutor</source>
-        <translation>Ausgewählten Client als Tutor festlegen</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="311"/>
+        <source>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</source>
+        <translation>Zeigt eine Liste aller vordefinierten Räume an. Wird ein neuer Raumplan geladen, werden alle aktuell verbundenen Clients getrennt.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="323"/>
+        <source>Lock or unlock the selected client only.</source>
+        <translation>Gewählten Client (ent)sperren.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="329"/>
+        <source>L</source>
+        <translation>L</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
+        <source>Ctrl+A</source>
+        <translation>Strg+A</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="200"/>
+        <source>Student&apos;s Screen to Tutor</source>
+        <translation>Gewählten Client an Tutor übertragen</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
+        <source>Tutor&apos;s Screen to Student</source>
+        <translation>Tutorenbildschirm an gewählten Client</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="221"/>
+        <source>Stream the tutor&apos;s screen contents to the currently selected client.</source>
+        <translation>Den Bildschirminhalt des Tutors an alle verbundenen Clients übertragen.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="236"/>
+        <source>Tutor&apos;s Screen to Everyone</source>
+        <translation>Tutorenbildschirm an alle</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="254"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="257"/>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="278"/>
         <source>Delete Client</source>
         <translation>Lösche Client</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="269"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="272"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
-        <source>Help</source>
-        <translation>Hilfe</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="275"/>
+        <source>Delete currently selected client. Only allowed for disconnected clients.</source>
+        <translation>Den gewählten Client löschen. Nur möglich bei nicht verbundenen Clients.</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="284"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="287"/>
-        <source>Reload Room Configuration</source>
-        <translation>Neu laden der Raumkonfiguration</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="281"/>
+        <source>Del</source>
+        <translation>Entf</translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="296"/>
-        <source>Lock/Unlock single client</source>
-        <translation>Einzelnen Client (ent)sperren</translation>
+        <source>Help</source>
+        <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
-        <source>Lock or unlock the selected client</source>
-        <translation>Den ausgewählten Client sperren btw. entsperren</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="326"/>
+        <source>Lock/Unlock single client</source>
+        <translation>Einzelnen Client (ent)sperren</translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="120"/>
@@ -354,7 +365,7 @@ OK beendet den PVS-Manager</translation>
         <translation>Raum neu laden</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/reloadroom.ui" line="38"/>
+        <location filename="../../gui/server_normal/reloadroom.ui" line="28"/>
         <source>Choose room configuration to reload:</source>
         <translation>Wählen Sie den neuzuladenden Raum:</translation>
     </message>
diff --git a/i18n/server/pvsmgr_es_MX.ts b/i18n/server/pvsmgr_es_MX.ts
index 64369ce..49f56d9 100644
--- a/i18n/server/pvsmgr_es_MX.ts
+++ b/i18n/server/pvsmgr_es_MX.ts
@@ -10,68 +10,19 @@
     </message>
 </context>
 <context>
-    <name>Help</name>
+    <name>HelpWindow</name>
     <message>
-        <location filename="../../gui/server_normal/help.ui" line="20"/>
-        <source>Form</source>
+        <location filename="../../src/server/helpwindow/helpwindow.cpp" line="35"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="128"/>
-        <source>Lock all connected students screens.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="193"/>
-        <source>Start projection from tutor to all connected students.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="252"/>
-        <source>Start projection from tutor to selected student.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="311"/>
-        <source>Start projection from selected student to tutor.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="370"/>
-        <source>Start projection from selected student to tutor and blank all others.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="500"/>
-        <source>Delete selected client</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="557"/>
-        <source>Stop running projections.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="407"/>
-        <source>Set selected client to tutor.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="60"/>
-        <source>Refresh classroom configuration after choosing the room.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="588"/>
-        <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
         <location filename="../../gui/server_normal/mainwindow.ui" line="167"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="102"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
@@ -121,180 +72,240 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="84"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
         <source>Reload Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="433"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="683"/>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="433"/>
         <source>Are you sure you want to exit?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="683"/>
         <source>Do you want to delete and disconnect any clients
 not belonging to the current room layout?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1023"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1030"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1066"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1297"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1301"/>
         <source>Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1301"/>
         <source>This client is still connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
         <source>Are you sure you want to delete the selected client?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="672"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="671"/>
         <source>Session Name: %1  [click to edit]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="805"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="804"/>
         <source>No item selected, please select room!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="808"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="807"/>
         <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="870"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="872"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="874"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="902"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="904"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="906"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="908"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="910"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="951"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="953"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="955"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="957"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="959"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="869"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="871"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="873"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="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"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="909"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="950"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="952"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="954"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="956"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="958"/>
         <source>Projection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1023"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1066"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1297"/>
         <source>No client is selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1030"/>
         <source>The selected client is not connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="103"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
         <source>Lock or Unlock all Clients</source>
         <translation>Bloquear o desbloquear todos los clientes</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
-        <source>&amp;Exit</source>
-        <translation>&amp;Salir</translation>
-    </message>
-    <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="170"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
-        <source>Student&apos;s Screen to Tutor</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
+        <source>Lock/Unlock all clients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="206"/>
-        <source>Student&apos;s Screen to Tutor, others blanked</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="182"/>
+        <source>This will show a black screen on all connected clients, except the tutor&apos;s client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="215"/>
-        <source>Tutor&apos;s Screen to Student</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="200"/>
+        <source>Student&apos;s Screen to Tutor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
-        <source>Tutor&apos;s Screen to Everyone</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
+        <source>Stream currently selected client&apos;s screen content to the tutor&apos;s client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="209"/>
+        <source>Stream currently selected client&apos;s screen content to the tutor&apos;s client while showing a locked black screen on all other clients.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
-        <source>Stop Projection on every Client</source>
+        <source>Stream the tutor&apos;s screen contents to everyone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="242"/>
-        <source>SetAsTutor</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="248"/>
+        <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
-        <source>Set current Frame as Tutor</source>
+        <source>Unlock all clients, stop any running screen content streaming.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="254"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="257"/>
-        <source>Delete Client</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="251"/>
+        <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="269"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="272"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
-        <source>Help</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="263"/>
+        <source>Declare tutor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="284"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="287"/>
-        <source>Reload Room Configuration</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="260"/>
+        <source>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="296"/>
-        <source>Lock/Unlock single client</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="212"/>
+        <source>Student&apos;s Screen to Tutor, others blanked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="266"/>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="293"/>
+        <source>Show this help text.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
-        <source>Lock or unlock the selected client</source>
+        <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="182"/>
-        <source>lock</source>
-        <translation>bloquear</translation>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="314"/>
+        <source>Load a new room layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="311"/>
+        <source>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="323"/>
+        <source>Lock or unlock the selected client only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="329"/>
+        <source>L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
+        <source>Tutor&apos;s Screen to Student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="221"/>
+        <source>Stream the tutor&apos;s screen contents to the currently selected client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="236"/>
+        <source>Tutor&apos;s Screen to Everyone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="278"/>
+        <source>Delete Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="275"/>
+        <source>Delete currently selected client. Only allowed for disconnected clients.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="281"/>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="296"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="326"/>
+        <source>Lock/Unlock single client</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
@@ -351,7 +362,7 @@ Press OK to quit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/reloadroom.ui" line="38"/>
+        <location filename="../../gui/server_normal/reloadroom.ui" line="28"/>
         <source>Choose room configuration to reload:</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/server/pvsmgr_fr_FR.ts b/i18n/server/pvsmgr_fr_FR.ts
index 3d1f321..1980134 100644
--- a/i18n/server/pvsmgr_fr_FR.ts
+++ b/i18n/server/pvsmgr_fr_FR.ts
@@ -10,68 +10,19 @@
     </message>
 </context>
 <context>
-    <name>Help</name>
+    <name>HelpWindow</name>
     <message>
-        <location filename="../../gui/server_normal/help.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="128"/>
-        <source>Lock all connected students screens.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="193"/>
-        <source>Start projection from tutor to all connected students.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="252"/>
-        <source>Start projection from tutor to selected student.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="311"/>
-        <source>Start projection from selected student to tutor.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="370"/>
-        <source>Start projection from selected student to tutor and blank all others.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="500"/>
-        <source>Delete selected client</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="557"/>
-        <source>Stop running projections.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="407"/>
-        <source>Set selected client to tutor.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="60"/>
-        <source>Refresh classroom configuration after choosing the room.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="588"/>
-        <source>Cancel</source>
+        <location filename="../../src/server/helpwindow/helpwindow.cpp" line="35"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
         <location filename="../../gui/server_normal/mainwindow.ui" line="167"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="102"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -121,184 +72,244 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="84"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
         <source>Reload Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="433"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="683"/>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="433"/>
         <source>Are you sure you want to exit?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="683"/>
         <source>Do you want to delete and disconnect any clients
 not belonging to the current room layout?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1023"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1030"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1066"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1297"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1301"/>
         <source>Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1301"/>
         <source>This client is still connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
         <source>Are you sure you want to delete the selected client?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="672"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="671"/>
         <source>Session Name: %1  [click to edit]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="805"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="804"/>
         <source>No item selected, please select room!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="808"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="807"/>
         <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="870"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="872"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="874"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="902"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="904"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="906"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="908"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="910"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="951"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="953"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="955"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="957"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="959"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="869"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="871"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="873"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="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"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="909"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="950"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="952"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="954"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="956"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="958"/>
         <source>Projection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1023"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1066"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1297"/>
         <source>No client is selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1030"/>
         <source>The selected client is not connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="103"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
         <source>Lock or Unlock all Clients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
-        <source>&amp;Exit</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="170"/>
+        <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="170"/>
-        <source>Ctrl+Q</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
+        <source>Lock/Unlock all clients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="182"/>
-        <source>lock</source>
+        <source>This will show a black screen on all connected clients, except the tutor&apos;s client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
-        <source>Ctrl+A</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
+        <source>Stream currently selected client&apos;s screen content to the tutor&apos;s client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
-        <source>Student&apos;s Screen to Tutor</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="209"/>
+        <source>Stream currently selected client&apos;s screen content to the tutor&apos;s client while showing a locked black screen on all other clients.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
+        <source>Stream the tutor&apos;s screen contents to everyone.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="248"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
+        <source>Unlock all clients, stop any running screen content streaming.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="206"/>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="251"/>
+        <source>R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="263"/>
+        <source>Declare tutor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="260"/>
+        <source>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="212"/>
         <source>Student&apos;s Screen to Tutor, others blanked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="215"/>
-        <source>Tutor&apos;s Screen to Student</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="266"/>
+        <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
-        <source>Tutor&apos;s Screen to Everyone</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="293"/>
+        <source>Show this help text.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
-        <source>Stop Projection on every Client</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
+        <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="242"/>
-        <source>SetAsTutor</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="314"/>
+        <source>Load a new room layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
-        <source>Set current Frame as Tutor</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="311"/>
+        <source>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="323"/>
+        <source>Lock or unlock the selected client only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="329"/>
+        <source>L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
+        <source>Ctrl+A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="200"/>
+        <source>Student&apos;s Screen to Tutor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
+        <source>Tutor&apos;s Screen to Student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="221"/>
+        <source>Stream the tutor&apos;s screen contents to the currently selected client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="254"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="257"/>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="236"/>
+        <source>Tutor&apos;s Screen to Everyone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="278"/>
         <source>Delete Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="269"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="272"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
-        <source>Help</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="275"/>
+        <source>Delete currently selected client. Only allowed for disconnected clients.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="284"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="287"/>
-        <source>Reload Room Configuration</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="281"/>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="296"/>
-        <source>Lock/Unlock single client</source>
+        <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
-        <source>Lock or unlock the selected client</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="326"/>
+        <source>Lock/Unlock single client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -351,7 +362,7 @@ Press OK to quit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/reloadroom.ui" line="38"/>
+        <location filename="../../gui/server_normal/reloadroom.ui" line="28"/>
         <source>Choose room configuration to reload:</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/server/pvsmgr_pl_PL.ts b/i18n/server/pvsmgr_pl_PL.ts
index 3d1f321..1980134 100644
--- a/i18n/server/pvsmgr_pl_PL.ts
+++ b/i18n/server/pvsmgr_pl_PL.ts
@@ -10,68 +10,19 @@
     </message>
 </context>
 <context>
-    <name>Help</name>
+    <name>HelpWindow</name>
     <message>
-        <location filename="../../gui/server_normal/help.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="128"/>
-        <source>Lock all connected students screens.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="193"/>
-        <source>Start projection from tutor to all connected students.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="252"/>
-        <source>Start projection from tutor to selected student.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="311"/>
-        <source>Start projection from selected student to tutor.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="370"/>
-        <source>Start projection from selected student to tutor and blank all others.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="500"/>
-        <source>Delete selected client</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="557"/>
-        <source>Stop running projections.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="407"/>
-        <source>Set selected client to tutor.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="60"/>
-        <source>Refresh classroom configuration after choosing the room.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/server_normal/help.ui" line="588"/>
-        <source>Cancel</source>
+        <location filename="../../src/server/helpwindow/helpwindow.cpp" line="35"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
         <location filename="../../gui/server_normal/mainwindow.ui" line="167"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="102"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="100"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -121,184 +72,244 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="84"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
         <source>Reload Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="433"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="683"/>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="434"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="433"/>
         <source>Are you sure you want to exit?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="684"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="683"/>
         <source>Do you want to delete and disconnect any clients
 not belonging to the current room layout?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1023"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1030"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1066"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1297"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1301"/>
         <source>Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1302"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1301"/>
         <source>This client is still connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1305"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1304"/>
         <source>Are you sure you want to delete the selected client?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="672"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="671"/>
         <source>Session Name: %1  [click to edit]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="805"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="804"/>
         <source>No item selected, please select room!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="808"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="807"/>
         <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="870"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="872"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="874"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="902"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="904"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="906"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="908"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="910"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="951"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="953"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="955"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="957"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="959"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="869"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="871"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="873"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="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"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="909"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="950"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="952"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="954"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="956"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="958"/>
         <source>Projection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1024"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1067"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1298"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1023"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1066"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1297"/>
         <source>No client is selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1031"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="1030"/>
         <source>The selected client is not connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="103"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="101"/>
         <source>Lock or Unlock all Clients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="164"/>
-        <source>&amp;Exit</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="170"/>
+        <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="170"/>
-        <source>Ctrl+Q</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="185"/>
+        <source>Lock/Unlock all clients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="182"/>
-        <source>lock</source>
+        <source>This will show a black screen on all connected clients, except the tutor&apos;s client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
-        <source>Ctrl+A</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
+        <source>Stream currently selected client&apos;s screen content to the tutor&apos;s client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="197"/>
-        <source>Student&apos;s Screen to Tutor</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="209"/>
+        <source>Stream currently selected client&apos;s screen content to the tutor&apos;s client while showing a locked black screen on all other clients.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
+        <source>Stream the tutor&apos;s screen contents to everyone.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="248"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
+        <source>Unlock all clients, stop any running screen content streaming.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="206"/>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="251"/>
+        <source>R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="263"/>
+        <source>Declare tutor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="260"/>
+        <source>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="212"/>
         <source>Student&apos;s Screen to Tutor, others blanked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="215"/>
-        <source>Tutor&apos;s Screen to Student</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="266"/>
+        <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
-        <source>Tutor&apos;s Screen to Everyone</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="293"/>
+        <source>Show this help text.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="233"/>
-        <source>Stop Projection on every Client</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
+        <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="242"/>
-        <source>SetAsTutor</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="314"/>
+        <source>Load a new room layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="245"/>
-        <source>Set current Frame as Tutor</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="311"/>
+        <source>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="323"/>
+        <source>Lock or unlock the selected client only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="329"/>
+        <source>L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="188"/>
+        <source>Ctrl+A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="200"/>
+        <source>Student&apos;s Screen to Tutor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="224"/>
+        <source>Tutor&apos;s Screen to Student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="221"/>
+        <source>Stream the tutor&apos;s screen contents to the currently selected client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="254"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="257"/>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="236"/>
+        <source>Tutor&apos;s Screen to Everyone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="278"/>
         <source>Delete Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="269"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="272"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="82"/>
-        <source>Help</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="275"/>
+        <source>Delete currently selected client. Only allowed for disconnected clients.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="284"/>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="287"/>
-        <source>Reload Room Configuration</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="281"/>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../gui/server_normal/mainwindow.ui" line="296"/>
-        <source>Lock/Unlock single client</source>
+        <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/mainwindow.ui" line="299"/>
-        <source>Lock or unlock the selected client</source>
+        <location filename="../../gui/server_normal/mainwindow.ui" line="326"/>
+        <source>Lock/Unlock single client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -351,7 +362,7 @@ Press OK to quit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/server_normal/reloadroom.ui" line="38"/>
+        <location filename="../../gui/server_normal/reloadroom.ui" line="28"/>
         <source>Choose room configuration to reload:</source>
         <translation type="unfinished"></translation>
     </message>