This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from fe9dbe7 res/i18n: update translation files. new 5c1e437 sshmasterconnection.cpp: let challenge-auth-based login attempts fallback to normal password authentication if the initial challenge-auth-based attempt was unsuccessful. new 1040548 sshmasterconnection.{cpp,h}: support variable number of challenge-auth-code-based prompts. new 3904a5b sshmasterconnection.cpp: don't check prompts for full string equality - a matching prefix is good enough. new c5ee1ba sshmasterconnection.cpp: add OATH TOTP prompt prefix. Fixes: #860. new 701b7ca res/i18n: refresh translation files again. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 11 ++++++++++ res/i18n/x2goclient_da.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_de.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_es.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_et.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_fi.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_nl.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_pt.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_ru.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_sv.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_tr.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_zh_tw.ts | 46 +++++++++++++++++++++--------------------- src/sshmasterconnection.cpp | 44 ++++++++++++++++++++++++++++++++-------- src/sshmasterconnection.h | 2 ++ 14 files changed, 302 insertions(+), 261 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 5c1e4373afa6af9017b5a6a312a6cec962125fc3 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 29 00:37:03 2016 +0100 sshmasterconnection.cpp: let challenge-auth-based login attempts fallback to normal password authentication if the initial challenge-auth-based attempt was unsuccessful. --- debian/changelog | 3 +++ src/sshmasterconnection.cpp | 21 ++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8d113a..879a379 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: use lowercase version of locale. Fixes: #953. Fixes loading up the nb_NO translation file, which is actually baked as nb_no into the binary. + - sshmasterconnection.cpp: let challenge-auth-based login attempts + fallback to normal password authentication if the initial + challenge-auth-based attempt was unsuccessful. * debian/control: - Change apache2-dev | libc6-dev build dependency back to apache2-dev only. Otherwise, apache2-dev is not installed at all, even though diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 82e7cca..942b374 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -946,6 +946,8 @@ bool SshMasterConnection::userChallengeAuth() bool SshMasterConnection::userAuthWithPass() { + bool ret = false; + // Populate the userauth_list ssh_userauth_none(my_ssh_session, NULL); @@ -957,11 +959,19 @@ bool SshMasterConnection::userAuthWithPass() x2goDebug<<"Challenge authentication requested."<<endl; #endif challengeAuthPasswordAccepted=false; - return userChallengeAuth(); + ret = userChallengeAuth(); + } + + if (!ret) { + x2goDebug << "Challenge authentication failed. Trying password mechanism if available." << endl; } - if (method & SSH_AUTH_METHOD_PASSWORD) + if ((!ret) && (method & SSH_AUTH_METHOD_PASSWORD)) { + if (!ret) { + x2goDebug << "Password mechanism available. Continuing." << endl; + } + #ifdef DEBUG x2goDebug<<"Password authentication requested."<<endl; #endif @@ -973,12 +983,13 @@ bool SshMasterConnection::userAuthWithPass() #ifdef DEBUG x2goDebug<<"userAuthWithPass failed:" <<err<<endl; #endif - return false; } - return true; + else { + ret = true; + } } - return false; + return (ret); } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 104054813f4094c38ec79a7ba20dbad34d421346 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 29 00:46:44 2016 +0100 sshmasterconnection.{cpp,h}: support variable number of challenge-auth-code-based prompts. --- debian/changelog | 2 ++ src/sshmasterconnection.cpp | 20 ++++++++++++++++++-- src/sshmasterconnection.h | 2 ++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 879a379..7e6ffd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low - sshmasterconnection.cpp: let challenge-auth-based login attempts fallback to normal password authentication if the initial challenge-auth-based attempt was unsuccessful. + - sshmasterconnection.{cpp,h}: support variable number of + challenge-auth-code-based prompts. * debian/control: - Change apache2-dev | libc6-dev build dependency back to apache2-dev only. Otherwise, apache2-dev is not installed at all, even though diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 942b374..0819822 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -55,6 +55,10 @@ static bool isLibSshInited=false; +const QString SshMasterConnection::challenge_auth_code_prompts_[] = { + "Verification code:" +}; + #ifdef Q_OS_WIN #include <QSettings> @@ -874,8 +878,20 @@ bool SshMasterConnection::userChallengeAuth() ssh_userauth_kbdint_setanswer(my_ssh_session,0,pass.toAscii()); return userChallengeAuth(); } - if(pr=="Verification code: ") - { + + bool has_challenge_auth_code_prompt = false; + const std::size_t challenge_auth_code_prompts_size = (sizeof (challenge_auth_code_prompts_)/sizeof (*challenge_auth_code_prompts_)); + + for (std::size_t i = 0; i < challenge_auth_code_prompts_size; ++i) { + x2goDebug << "Checking against known prompt #" << i << ": " << challenge_auth_code_prompts_[i] << endl; + + if (pr == challenge_auth_code_prompts_[i]) { + has_challenge_auth_code_prompt = true; + break; + } + } + + if (has_challenge_auth_code_prompt) { #ifdef DEBUG x2goDebug<<"Verification code request"<<endl; #endif diff --git a/src/sshmasterconnection.h b/src/sshmasterconnection.h index d721eff..0136ac4 100644 --- a/src/sshmasterconnection.h +++ b/src/sshmasterconnection.h @@ -198,6 +198,8 @@ private: bool challengeAuthPasswordAccepted; QString challengeAuthVerificationCode; + static const QString challenge_auth_code_prompts_[]; + signals: void stdErr(SshProcess* caller, QByteArray data); void stdOut(SshProcess* caller, QByteArray data); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 3904a5b5a2ff7f0feacca55463a71befdc3632a0 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 29 00:49:23 2016 +0100 sshmasterconnection.cpp: don't check prompts for full string equality - a matching prefix is good enough. Amongst others, this fixes errors in conditions where the prompt does not contain a trailing whitespace, but X2Go Client expects one. --- debian/changelog | 4 ++++ src/sshmasterconnection.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e6ffd4..b90bf52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,10 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low challenge-auth-based attempt was unsuccessful. - sshmasterconnection.{cpp,h}: support variable number of challenge-auth-code-based prompts. + - sshmasterconnection.cpp: don't check prompts for full string equality - + a matching prefix is good enough. Amongst others, this fixes errors in + conditions where the prompt does not contain a trailing whitespace, but + X2Go Client expects one. * debian/control: - Change apache2-dev | libc6-dev build dependency back to apache2-dev only. Otherwise, apache2-dev is not installed at all, even though diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 0819822..5a3c7f3 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -870,7 +870,7 @@ bool SshMasterConnection::userChallengeAuth() x2goDebug<<"Prompt[0]: |"<<prompt<<"|"<<endl; #endif QString pr=prompt; - if(pr=="Password: ") + if(pr.startsWith ("Password:")) { #ifdef DEBUG x2goDebug<<"Password request"<<endl; @@ -885,7 +885,7 @@ bool SshMasterConnection::userChallengeAuth() for (std::size_t i = 0; i < challenge_auth_code_prompts_size; ++i) { x2goDebug << "Checking against known prompt #" << i << ": " << challenge_auth_code_prompts_[i] << endl; - if (pr == challenge_auth_code_prompts_[i]) { + if (pr.startsWith (challenge_auth_code_prompts_[i])) { has_challenge_auth_code_prompt = true; break; } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c5ee1ba664e5cc1cf3efdb60fcde793f5cabeed4 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 29 00:51:38 2016 +0100 sshmasterconnection.cpp: add OATH TOTP prompt prefix. Fixes: #860. --- debian/changelog | 1 + src/sshmasterconnection.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b90bf52..a723d36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low a matching prefix is good enough. Amongst others, this fixes errors in conditions where the prompt does not contain a trailing whitespace, but X2Go Client expects one. + - sshmasterconnection.cpp: add OATH TOTP prompt prefix. Fixes: #860. * debian/control: - Change apache2-dev | libc6-dev build dependency back to apache2-dev only. Otherwise, apache2-dev is not installed at all, even though diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 5a3c7f3..5b3cff5 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -56,7 +56,8 @@ static bool isLibSshInited=false; const QString SshMasterConnection::challenge_auth_code_prompts_[] = { - "Verification code:" + "Verification code:", + "One-time password (OATH) for" }; -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 701b7caeebe2172879c59eaad3a0ae151ecda049 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 29 00:56:40 2016 +0100 res/i18n: refresh translation files again. --- debian/changelog | 1 + res/i18n/x2goclient_da.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_de.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_es.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_et.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_fi.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_nl.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_pt.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_ru.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_sv.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_tr.ts | 46 +++++++++++++++++++++--------------------- res/i18n/x2goclient_zh_tw.ts | 46 +++++++++++++++++++++--------------------- 12 files changed, 254 insertions(+), 253 deletions(-) diff --git a/debian/changelog b/debian/changelog index a723d36..b89fa98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low conditions where the prompt does not contain a trailing whitespace, but X2Go Client expects one. - sshmasterconnection.cpp: add OATH TOTP prompt prefix. Fixes: #860. + - res/i18n: refresh translation files again. * debian/control: - Change apache2-dev | libc6-dev build dependency back to apache2-dev only. Otherwise, apache2-dev is not installed at all, even though diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts index fb22d20..80e2f58 100644 --- a/res/i18n/x2goclient_da.ts +++ b/res/i18n/x2goclient_da.ts @@ -3931,94 +3931,94 @@ lydsystemets forbindelse igennem firewalls</translation> <translation type="obsolete">SSH proxy forbindelses fejl</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation>SSH proxy forbindelses fejl:</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4071,8 +4071,8 @@ lydsystemets forbindelse igennem firewalls</translation> <translation type="obsolete">Kan ikke skrive til fjern fil</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation>kan ikke forbinde til</translation> </message> @@ -4085,7 +4085,7 @@ lydsystemets forbindelse igennem firewalls</translation> <translation type="obsolete">channel_open_sesion fejlede</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translation>channel_request_exec fejlede</translation> </message> diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts index eccc0a3..97db097 100644 --- a/res/i18n/x2goclient_de.ts +++ b/res/i18n/x2goclient_de.ts @@ -4481,94 +4481,94 @@ sound system connections through firewalls</source> <translation type="obsolete">Verbindungsfehler SSH-Proxy</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation>SSH-Proxy Verbindungsfehler: </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4621,8 +4621,8 @@ sound system connections through firewalls</source> <translation type="obsolete">Kann entfernte Datei nicht schreiben </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation>Kann Verbindung nicht herstellen zu </translation> </message> @@ -4635,7 +4635,7 @@ sound system connections through firewalls</source> <translation type="obsolete">channel_open_session schlug fehl</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translation>channel_request_exec schlug fehl</translation> </message> diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts index 3096c6a..b385afc 100644 --- a/res/i18n/x2goclient_es.ts +++ b/res/i18n/x2goclient_es.ts @@ -3930,94 +3930,94 @@ el sonido en conexiones a través de firewalls</translation> <translation type="obsolete">Error en la conexión con el proxy SSH</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation>Error en la conexión con el proxy SSH: </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4070,8 +4070,8 @@ el sonido en conexiones a través de firewalls</translation> <translation type="obsolete">No se puede escribir en el archivo remoto</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation>no se puede conectar a </translation> </message> @@ -4084,7 +4084,7 @@ el sonido en conexiones a través de firewalls</translation> <translation type="obsolete">error en channel_open_session</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translation>error en channel_request_exec</translation> </message> diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts index ed67309..7555fdf 100644 --- a/res/i18n/x2goclient_et.ts +++ b/res/i18n/x2goclient_et.ts @@ -3906,94 +3906,94 @@ sound system connections through firewalls</source> <translation type="obsolete">SSH vaheserveriga ühendumise viga</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation>SSH vaheserveriga ühendumise viga:</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4046,8 +4046,8 @@ sound system connections through firewalls</source> <translation type="obsolete">Ei suuda kirjutada serveri faili </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation>ei suuda ühenduda </translation> </message> @@ -4060,7 +4060,7 @@ sound system connections through firewalls</source> <translation type="obsolete">channel_open_session ebaõnnestus</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translation>channel_request_exec ebaõnnestus</translation> </message> diff --git a/res/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts index 4d88ea4..4a9ce7c 100644 --- a/res/i18n/x2goclient_fi.ts +++ b/res/i18n/x2goclient_fi.ts @@ -3904,94 +3904,94 @@ sound system connections through firewalls</source> <translation type="obsolete">SSH -proxyssa on yhteysvirhe</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation>SSH proxyssa on yhteysvirhe:</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4044,8 +4044,8 @@ sound system connections through firewalls</source> <translation type="obsolete">Etätiedostoon kirjoitus ei onnistu</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation>yhteys ei avaudu tähän kohteeseen </translation> </message> @@ -4058,7 +4058,7 @@ sound system connections through firewalls</source> <translation type="obsolete">channel_open_session epäonnistui</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translation>channel_request_exec epäonnistui</translation> </message> diff --git a/res/i18n/x2goclient_nl.ts b/res/i18n/x2goclient_nl.ts index c4d8abd..46c5157 100644 --- a/res/i18n/x2goclient_nl.ts +++ b/res/i18n/x2goclient_nl.ts @@ -3875,94 +3875,94 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation>kan niet verbinden met</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -3971,8 +3971,8 @@ sound system connections through firewalls</source> <translation type="obsolete">SSH proxy verbindingsfout</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation>SSH proxy verbindingsfout:</translation> </message> @@ -4031,7 +4031,7 @@ sound system connections through firewalls</source> <translation type="obsolete">sessie_open_kanaal mislukt</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translatorcomment>?</translatorcomment> <translation>exec_kanaal_verzoek mislukt</translation> diff --git a/res/i18n/x2goclient_pt.ts b/res/i18n/x2goclient_pt.ts index 70d6a8b..f10a827 100644 --- a/res/i18n/x2goclient_pt.ts +++ b/res/i18n/x2goclient_pt.ts @@ -3284,105 +3284,105 @@ Use X2Go Client's hidden mode?</source> <context> <name>SshMasterConnection</name> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translation type="unfinished"></translation> </message> diff --git a/res/i18n/x2goclient_ru.ts b/res/i18n/x2goclient_ru.ts index b6a8adb..28e4ddf 100644 --- a/res/i18n/x2goclient_ru.ts +++ b/res/i18n/x2goclient_ru.ts @@ -4389,94 +4389,94 @@ sound system connections through firewalls</source> <translation type="obsolete">Ошибка соединения с SSH прокси сервером</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation>Ошибка соединения с SSH прокси сервером:</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4497,13 +4497,13 @@ sound system connections through firewalls</source> <translation type="obsolete">Проверте настройки GSSAPI или выберите другой метод авторизации</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translation></translation> </message> diff --git a/res/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts index 72ba38d..903b869 100644 --- a/res/i18n/x2goclient_sv.ts +++ b/res/i18n/x2goclient_sv.ts @@ -3962,94 +3962,94 @@ ljudström genom brandväggar</translation> <translation type="obsolete">Anslutningsfel SSH-proxy</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation>Anslutningsfel SSH-proxy:</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4102,8 +4102,8 @@ ljudström genom brandväggar</translation> <translation type="obsolete">Kan inte skriva till fjärrfil </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation>kan inte ansluta till </translation> </message> @@ -4116,7 +4116,7 @@ ljudström genom brandväggar</translation> <translation type="obsolete">channel_open_session misslyckades</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translation>channel_request_exec misslyckades</translation> </message> diff --git a/res/i18n/x2goclient_tr.ts b/res/i18n/x2goclient_tr.ts index 33fc885..b4d98a1 100644 --- a/res/i18n/x2goclient_tr.ts +++ b/res/i18n/x2goclient_tr.ts @@ -3880,94 +3880,94 @@ tünellemek için ssh port yönlendirmesini kullanın</translation> <context> <name>SshMasterConnection</name> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation>bağlanamıyor </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -3976,8 +3976,8 @@ tünellemek için ssh port yönlendirmesini kullanın</translation> <translation type="obsolete">SSH vekil sunucu bağlantı hatası</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation>SSH vekil sunucu bağlantı hatası: </translation> </message> @@ -4034,7 +4034,7 @@ tünellemek için ssh port yönlendirmesini kullanın</translation> <translation type="obsolete">channel_open_session başarısız oldu</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translation>channel_request_exec başarısız oldu</translation> </message> diff --git a/res/i18n/x2goclient_zh_tw.ts b/res/i18n/x2goclient_zh_tw.ts index 2adc684..f8ab989 100644 --- a/res/i18n/x2goclient_zh_tw.ts +++ b/res/i18n/x2goclient_zh_tw.ts @@ -3751,94 +3751,94 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="../../src/sshmasterconnection.cpp" line="405"/> + <location filename="../../src/sshmasterconnection.cpp" line="410"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="410"/> - <location filename="../../src/sshmasterconnection.cpp" line="416"/> + <location filename="../../src/sshmasterconnection.cpp" line="415"/> + <location filename="../../src/sshmasterconnection.cpp" line="421"/> <source>SSH proxy connection error: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="432"/> + <location filename="../../src/sshmasterconnection.cpp" line="437"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="485"/> + <location filename="../../src/sshmasterconnection.cpp" line="490"/> <source>Cannot initialize libssh.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="513"/> + <location filename="../../src/sshmasterconnection.cpp" line="518"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="549"/> + <location filename="../../src/sshmasterconnection.cpp" line="554"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="679"/> - <location filename="../../src/sshmasterconnection.cpp" line="902"/> + <location filename="../../src/sshmasterconnection.cpp" line="684"/> + <location filename="../../src/sshmasterconnection.cpp" line="919"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1209"/> + <location filename="../../src/sshmasterconnection.cpp" line="1237"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1235"/> + <location filename="../../src/sshmasterconnection.cpp" line="1263"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1337"/> + <location filename="../../src/sshmasterconnection.cpp" line="1365"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1349"/> + <location filename="../../src/sshmasterconnection.cpp" line="1377"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1364"/> + <location filename="../../src/sshmasterconnection.cpp" line="1392"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1495"/> + <location filename="../../src/sshmasterconnection.cpp" line="1523"/> <source>channel_open_forward failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1516"/> + <location filename="../../src/sshmasterconnection.cpp" line="1544"/> <source>channel_open_session failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1604"/> + <location filename="../../src/sshmasterconnection.cpp" line="1632"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1626"/> + <location filename="../../src/sshmasterconnection.cpp" line="1654"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1660"/> + <location filename="../../src/sshmasterconnection.cpp" line="1688"/> <source>channel_write failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1676"/> + <location filename="../../src/sshmasterconnection.cpp" line="1704"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -3875,8 +3875,8 @@ sound system connections through firewalls</source> <translation type="obsolete">無法寫入資料至遠端檔案</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="338"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> + <location filename="../../src/sshmasterconnection.cpp" line="343"/> + <location filename="../../src/sshmasterconnection.cpp" line="584"/> <source>Cannot connect to </source> <translation>無法連線至 </translation> </message> @@ -3889,7 +3889,7 @@ sound system connections through firewalls</source> <translation type="obsolete">channel_open_session失敗</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1525"/> + <location filename="../../src/sshmasterconnection.cpp" line="1553"/> <source>channel_request_exec failed</source> <translation>channel_request_exec失敗</translation> </message> -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org