[X2Go-Commits] [x2goclient] 03/06: sshmasterconnection.cpp: Fix several grammar issues in error messages.

git-admin at x2go.org git-admin at x2go.org
Thu Jan 8 13:12:26 CET 2015


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

x2go pushed a commit to branch master
in repository x2goclient.

commit f8fa11827b388479dd06c7180d0092e35ccd9613
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jan 8 09:35:59 2015 +0100

    sshmasterconnection.cpp: Fix several grammar issues in error messages.
---
 debian/changelog        |    1 +
 sshmasterconnection.cpp |   16 ++++++++--------
 x2goclient_da.ts        |    2 +-
 x2goclient_de.ts        |    2 +-
 x2goclient_es.ts        |    2 +-
 x2goclient_et.ts        |    2 +-
 x2goclient_fi.ts        |    2 +-
 x2goclient_fr.ts        |    2 +-
 x2goclient_nb_no.ts     |    2 +-
 x2goclient_nl.ts        |    2 +-
 x2goclient_pt.ts        |    2 +-
 x2goclient_ru.ts        |    2 +-
 x2goclient_sv.ts        |    2 +-
 x2goclient_tr.ts        |    2 +-
 x2goclient_zh_tw.ts     |    2 +-
 15 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 790067e..205fe17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
       in the error message.
     - Enable debugging in sshprocess.cpp and sshmasterconnection.cpp if
       --debug is given.
