[X2Go-Commits] [x2goclient] 01/02: src/{onmainwindow, httpbrokerclient}.cpp: fix up error/warning message displayed when the server-specified key is unknown, but we have another key type stored already.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/typos
in repository x2goclient.

commit 771efe85d99c726c42143f0b2077f0beec3aff60
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Feb 2 18:00:28 2017 +0100

    src/{onmainwindow,httpbrokerclient}.cpp: fix up error/warning message displayed when the server-specified key is unknown, but we have another key type stored already.
---
 debian/changelog         |    3 +++
 src/httpbrokerclient.cpp |    2 +-
 src/onmainwindow.cpp     |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fad063a..98c4d4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -557,6 +557,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
       time (for instance when running x2goclient --help.)
     - src/onmainwindow.cpp: correctly guard the new lines from the previous
       commit. Fixes compile issues on Linux and other systems.
+    - src/{onmainwindow,httpbrokerclient}.cpp: fix up error/warning message
+      displayed when the server-specified key is unknown, but we have another
+      key type stored already.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp
index 1af824e..7ea6ccf 100644
--- a/src/httpbrokerclient.cpp
+++ b/src/httpbrokerclient.cpp
@@ -141,7 +141,7 @@ void HttpBrokerClient::slotSshServerAuthError(int error, QString sshMessage, Ssh
         return;
 
     case SSH_SERVER_FOUND_OTHER:
-        errMsg=tr ( "The host key for this server was not found but another"
+        errMsg=tr ( "The host key for this server was not found but another "
                     "type of key exists. An attacker might have changed the default server key to "
                     "trick your client into thinking the key does not exist yet." );
         connection->writeKnownHosts(false);
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 604d25d..e1ae22c 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -3093,7 +3093,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa
         }
         break;
     case SSH_SERVER_FOUND_OTHER:
-        errMsg=tr ( "The host key for this server was not found but another"
+        errMsg=tr ( "The host key for this server was not found but another "
                     "type of key exists. An attacker might have changed the default server key to "
                     "trick your client into thinking the key does not exist yet.\n"
                     "For security reasons, it is recommended to stop the connection attempt.\n"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git