Adjust helpwindow to reload button plus adding some more translations.

5 files changed, 282 insertions, 1022 deletions

diff --git a/i18n/client/pvsclient_ar_JO.ts b/i18n/client/pvsclient_ar_JO.ts
index be8cf42..3b38013 100644
--- a/i18n/client/pvsclient_ar_JO.ts
+++ b/i18n/client/pvsclient_ar_JO.ts
@@ -4,80 +4,88 @@
 <context>
     <name>ConnectWindow</name>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="75"/>
-        <source>Connected.</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="70"/>
+        <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="74"/>
-        <source>&amp;Disconnect</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="71"/>
+        <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="81"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
         <source>&amp;Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="83"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="80"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="88"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
+        <location filename="../../trbuild/ui_connect.h" line="153"/>
         <source>Ready to connect; please enter session name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="88"/>
         <source>Scanning for session %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
         <source>Found session, connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="98"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="94"/>
         <source>Waiting for server challenge...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="101"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="97"/>
         <source>Replied to challenge, sent own...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="104"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="100"/>
         <source>Logging in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="107"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="103"/>
         <source>Connection established!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="113"/>
-        <source>Invalid hash: %1; invalid cert: %2; invalid iplist: %3; invalid sslhash: %4</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
+        <source>Invalid certificate.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="109"/>
+        <source>Invalid Ssl hash: %1.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Dialog</name>
     <message>
-        <location filename="../../build/ui_connect.h" line="80"/>
+        <location filename="../../trbuild/ui_connect.h" line="151"/>
         <source>Connect to PVS session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_connect.h" line="81"/>
-        <source>Session Name</source>
+        <location filename="../../trbuild/ui_connect.h" line="152"/>
+        <source>Session Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../trbuild/ui_connect.h" line="154"/>
+        <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_connect.h" line="82"/>
+        <location filename="../../trbuild/ui_connect.h" line="155"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -85,51 +93,55 @@
 <context>
     <name>Toolbar</name>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="38"/>
-        <source>&amp;Connect</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="101"/>
+        <source>Set &amp;session ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="102"/>
+        <source>&amp;Was ist das hier?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="40"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="103"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="168"/>
-        <source>Offline</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="262"/>
+        <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="174"/>
-        <source>Online</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="283"/>
+        <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ToolbarClass</name>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="169"/>
-        <source>Form</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="341"/>
+        <source>Über PVS Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="171"/>
-        <source>Menu</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
+        <source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="173"/>
-        <source>Host:</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="268"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="295"/>
+        <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="175"/>
-        <source>Click to connect</source>
+        <location filename="../../trbuild/ui_toolbar.h" line="156"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="177"/>
-        <source>-</source>
+        <location filename="../../trbuild/ui_toolbar.h" line="158"/>
+        <location filename="../../trbuild/ui_toolbar.h" line="160"/>
+        <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/client/pvsclient_de_DE.ts b/i18n/client/pvsclient_de_DE.ts
index 96b870b..f757ab3 100644
--- a/i18n/client/pvsclient_de_DE.ts
+++ b/i18n/client/pvsclient_de_DE.ts
@@ -2,521 +2,147 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="de_DE" sourcelanguage="en_US">
 <context>