+    - sshmasterconnection.cpp: Fix several grammar issues in error messages.
 
   [ Jason Alavaliant ]
   * New upstream verson (4.0.3.2):
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 7187dfd..2c8f3a3 100755
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -332,7 +332,7 @@ void SshMasterConnection::checkReverseTunnelConnections()
 
                 if ( ::connect ( sock, ( struct sockaddr * ) &address,sizeof ( address ) ) !=0 )
                 {
-                    QString errMsg=tr ( "can not connect to " ) +
+                    QString errMsg=tr ( "Cannot connect to " ) +
                                    req.localHost+":"+QString::number ( req.localPort );
 #ifdef DEBUG
                     x2goDebug<<errMsg<<endl;
@@ -479,7 +479,7 @@ void SshMasterConnection::run()
 #endif
         if ( ssh_init() !=0 )
         {
-            QString err=tr ( "Can not initialize libssh" );
+            QString err=tr ( "Cannot initialize libssh" );
 #ifdef DEBUG
             x2goDebug<<err<<endl;
 #endif
@@ -507,7 +507,7 @@ void SshMasterConnection::run()
     my_ssh_session = ssh_new();
     if ( my_ssh_session == NULL )
     {
-        QString err=tr ( "Can not create ssh session" );
+        QString err=tr ( "Cannot create ssh session" );
 #ifdef DEBUG
         x2goDebug<<err<<endl;
 #endif
@@ -543,7 +543,7 @@ void SshMasterConnection::run()
         proxysocket = tcpProxySocket->socketDescriptor();
         if (!tcpProxySocket->waitForConnected(30000))
         {
-            QString message=tr ( "Can not connect to proxy server" );
+            QString message=tr ( "Cannot connect to proxy server" );
 #ifdef DEBUG
             x2goDebug<<message<<endl;
 #endif
@@ -573,7 +573,7 @@ void SshMasterConnection::run()
             return;
         }
         QString err=ssh_get_error ( my_ssh_session );
-        QString message=tr ( "Can not connect to " ) +host+":"+QString::number ( port );
+        QString message=tr ( "Cannot connect to " ) +host+":"+QString::number ( port );
 #ifdef DEBUG
         x2goDebug<<message<<" - "<<err;
 #endif
@@ -1292,7 +1292,7 @@ void SshMasterConnection::copy()
         QFile file ( copyRequests[i].src );
         if ( !file.open ( QIODevice::ReadOnly ) )
         {
-            QString errMsg=tr ( "Can not open file " ) +copyRequests[i].src;
+            QString errMsg=tr ( "Cannot open file " ) +copyRequests[i].src;
             emit copyErr ( copyRequests[i].creator, errMsg, "" );
             copyRequests.removeAt ( i );
             ssh_scp_close ( scp );
@@ -1304,7 +1304,7 @@ void SshMasterConnection::copy()
         rc=ssh_scp_push_file ( scp,dstFile.toAscii(),arr.size(), 0600 );
         if ( rc != SSH_OK )
         {
-            QString errMsg=tr ( "Can not create remote file " ) +copyRequests[i].dst;
+            QString errMsg=tr ( "Cannot create remote file " ) +copyRequests[i].dst;
             QString serr=ssh_get_error ( my_ssh_session );
 #ifdef DEBUG
             x2goDebug<<errMsg<<" - "<<serr<<endl;
@@ -1319,7 +1319,7 @@ void SshMasterConnection::copy()
         if ( rc != SSH_OK )
         {
             QString serr=ssh_get_error ( my_ssh_session );
-            QString errMsg=tr ( "Can not write to remote file " ) +copyRequests[i].dst;
+            QString errMsg=tr ( "Cannot write to remote file " ) +copyRequests[i].dst;
 #ifdef DEBUG
             x2goDebug<<errMsg<<" - "<<serr<<endl;
 #endif
diff --git a/x2goclient_da.ts b/x2goclient_da.ts
index 94128ed..8ee0a58 100644
--- a/x2goclient_da.ts
+++ b/x2goclient_da.ts
@@ -3257,7 +3257,7 @@ lydsystemets forbindelse igennem firewalls</translation>
     </message>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation>kan ikke forbinde til</translation>
     </message>
     <message>
diff --git a/x2goclient_de.ts b/x2goclient_de.ts
index 4635cc4..607bc59 100644
--- a/x2goclient_de.ts
+++ b/x2goclient_de.ts
@@ -3806,7 +3806,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation>Kann Verbindung nicht herstellen zu </translation>
     </message>
     <message>
diff --git a/x2goclient_es.ts b/x2goclient_es.ts
index e7ebcd2..1193519 100644
--- a/x2goclient_es.ts
+++ b/x2goclient_es.ts
@@ -3251,7 +3251,7 @@ el sonido en conexiones a través de firewalls</translation>
     </message>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation>no se puede conectar a </translation>
     </message>
     <message>
diff --git a/x2goclient_et.ts b/x2goclient_et.ts
index 147436d..c8eca8d 100644
--- a/x2goclient_et.ts
+++ b/x2goclient_et.ts
@@ -3227,7 +3227,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation>ei suuda ühenduda </translation>
     </message>
     <message>
diff --git a/x2goclient_fi.ts b/x2goclient_fi.ts
index ac58379..ab7133c 100644
--- a/x2goclient_fi.ts
+++ b/x2goclient_fi.ts
@@ -3225,7 +3225,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation>yhteys ei avaudu tähän kohteeseen </translation>
     </message>
     <message>
diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts
index 570ece5..9a23453 100644
--- a/x2goclient_fr.ts
+++ b/x2goclient_fr.ts
@@ -2368,7 +2368,7 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts
index a1f4484..473238e 100644
--- a/x2goclient_nb_no.ts
+++ b/x2goclient_nb_no.ts
@@ -2661,7 +2661,7 @@ lydsystem forbindelser gjennom brannmurer</translation>
         <translation>Klarer ikke å skrive til filen over nettverket </translation>
     </message>
     <message>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation>Klarer ikke å koble til </translation>
     </message>
     <message>
diff --git a/x2goclient_nl.ts b/x2goclient_nl.ts
index 1721c60..f6ad85a 100644
--- a/x2goclient_nl.ts
+++ b/x2goclient_nl.ts
@@ -3129,7 +3129,7 @@ sound system connections through firewalls</source>
     <name>SshMasterConnection</name>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation>kan niet verbinden met</translation>
     </message>
     <message>
diff --git a/x2goclient_pt.ts b/x2goclient_pt.ts
index 07a7c4c..5e7b5dd 100644
--- a/x2goclient_pt.ts
+++ b/x2goclient_pt.ts
@@ -3012,7 +3012,7 @@ Use x2goclient hidden mode?</source>
     <name>SshMasterConnection</name>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts
index de45dd1..0f63716 100644
--- a/x2goclient_ru.ts
+++ b/x2goclient_ru.ts
@@ -3790,7 +3790,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation></translation>
     </message>
     <message>
diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts
index 51f32ee..9f8674b 100644
--- a/x2goclient_sv.ts
+++ b/x2goclient_sv.ts
@@ -3283,7 +3283,7 @@ ljudström genom brandväggar</translation>
     </message>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation>kan inte ansluta till </translation>
     </message>
     <message>
diff --git a/x2goclient_tr.ts b/x2goclient_tr.ts
index 1f4698d..4356b5e 100644
--- a/x2goclient_tr.ts
+++ b/x2goclient_tr.ts
@@ -3047,7 +3047,7 @@ tünellemek için ssh port yönlendirmesini kullanın</translation>
     <name>SshMasterConnection</name>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation>bağlanamıyor </translation>
     </message>
     <message>
diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts
index a02fe81..ebd397c 100644
--- a/x2goclient_zh_tw.ts
+++ b/x2goclient_zh_tw.ts
@@ -3239,7 +3239,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>can not connect to </source>
+        <source>Cannot connect to </source>
         <translation>無法連線至 </translation>
     </message>
     <message>

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


More information about the x2go-commits mailing list