From ee696f62d6b6afd3d9871c0b97995a1a1f85c978 Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Mon, 23 May 2016 17:22:49 +0200
Subject: Shortened "Ready to connect..." text.

---
 i18n/client/pvsclient_de_DE.ts             | 60 +++++++++++++++++-------------
 src/client/connectwindow/connectwindow.cpp |  4 +-
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/i18n/client/pvsclient_de_DE.ts b/i18n/client/pvsclient_de_DE.ts
index b19de84..544c84b 100644
--- a/i18n/client/pvsclient_de_DE.ts
+++ b/i18n/client/pvsclient_de_DE.ts
@@ -4,37 +4,37 @@
 <context>
     <name>ConnectWindow</name>
     <message>
-        <location filename="../../buildi18n/ui_connect.h" line="183"/>
+        <location filename="../../build18n/ui_connect.h" line="183"/>
         <source>Connect to PVS session</source>
         <translation>Verbinde zu PVS Sitzung</translation>
     </message>
     <message>
-        <location filename="../../buildi18n/ui_connect.h" line="184"/>
+        <location filename="../../build18n/ui_connect.h" line="184"/>
         <source>Connection</source>
         <translation>Verbinden</translation>
     </message>
     <message>
-        <location filename="../../buildi18n/ui_connect.h" line="185"/>
+        <location filename="../../build18n/ui_connect.h" line="185"/>
         <source>Connect to</source>
         <translation>Verbinden zu</translation>
     </message>
     <message>
-        <location filename="../../buildi18n/ui_connect.h" line="186"/>
+        <location filename="../../build18n/ui_connect.h" line="186"/>
         <source>Manual Connection</source>
         <translation>Manuelle Verbindung</translation>
     </message>
     <message>
-        <location filename="../../buildi18n/ui_connect.h" line="187"/>
+        <location filename="../../build18n/ui_connect.h" line="187"/>
         <source>Session Name</source>
         <translation>Sitzungsname</translation>
     </message>
     <message>
-        <location filename="../../buildi18n/ui_connect.h" line="188"/>
+        <location filename="../../build18n/ui_connect.h" line="188"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../../buildi18n/ui_connect.h" line="190"/>
+        <location filename="../../build18n/ui_connect.h" line="190"/>
         <source>Connect</source>
         <translation>Verbinden</translation>
     </message>
@@ -60,8 +60,8 @@
     </message>
     <message>
         <location filename="../../src/client/connectwindow/connectwindow.cpp" line="92"/>
-        <source>Ready to connect; please enter session name.</source>
-        <translation>Bereit für Verbindung; Bitte den Sitzungsname eingeben.</translation>
+        <source>Ready to connect.</source>
+        <translation>Bereit für Verbindung.</translation>
     </message>
     <message>
         <location filename="../../src/client/connectwindow/connectwindow.cpp" line="95"/>
@@ -100,8 +100,8 @@
     </message>
     <message>
         <location filename="../../src/client/connectwindow/connectwindow.cpp" line="116"/>
-        <source>Invalid Ssl hash: %1.</source>
-        <translation>Ungültiger Ssl hash: %1.</translation>
+        <source>Invalid TLS hash: %1.</source>
+        <translation>Ungültiger TLS-Hash %1.</translation>
     </message>
     <message>
         <location filename="../../src/client/connectwindow/connectwindow.cpp" line="255"/>
@@ -117,64 +117,74 @@
 <context>
     <name>Toolbar</name>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="145"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="154"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Verbinden...</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="146"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="155"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Trennen</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="148"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="157"/>
         <source>&amp;What&apos;s this?</source>
         <translation>&amp;Was ist das hier?</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="149"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="158"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="336"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="345"/>
         <source>Streaming</source>
         <translation>Übertragung</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="356"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="365"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="421"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="430"/>
         <source>About PVS Client</source>
         <translation>Über PVS Client</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="422"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="431"/>
         <source>The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor&apos;s and student&apos;s PCs. It has been developed to simplify the information traffic in seminars and general eLearning.</source>
         <translation>Der PVS - Client ist Teil eines Softwaresystems für die Steuerung des virtuellen Datenverkehrs in den Poolräumen zwischen den Dozenten- und Studenten - PCs. Es wurde zur Vereinfachung des Informationsflusses und allgemeinem eLearning entwickelt.</translation>
     </message>
     <message>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="342"/>
-        <location filename="../../src/client/toolbar/toolbar.cpp" line="375"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="351"/>
+        <location filename="../../src/client/toolbar/toolbar.cpp" line="384"/>
         <source>Online</source>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../../buildi18n/ui_toolbar.h" line="167"/>
+        <location filename="../../build18n/ui_toolbar.h" line="173"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../../buildi18n/ui_toolbar.h" line="169"/>
-        <location filename="../../buildi18n/ui_toolbar.h" line="171"/>
+        <location filename="../../build18n/ui_toolbar.h" line="175"/>
+        <location filename="../../build18n/ui_toolbar.h" line="177"/>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
     <message>
-        <location filename="../../buildi18n/ui_toolbar.h" line="173"/>
+        <location filename="../../build18n/ui_toolbar.h" line="180"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lock this workstation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Diesen Rechner sperren&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../../build18n/ui_toolbar.h" line="182"/>
+        <source>Lock</source>
+        <translation>Sperren</translation>
+    </message>
+    <message>
+        <location filename="../../build18n/ui_toolbar.h" line="183"/>
         <source>Switch</source>
         <translation>Wechseln</translation>
     </message>
diff --git a/src/client/connectwindow/connectwindow.cpp b/src/client/connectwindow/connectwindow.cpp
index 5abcaeb..26a5da4 100644
--- a/src/client/connectwindow/connectwindow.cpp
+++ b/src/client/connectwindow/connectwindow.cpp
@@ -89,7 +89,7 @@ void ConnectWindow::updateUserInterface()
 	switch (_state)
 	{
 	case Idle:
-		_ui->lblStatus->setText(tr("Ready to connect; please enter session name."));
+		_ui->lblStatus->setText(tr("Ready to connect."));
 		break;
 	case Scanning:
 		_ui->lblStatus->setText(tr("Scanning for session %1.").arg(_ui->lineEditName->text()));
@@ -113,7 +113,7 @@ void ConnectWindow::updateUserInterface()
 		_ui->lblStatus->setText(tr("Invalid certificate."));
 		break;
 	case InvalidSslHash:
-		_ui->lblStatus->setText(tr("Invalid Ssl hash: %1.").arg(_hashSslErrorCount));
+		_ui->lblStatus->setText(tr("Invalid TLS hash: %1.").arg(_hashSslErrorCount));
 		break;
 	}
 }
-- 
cgit v1.2.3-55-g7522