-    <name>AboutDialog</name>
-    <message>
-        <source>Version: </source>
-        <translation type="obsolete">Version: </translation>
-    </message>
-</context>
-<context>
-    <name>AboutDialogClass</name>
-    <message>
-        <source>PVS - About</source>
-        <translation type="obsolete">PVS -Über</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Über</translation>
-    </message>
-    <message>
-        <source>Authors</source>
-        <translation type="obsolete">Autoren</translation>
-    </message>
-    <message>
-        <source>Translation</source>
-        <translation type="obsolete">Übersetzung</translation>
-    </message>
-</context>
-<context>
-    <name>ClientChatDialog</name>
-    <message>
-        <source>&amp;Send File...</source>
-        <translation type="obsolete">Datei &amp;Senden...</translation>
-    </message>
-    <message>
-        <source> has joined the chat.</source>
-        <translation type="obsolete"> ist dem Chat beigetreten.</translation>
-    </message>
-    <message>
-        <source> has left the chat.</source>
-        <translation type="obsolete"> hat den Chat verlassen.</translation>
-    </message>
-    <message>
-        <source>PVS File Transfer</source>
-        <translation type="obsolete">PVS Dateiübertragung</translation>
-    </message>
-    <message>
-        <source>Send file &apos;</source>
-        <translation type="obsolete">Datei senden &apos;</translation>
-    </message>
-    <message>
-        <source>&apos; to </source>
-        <translation type="obsolete">&apos; an </translation>
-    </message>
-    <message>
-        <source>Connected.</source>
-        <translation type="obsolete">Verbunden.</translation>
-    </message>
-    <message>
-        <source>Disconnected.</source>
-        <translation type="obsolete">Getrennt.</translation>
-    </message>
-    <message>
-        <source>Message from &lt;</source>
-        <translation type="obsolete">Nachricht von &lt;</translation>
-    </message>
-</context>
-<context>
-    <name>ClientChatDialogClass</name>
-    <message>
-        <source>PVS - Chat </source>
-        <translation type="obsolete">PVS - Chat</translation>
-    </message>
-    <message>
-        <source>&amp;Send</source>
-        <translation type="obsolete">&amp;Senden</translation>
-    </message>
-</context>
-<context>
-    <name>ClientConfigDialogClass</name>
-    <message>
-        <source>PVS - Configuration</source>
-        <translation type="obsolete">PVS - Konfiguration</translation>
-    </message>
-    <message>
-        <source>Allow vnc access to lecturer?</source>
-        <translation type="obsolete">Dozenten VNC Zugriff erlauben?</translation>
-    </message>
-    <message>
-        <source>Full access</source>
-        <translation type="obsolete">Voller Zugriff</translation>
-    </message>
-    <message>
-        <source>View only</source>
-        <translation type="obsolete">Nur zuschauen</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Kein</translation>
-    </message>
-    <message>
-        <source>Allow vnc access to other?</source>
-        <translation type="obsolete">Anderen VNC Zugriff erlauben?</translation>
-    </message>
-    <message>
-        <source>Accept chat messages</source>
-        <translation type="obsolete">Chat Nachrichten erlauben</translation>
-    </message>
-    <message>
-        <source>Accept file transfers</source>
-        <translation type="obsolete">Dateiübertragung erlauben</translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation type="obsolete">Rechte</translation>
-    </message>
-    <message>
-        <source>Top Left</source>
-        <translation type="obsolete">Oben Links</translation>
-    </message>
-    <message>
-        <source>Top Center</source>
-        <translation type="obsolete">Oben Mitte</translation>
-    </message>
-    <message>
-        <source>Top Right</source>
-        <translation type="obsolete">Oben Rechts</translation>
-    </message>
-    <message>
-        <source>Bottom Left</source>
-        <translation type="obsolete">Unten Links</translation>
-    </message>
-    <message>
-        <source>Bottom Center</source>
-        <translation type="obsolete">Unten Mitte</translation>
-    </message>
-    <message>
-        <source>Bottom Right</source>
-        <translation type="obsolete">Unten Rechts</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="obsolete">Anzeige</translation>
-    </message>
-</context>
-<context>
-    <name>ClientFileReceiveDialog</name>
-    <message>
-        <source>PVS File Transfer</source>
-        <translation type="obsolete">PVS Dateiübertragung</translation>
-    </message>
-    <message>
-        <source>User &apos;</source>
-        <translation type="obsolete">Benutzer &apos;</translation>
-    </message>
-    <message>
-        <source>&apos; would like to send you a file: </source>
-        <translation type="obsolete">&apos; möchte ihnen eine Datei senden:</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Datei Öffnen</translation>
-    </message>
-    <message>
-        <source>PVS - File Transfer</source>
-        <translation type="obsolete">PVS - Dateiübertragung</translation>
-    </message>
-    <message>
-        <source>File Transfer complete.</source>
-        <translation type="obsolete">Dateiübertragung beendet.</translation>
-    </message>
-    <message>
-        <source>File Transfer canceled!</source>
-        <translation type="obsolete">Dateiübertragung abgebrochen!</translation>
-    </message>
-</context>
-<context>
-    <name>ClientFileReceiveDialogClass</name>
-    <message>
-        <source>PVS - File Transfer</source>
-        <translation type="obsolete">PVS - Dateiübertragung</translation>
-    </message>
-    <message>
-        <source>Receiving from:</source>
-        <translation type="obsolete">Empfang von:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">unbekannt</translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="obsolete">0</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="obsolete">/</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Abbruch</translation>
-    </message>
-</context>
-<context>
-    <name>ClientFileSendDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Datei Öffnen</translation>
-    </message>
-    <message>
-        <source>PVS - File Transfer</source>
-        <translation type="obsolete">PBS -Dateiübertragung</translation>
-    </message>
-    <message>
-        <source>File Transfer complete.</source>
-        <translation type="obsolete">Dateiübertragung beendet.</translation>
-    </message>
-    <message>
-        <source>File Transfer canceled!</source>
-        <translation type="obsolete">Dateiübertragung abgebrochen!</translation>
-    </message>
-</context>
-<context>
-    <name>ClientFileSendDialogClass</name>
-    <message>
-        <source>PVS - File Transfer</source>
-        <translation type="obsolete">PVS - Dateiübertragung</translation>
-    </message>
-    <message>
-        <source>Sending to:</source>
-        <translation type="obsolete">Senden an:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">unbekannt</translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="obsolete">0</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="obsolete">/</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Abbruch</translation>
-    </message>
-</context>
-<context>
-    <name>ClientNicklistDialogClass</name>
-    <message>
-        <source>PVS - Users</source>
-        <translation type="obsolete">PVS - Benutzer</translation>
-    </message>
-    <message>
-        <source>Select user:</source>
-        <translation type="obsolete">Benutzer auswählen:</translation>
-    </message>
-</context>
-<context>
-    <name>ClientToolbarClass</name>
-    <message>
-        <source>Menu</source>
-        <translation type="obsolete">Menü</translation>
-    </message>
+    <name>ConnectWindow</name>
     <message>
-        <source>Click to connect</source>
-        <translation type="obsolete">Zum Verbinden Klicken</translation>
+        <location filename="../../trbuild/ui_connect.h" line="151"/>
+        <source>Connect to PVS session</source>
+        <translation type="unfinished">Verbinde zu PVS Sitzung</translation>
     </message>
     <message>
-        <source>Enable/Disable VNC only for this session</source>
-        <translation type="obsolete">VNC nur für diese Sitzung ein- und ausschalten</translation>
+        <location filename="../../trbuild/ui_connect.h" line="152"/>
+        <source>Session Name:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow VNC</source>
-        <translation type="obsolete">VNC erlauben</translation>
-    </message>
-</context>
-<context>
-    <name>ConnectWindow</name>
-    <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="75"/>
-        <source>Connected.</source>
-        <translation>Verbunden.</translation>
+        <location filename="../../trbuild/ui_connect.h" line="154"/>
+        <source>Connect</source>
+        <translation type="unfinished">Verbinden</translation>
     </message>
     <message>
-        <source>Connect</source>
-        <translation type="obsolete">Verbinden</translation>
+        <location filename="../../trbuild/ui_connect.h" line="155"/>
+        <source>Hide</source>
+        <translation type="unfinished">Ausblenden</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="74"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="70"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Trennen</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="81"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="71"/>
+        <source>Connected to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stop</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="83"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="80"/>
         <source>&amp;Connect</source>
         <translation>&amp;Verbinden</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="88"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
+        <location filename="../../trbuild/ui_connect.h" line="153"/>
         <source>Ready to connect; please enter session name.</source>
         <translation>Bereit für Verbindung; Bitte den Sitzungsname eingeben.</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="88"/>
         <source>Scanning for session %1.</source>
         <translation>Suche nach Sitzung %1.</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
         <source>Found session, connecting...</source>
         <translation>Sitzung gefunden, verbinden...</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="98"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="94"/>
         <source>Waiting for server challenge...</source>
         <translation>Warten auf Serveranforderung...</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="101"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="97"/>
         <source>Replied to challenge, sent own...</source>
         <translation>Anforderung erwiedert, sende eigene...</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="104"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="100"/>
         <source>Logging in...</source>
         <translation>Einloggen...</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="107"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="103"/>
         <source>Connection established!</source>
         <translation>Verbindung vorhanden!</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="113"/>
-        <source>Invalid hash: %1; invalid cert: %2; invalid iplist: %3; invalid sslhash: %4</source>
-        <translation>Ungültiger hash: %1; ungültiges Zertifikat: %2; ungültige IP - Liste: %3; ungültiger sslhash: %4</translation>
-    </message>
-</context>
-<context>
-    <name>Dialog</name>
-    <message>
-        <location filename="../../build/ui_connect.h" line="80"/>
-        <source>Connect to PVS session</source>
-        <translation>Verbinde zu PVS Sitzung</translation>
-    </message>
-    <message>
-        <location filename="../../build/ui_connect.h" line="81"/>
-        <source>Session Name</source>
-        <translation>Sitzungsname</translation>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
+        <source>Invalid certificate.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_connect.h" line="82"/>
-        <source>Hide</source>
-        <translation>Ausblenden</translation>
-    </message>
-</context>
-<context>
-    <name>InfoDialogClass</name>
-    <message>
-        <source>PVS - Information</source>
-        <translation type="obsolete">PVS - Information</translation>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="109"/>
+        <source>Invalid Ssl hash: %1.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>PVSGUI</name>
-    <message>
-        <source>Connect</source>
-        <translation type="obsolete">Verbinden</translation>
-    </message>
-    <message>
-        <source>Show &amp;toolbar</source>
-        <translation type="obsolete">&amp;Werkzeugleiste anzeigen</translation>
-    </message>
-    <message>
-        <source>&amp;Disconnect</source>
-        <translation type="obsolete">&amp;Trennen</translation>
-    </message>
-    <message>
-        <source>&amp;Send File</source>
-        <translation type="obsolete">Datei &amp;Senden</translation>
-    </message>
-    <message>
-        <source>&amp;Config</source>
-        <translation type="obsolete">&amp;Konfiguration</translation>
-    </message>
+    <name>Toolbar</name>
     <message>
-        <source>&amp;Information</source>
-        <translation type="obsolete">&amp;Information</translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="101"/>
+        <source>Set &amp;session ID</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete">&amp;Über</translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="102"/>
+        <source>&amp;Was ist das hier?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="103"/>
         <source>&amp;Quit</source>
-        <translation type="obsolete">&amp;Beenden</translation>
-    </message>
-    <message>
-        <source>PVS Connection</source>
-        <translation type="obsolete">PVS Verbindung</translation>
-    </message>
-    <message>
-        <source>Please enter password (If not needed leave blank):</source>
-        <translation type="obsolete">Bitte geben sie ein Passwor ein (Falls nicht erforderlich einfach leer lassen):</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to disconnect?</source>
-        <translation type="obsolete">Sind sie sicher dass sie die Verbindung trennen möchten?</translation>
-    </message>
-    <message>
-        <source>PVS connection</source>
-        <translation type="obsolete">PVS Verbindung</translation>
-    </message>
-    <message>
-        <source>Connected to </source>
-        <translation type="obsolete">Verbunden mit </translation>
-    </message>
-    <message>
-        <source>Disconnected</source>
-        <translation type="obsolete">Getrennt</translation>
-    </message>
-    <message>
-        <source>New host available: </source>
-        <translation type="obsolete">Neuer Host verfügbar: </translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Usage: pvsgui [OPTIONS]...</source>
-        <translation type="obsolete">Aufruf: pvsgui [OPTIONEN]...</translation>
-    </message>
-    <message>
-        <source>Start the Pool Video Switch GUI.</source>
-        <translation type="obsolete">Startet die Pool Video Switch GUI.</translation>
-    </message>
-    <message>
-        <source>Options:</source>
-        <translation type="obsolete">Optionen:</translation>
-    </message>
-    <message>
-        <source>Start only with systray icon.</source>
-        <translation type="obsolete">Starte nur mit Symbol in Systray.</translation>
-    </message>
-    <message>
-        <source>Show this help text and quit.</source>
-        <translation type="obsolete">Zeige diesen Hilfetext an und beende.</translation>
-    </message>
-    <message>
-        <source>Show version and quit.</source>
-        <translation type="obsolete">Zeige Versionsinformationen an und beende.</translation>
-    </message>
-    <message>
-        <source>Version: </source>
-        <translation type="obsolete">Version: </translation>
+        <translation>&amp;Beenden</translation>
     </message>
-</context>
-<context>
-    <name>Toolbar</name>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation type="obsolete">&amp;Trennen</translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="262"/>
+        <source>Streaming</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="38"/>
-        <source>&amp;Connect</source>
-        <translation>&amp;Verbinde</translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="283"/>
+        <source>Offline</source>
+        <translation>Offline</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="40"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Beenden</translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="341"/>
+        <source>Über PVS Client</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="168"/>
-        <source>Offline</source>
-        <translation>Offline</translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
+        <source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="174"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="268"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="295"/>
         <source>Online</source>
         <translation>Online</translation>
     </message>
-</context>
-<context>
-    <name>ToolbarClass</name>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="169"/>
+        <location filename="../../trbuild/ui_toolbar.h" line="156"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation type="unfinished">Form</translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="171"/>
+        <location filename="../../trbuild/ui_toolbar.h" line="158"/>
+        <location filename="../../trbuild/ui_toolbar.h" line="160"/>
         <source>Menu</source>
-        <translation>Menü</translation>
-    </message>
-    <message>
-        <location filename="../../build/ui_toolbar.h" line="173"/>
-        <source>Host:</source>
-        <translation>Host:</translation>
-    </message>
-    <message>
-        <location filename="../../build/ui_toolbar.h" line="175"/>
-        <source>Click to connect</source>
-        <translation>Zum Verbinden Klicken</translation>
-    </message>
-    <message>
-        <location filename="../../build/ui_toolbar.h" line="177"/>
-        <source>-</source>
-        <translation>-</translation>
+        <translation type="unfinished">Menü</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/client/pvsclient_es_MX.ts b/i18n/client/pvsclient_es_MX.ts
index 5b68291..4d57b78 100644
--- a/i18n/client/pvsclient_es_MX.ts
+++ b/i18n/client/pvsclient_es_MX.ts
@@ -2,549 +2,147 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="es_MX" sourcelanguage="en_US">
 <context>
-    <name>AboutDialog</name>
-    <message>
-        <source>Version: </source>
-        <translation type="obsolete">Version: </translation>
-    </message>
-</context>
-<context>
-    <name>AboutDialogClass</name>
-    <message>
-        <source>PVS - About</source>
-        <translation type="obsolete">PVS - Acerca de</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;License: GNU General Public License Version 2&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;License: GNU General Public License Version 2&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Acerca de</translation>
-    </message>
-    <message>
-        <source>Authors</source>
-        <translation type="obsolete">Autores</translation>
-    </message>
-    <message>
-        <source>Translation</source>
-        <translation type="obsolete">Traducción</translation>
-    </message>
-</context>
-<context>
-    <name>ClientChatDialog</name>
-    <message>
-        <source>&amp;Send File...</source>
-        <translation type="obsolete">Enviar archivo...</translation>
-    </message>
-    <message>
-        <source> has joined the chat.</source>
-        <translation type="obsolete"> ha ingresado al chat.</translation>
-    </message>
-    <message>
-        <source> has left the chat.</source>
-        <translation type="obsolete"> ha abandonado el chat</translation>
-    </message>
-    <message>
-        <source>PVS File Transfer</source>
-        <translation type="obsolete">PVS Transferencia de datos</translation>
-    </message>
-    <message>
-        <source>Send file &apos;</source>
-        <translation type="obsolete">Enviar archivo &apos;</translation>
-    </message>
-    <message>
-        <source>&apos; to </source>
-        <translation type="obsolete">&apos; a </translation>
-    </message>
-    <message>
-        <source>Connected.</source>
-        <translation type="obsolete">Conectado.</translation>
-    </message>
-    <message>
-        <source>Disconnected.</source>
-        <translation type="obsolete">Desconectado.</translation>
-    </message>
-    <message>
-        <source>Message from &lt;</source>
-        <translation type="obsolete">Mensaje de &lt;</translation>
-    </message>
-</context>
-<context>
-    <name>ClientChatDialogClass</name>
-    <message>
-        <source>PVS - Chat </source>
-        <translation type="obsolete">PVS - Chat</translation>
-    </message>
-    <message>
-        <source>&amp;Send</source>
-        <translation type="obsolete">&amp;Enviar</translation>
-    </message>
-</context>
-<context>
-    <name>ClientConfigDialogClass</name>
-    <message>
-        <source>PVS - Configuration</source>
-        <translation type="obsolete">PVS - Configuración</translation>
-    </message>
-    <message>
-        <source>Allow vnc access to lecturer?</source>
-        <translation type="obsolete">Permitir al profesor el acceso VNC?</translation>
-    </message>
-    <message>
-        <source>Full access</source>
-        <translation type="obsolete">Acceso completo</translation>
-    </message>
-    <message>
-        <source>View only</source>
-        <translation type="obsolete">Solo ver</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ninguno</translation>
-    </message>
-    <message>
-        <source>Allow vnc access to other?</source>
-        <translation type="obsolete">Permitir a otros el acceso VNC?</translation>
-    </message>
-    <message>
-        <source>Accept chat messages</source>
-        <translation type="obsolete">Aceptar mensages de chat?</translation>
-    </message>
-    <message>
-        <source>Accept file transfers</source>
-        <translation type="obsolete">Aceptar transferencias de datos?</translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation type="obsolete">Permisos</translation>
-    </message>
-    <message>
-        <source>Top Left</source>
-        <translation type="obsolete">Esquina superior izquierda</translation>
-    </message>
-    <message>
-        <source>Top Center</source>
-        <translation type="obsolete">Arriba centrado</translation>
-    </message>
-    <message>
-        <source>Top Right</source>
-        <translation type="obsolete">Esquina superion derecha</translation>
-    </message>
-    <message>
-        <source>Bottom Left</source>
-        <translation type="obsolete">Esquina inferior izquierda</translation>
-    </message>
-    <message>
-        <source>Bottom Center</source>
-        <translation type="obsolete">Abajo centrado</translation>
-    </message>
-    <message>
-        <source>Bottom Right</source>
-        <translation type="obsolete">Esquina inferior derecha</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="obsolete">Pantalla</translation>
-    </message>
-</context>
-<context>
-    <name>ClientFileReceiveDialog</name>
-    <message>
-        <source>PVS File Transfer</source>
-        <translation type="obsolete">PVS Transferencia de datos</translation>
-    </message>
-    <message>
-        <source>User &apos;</source>
-        <translation type="obsolete">Usuario &apos;</translation>
-    </message>
-    <message>
-        <source>&apos; would like to send you a file: </source>
-        <translation type="obsolete">&apos; desea enviarle un archivo: </translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Abiri archivo</translation>
-    </message>
-    <message>
-        <source>PVS - File Transfer</source>
-        <translation type="obsolete">PVS - Transferencia de datos</translation>
-    </message>
-    <message>
-        <source>File Transfer complete.</source>
-        <translation type="obsolete">La transferencia de datos ha sido completada.</translation>
-    </message>
-    <message>
-        <source>File Transfer canceled!</source>
-        <translation type="obsolete">La transferencia de datos ha sido cancelada!</translation>
-    </message>
-</context>
-<context>
-    <name>ClientFileReceiveDialogClass</name>
-    <message>
-        <source>PVS - File Transfer</source>
-        <translation type="obsolete">PVS - Transferencia de datos</translation>
-    </message>
-    <message>
-        <source>Receiving from:</source>
-        <translation type="obsolete">Recibiendo de:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">desconocido</translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="obsolete">0</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="obsolete">/</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Cancelar</translation>
-    </message>
-</context>
-<context>
-    <name>ClientFileSendDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete">Abrir archivo</translation>
-    </message>
-    <message>
-        <source>PVS - File Transfer</source>
-        <translation type="obsolete">PVS - Transferencia de datos</translation>
-    </message>
-    <message>
-        <source>File Transfer complete.</source>
-        <translation type="obsolete">La transferencia de datos ha sido completada.</translation>
-    </message>
-    <message>
-        <source>File Transfer canceled!</source>
-        <translation type="obsolete">La transferencia de datos ha sido cancelada!</translation>
-    </message>
-</context>
-<context>
-    <name>ClientFileSendDialogClass</name>
-    <message>
-        <source>PVS - File Transfer</source>
-        <translation type="obsolete">PVS - Transferencia de datos</translation>
-    </message>
-    <message>
-        <source>Sending to:</source>
-        <translation type="obsolete">Enviando a:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="obsolete">desconocido</translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="obsolete">0</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="obsolete">/</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Cancelar</translation>
-    </message>
-</context>
-<context>
-    <name>ClientNicklistDialogClass</name>
-    <message>
-        <source>PVS - Users</source>
-        <translation type="obsolete">PVS - Usuarios</translation>
-    </message>
-    <message>
-        <source>Select user:</source>
-        <translation type="obsolete">Seleccionar usuario:</translation>
-    </message>
-</context>
-<context>
-    <name>ClientToolbarClass</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">de</translation>
-    </message>
-    <message>
-        <source>Menu</source>
-        <translation type="obsolete">Menu</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="obsolete">Host:</translation>
-    </message>
-    <message>
-        <source>Click to connect</source>
-        <translation type="obsolete">Click para conectar</translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation type="obsolete">-</translation>
-    </message>
-    <message>
-        <source>Enable/Disable VNC only for this session</source>
-        <translation type="obsolete">Avilitar/Desavilitar VNC solamente para esta sesión</translation>
-    </message>
+    <name>ConnectWindow</name>
     <message>
-        <source>Allow VNC</source>
-        <translation type="obsolete">Permitir VNC</translation>
+        <location filename="../../trbuild/ui_connect.h" line="151"/>
+        <source>Connect to PVS session</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600; font-style:italic; color:#0055ff;&quot;&gt;Pool Video Switch&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600; font-style:italic; color:#0055ff;&quot;&gt;Pool Video Switch&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location filename="../../trbuild/ui_connect.h" line="152"/>
+        <source>Session Name:</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ConnectWindow</name>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="75"/>
-        <source>Connected.</source>
-        <translation type="unfinished">Conectado.</translation>
+        <location filename="../../trbuild/ui_connect.h" line="154"/>
+        <source>Connect</source>
+        <translation type="unfinished">Conectar</translation>
     </message>
     <message>
-        <source>Connect</source>
-        <translation type="obsolete">Conectar</translation>
+        <location filename="../../trbuild/ui_connect.h" line="155"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="74"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="70"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished">&amp;Desconectar</translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="81"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="71"/>
+        <source>Connected to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
         <source>&amp;Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="83"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="80"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="88"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
+        <location filename="../../trbuild/ui_connect.h" line="153"/>
         <source>Ready to connect; please enter session name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="88"/>
         <source>Scanning for session %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
         <source>Found session, connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="98"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="94"/>
         <source>Waiting for server challenge...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="101"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="97"/>
         <source>Replied to challenge, sent own...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="104"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="100"/>
         <source>Logging in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="107"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="103"/>
         <source>Connection established!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="113"/>
-        <source>Invalid hash: %1; invalid cert: %2; invalid iplist: %3; invalid sslhash: %4</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
+        <source>Invalid certificate.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Dialog</name>
     <message>
-        <location filename="../../build/ui_connect.h" line="80"/>
-        <source>Connect to PVS session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../build/ui_connect.h" line="81"/>
-        <source>Session Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../build/ui_connect.h" line="82"/>
-        <source>Hide</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="109"/>
+        <source>Invalid Ssl hash: %1.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InfoDialogClass</name>
-    <message>
-        <source>PVS - Information</source>
-        <translation type="obsolete">PVS - Información</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:72pt; font-weight:600; color:#0000ff;&quot;&gt;HOST&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:72pt; font-weight:600; color:#0000ff;&quot;&gt;HOST&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:48pt; font-weight:600; color:#ff0000;&quot;&gt;PASSWD&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:48pt; font-weight:600; color:#ff0000;&quot;&gt;PASSWD&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>PVSGUI</name>
-    <message>
-        <source>Connect</source>
-        <translation type="obsolete">Conectar</translation>
-    </message>
-    <message>
-        <source>&amp;Disconnect</source>
-        <translation type="obsolete">&amp;Desconectar</translation>
-    </message>
-    <message>
-        <source>C&amp;hat</source>
-        <translation type="obsolete">???</translation>
-    </message>
-    <message>
-        <source>&amp;Send File</source>
-        <translation type="obsolete">&amp;Enviar archivo</translation>
-    </message>
-    <message>
-        <source>&amp;Config</source>
-        <translation type="obsolete">&amp;Configuración</translation>
-    </message>
+    <name>Toolbar</name>
     <message>
-        <source>&amp;Information</source>
-        <translation type="obsolete">&amp;Información</translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="101"/>
+        <source>Set &amp;session ID</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete">&amp;Acerca de</translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="102"/>
+        <source>&amp;Was ist das hier?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="103"/>
         <source>&amp;Quit</source>
-        <translation type="obsolete">&amp;Cerrar</translation>
-    </message>
-    <message>
-        <source>PVS Connection</source>
-        <translation type="obsolete">PVS Connección</translation>
-    </message>
-    <message>
-        <source>Please enter password (If not needed leave blank):</source>
-        <translation type="obsolete">Porfavor ingrese una contraseña (Deje la seccion vacia si no lo necesita):</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to disconnect?</source>
-        <translation type="obsolete">Realmente desea desconectarse?</translation>
-    </message>
-    <message>
-        <source>PVS connection</source>
-        <translation type="obsolete">PVS Connección</translation>
-    </message>
-    <message>
-        <source>Connected to </source>
-        <translation type="obsolete">Connectar a </translation>
-    </message>
-    <message>
-        <source>Disconnected</source>
-        <translation type="obsolete">Desconectado</translation>
-    </message>
-    <message>
-        <source>New host available: </source>
-        <translation type="obsolete">Nuevo Host disponible: </translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Version: </source>
-        <translation type="obsolete">Version: </translation>
+        <translation type="unfinished">&amp;Cerrar</translation>
     </message>
-</context>
-<context>
-    <name>Toolbar</name>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation type="obsolete">&amp;Desconectar</translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="262"/>
+        <source>Streaming</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="38"/>
-        <source>&amp;Connect</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="283"/>
+        <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="40"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished">&amp;Cerrar</translation>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="341"/>
+        <source>Über PVS Client</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="168"/>
-        <source>Offline</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
+        <source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="174"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="268"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="295"/>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ToolbarClass</name>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="169"/>
+        <location filename="../../trbuild/ui_toolbar.h" line="156"/>
         <source>Form</source>
         <translation type="unfinished">de</translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="171"/>
+        <location filename="../../trbuild/ui_toolbar.h" line="158"/>
+        <location filename="../../trbuild/ui_toolbar.h" line="160"/>
         <source>Menu</source>
         <translation type="unfinished">Menu</translation>
     </message>
-    <message>
-        <location filename="../../build/ui_toolbar.h" line="173"/>
-        <source>Host:</source>
-        <translation type="unfinished">Host:</translation>
-    </message>
-    <message>
-        <location filename="../../build/ui_toolbar.h" line="175"/>
-        <source>Click to connect</source>
-        <translation type="unfinished">Click para conectar</translation>
-    </message>
-    <message>
-        <location filename="../../build/ui_toolbar.h" line="177"/>
-        <source>-</source>
-        <translation type="unfinished">-</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/client/pvsclient_fr_FR.ts b/i18n/client/pvsclient_fr_FR.ts
index be8cf42..3b38013 100644
--- a/i18n/client/pvsclient_fr_FR.ts
+++ b/i18n/client/pvsclient_fr_FR.ts
@@ -4,80 +4,88 @@
 <context>
     <name>ConnectWindow</name>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="75"/>
-        <source>Connected.</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="70"/>
+        <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="74"/>
-        <source>&amp;Disconnect</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="71"/>
+        <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="81"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
         <source>&amp;Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="83"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="80"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="88"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
+        <location filename="../../trbuild/ui_connect.h" line="153"/>
         <source>Ready to connect; please enter session name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="88"/>
         <source>Scanning for session %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
         <source>Found session, connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="98"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="94"/>
         <source>Waiting for server challenge...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="101"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="97"/>
         <source>Replied to challenge, sent own...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="104"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="100"/>
         <source>Logging in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="107"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="103"/>
         <source>Connection established!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="113"/>
-        <source>Invalid hash: %1; invalid cert: %2; invalid iplist: %3; invalid sslhash: %4</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
+        <source>Invalid certificate.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="109"/>
+        <source>Invalid Ssl hash: %1.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Dialog</name>
     <message>
-        <location filename="../../build/ui_connect.h" line="80"/>
+        <location filename="../../trbuild/ui_connect.h" line="151"/>
         <source>Connect to PVS session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_connect.h" line="81"/>
-        <source>Session Name</source>
+        <location filename="../../trbuild/ui_connect.h" line="152"/>
+        <source>Session Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../trbuild/ui_connect.h" line="154"/>
+        <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_connect.h" line="82"/>
+        <location filename="../../trbuild/ui_connect.h" line="155"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -85,51 +93,55 @@
 <context>
     <name>Toolbar</name>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="38"/>
-        <source>&amp;Connect</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="101"/>
+        <source>Set &amp;session ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="102"/>
+        <source>&amp;Was ist das hier?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="40"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="103"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="168"/>
-        <source>Offline</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="262"/>
+        <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="174"/>
-        <source>Online</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="283"/>
+        <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ToolbarClass</name>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="169"/>
-        <source>Form</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="341"/>
+        <source>Über PVS Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="171"/>
-        <source>Menu</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
+        <source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="173"/>
-        <source>Host:</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="268"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="295"/>
+        <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="175"/>
-        <source>Click to connect</source>
+        <location filename="../../trbuild/ui_toolbar.h" line="156"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="177"/>
-        <source>-</source>
+        <location filename="../../trbuild/ui_toolbar.h" line="158"/>
+        <location filename="../../trbuild/ui_toolbar.h" line="160"/>
+        <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/client/pvsclient_pl_PL.ts b/i18n/client/pvsclient_pl_PL.ts
index be8cf42..3b38013 100644
--- a/i18n/client/pvsclient_pl_PL.ts
+++ b/i18n/client/pvsclient_pl_PL.ts
@@ -4,80 +4,88 @@
 <context>
     <name>ConnectWindow</name>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="75"/>
-        <source>Connected.</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="70"/>
+        <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="74"/>
-        <source>&amp;Disconnect</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="71"/>
+        <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="81"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="78"/>
         <source>&amp;Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="83"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="80"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="88"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="85"/>
+        <location filename="../../trbuild/ui_connect.h" line="153"/>
         <source>Ready to connect; please enter session name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="88"/>
         <source>Scanning for session %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="91"/>
         <source>Found session, connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="98"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="94"/>
         <source>Waiting for server challenge...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="101"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="97"/>
         <source>Replied to challenge, sent own...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="104"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="100"/>
         <source>Logging in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="107"/>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="103"/>
         <source>Connection established!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="113"/>
-        <source>Invalid hash: %1; invalid cert: %2; invalid iplist: %3; invalid sslhash: %4</source>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="106"/>
+        <source>Invalid certificate.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/client/connectwindow/connectwindow.cpp" line="109"/>
+        <source>Invalid Ssl hash: %1.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Dialog</name>
     <message>
-        <location filename="../../build/ui_connect.h" line="80"/>
+        <location filename="../../trbuild/ui_connect.h" line="151"/>
         <source>Connect to PVS session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_connect.h" line="81"/>
-        <source>Session Name</source>
+        <location filename="../../trbuild/ui_connect.h" line="152"/>
+        <source>Session Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../trbuild/ui_connect.h" line="154"/>
+        <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_connect.h" line="82"/>
+        <location filename="../../trbuild/ui_connect.h" line="155"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -85,51 +93,55 @@
 <context>
     <name>Toolbar</name>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="38"/>
-        <source>&amp;Connect</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="101"/>
+        <source>Set &amp;session ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="102"/>
+        <source>&amp;Was ist das hier?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="40"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="103"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="168"/>
-        <source>Offline</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="262"/>
+        <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="174"/>
-        <source>Online</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="283"/>
+        <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ToolbarClass</name>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="169"/>
-        <source>Form</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="341"/>
+        <source>Über PVS Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="171"/>
-        <source>Menu</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
+        <source>Der PVS Client ist Teil eines Softwaresystems zur Verwaltung des visuellen Datenverkehrs innerhalb der Poolräume zwischen Dozenten und Studenten-PCs und wurde zur Vereinfachung des Informationsflusses in Seminaren und allgemeinem eLearning entwickelt.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="173"/>
-        <source>Host:</source>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="268"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="295"/>
+        <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="175"/>
-        <source>Click to connect</source>
+        <location filename="../../trbuild/ui_toolbar.h" line="156"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/ui_toolbar.h" line="177"/>
-        <source>-</source>
+        <location filename="../../trbuild/ui_toolbar.h" line="158"/>
+        <location filename="../../trbuild/ui_toolbar.h" line="160"/>
+        <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>