This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit ca4937bb2ac3af0f5fc0fedbf98d53bf25f51077 Author: Stefan Baur <X2Go-ML-1@baur-itcs.de> Date: Mon Oct 16 01:33:02 2017 +0200 res/i18n/x2goclient_de.ts: update German translation file. --- debian/changelog | 4 ++++ res/i18n/x2goclient_de.ts | 59 ++++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4b13dec..dc5e7f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -309,6 +309,10 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium - res/i18n/x2goclient_nb_no.ts: update Bokmål (Norway) translation file. - res/i18n/x2goclient_nb_no.ts: update Bokmål (Norway) translation file. + [ Stefan Baur ] + * New upstream release (4.1.1.0): + - res/i18n/x2goclient_de.ts: update German translation file. + -- X2Go Release Manager <git-admin@x2go.org> Wed, 22 Feb 2017 07:13:10 +0100 x2goclient (4.1.0.1-0x2go1) unstable; urgency=medium diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts index be5dcf2..ebfcca5 100644 --- a/res/i18n/x2goclient_de.ts +++ b/res/i18n/x2goclient_de.ts @@ -495,7 +495,7 @@ <message> <location filename="../../src/configdialog.cpp" line="344"/> <source>Disable PulseAudio</source> - <translation type="unfinished"></translation> + <translation>PulseAudio deaktivieren</translation> </message> <message> <location filename="../../src/configdialog.cpp" line="345"/> @@ -1240,12 +1240,12 @@ sound system connections through firewalls</source> <message> <location filename="../../src/help.cpp" line="121"/> <source>Disable PulseAudio.</source> - <translation type="unfinished"></translation> + <translation>PulseAudio deaktivieren.</translation> </message> <message> <location filename="../../src/help.cpp" line="122"/> <source>Disable sound input.</source> - <translation type="unfinished"></translation> + <translation>Audio-Eingang deaktivieren.</translation> </message> <message> <location filename="../../src/help.cpp" line="124"/> @@ -1405,17 +1405,17 @@ sound system connections through firewalls</source> <message> <location filename="../../src/help.cpp" line="161"/> <source>Use broker credentials as session user/password credentials when using broker mode with broker authentication. Currently only affects direct RDP sessions.</source> - <translation type="unfinished"></translation> + <translation>Broker-Anmeldedaten als Anmeldedaten (Benutzer/Passwort) für die Sitzung verwenden, wenn im Broker-Modus die Broker-Authentisierung benutzt wird. Betrifft derzeit nur Direkt-RDP-Sitzungen.</translation> </message> <message> <location filename="../../src/help.cpp" line="162"/> <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source> - <translation type="unfinished"></translation> + <translation>Ein eigenes Hintergrundbild (im SVG-Format) für das Hauptfenster des X2GoClients verwenden. Wenn ein Verzeichnis angegeben wird, wird zufällig eine SVG-Datei aus diesem Verzeichnis ausgewählt.</translation> </message> <message> <location filename="../../src/help.cpp" line="163"/> <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source> - <translation type="unfinished"></translation> + <translation>Ein eigenes Symbolbild (im SVG-Format) als zusätzliche Branding-Möglichkeit in der linken unteren Ecke des Hauptfensters des X2GoClients verwenden (ersetzt das dort befindliche Standard-Symbolbild).</translation> </message> </context> <context> @@ -1535,7 +1535,7 @@ Public key hash: </source> <message> <location filename="../../src/httpbrokerclient.cpp" line="184"/> <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> - <translation type="unfinished">Die „Known Hosts“-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</translation> + <translation>Die „Known Hosts“-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</translation> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="193"/> @@ -1649,18 +1649,18 @@ Public key hash: </source> <message> <location filename="../../src/InteractionDialog.cpp" line="73"/> <source>Terminal output:</source> - <translation type="unfinished"></translation> + <translation>Terminal-Ausgabe:</translation> </message> <message> <location filename="../../src/InteractionDialog.cpp" line="80"/> <location filename="../../src/InteractionDialog.cpp" line="117"/> <source>Cancel</source> - <translation type="unfinished">Abbrechen</translation> + <translation>Abbrechen</translation> </message> <message> <location filename="../../src/InteractionDialog.cpp" line="149"/> <source>Reconnect</source> - <translation type="unfinished">Neu verbinden</translation> + <translation>Neu verbinden</translation> </message> </context> <context> @@ -2430,12 +2430,12 @@ Bitte melden Sie den Fehler wie auf der <a href="http://wiki.x2go.org/do <message> <location filename="../../src/onmainwindow.cpp" line="6155"/> <source>Failed to start RDP or XMDCP client</source> - <translation type="unfinished"></translation> + <translation>Konnte RDP oder XDMCP-Client nicht starten</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="6156"/> <source>Check session settings and ensure that selected client is installed on your system.</source> - <translation type="unfinished"></translation> + <translation>Bitte die Sitzungseinstellungen überprüfen und sicherstellen, dass der ausgewählte Client auch auf dem System installiert ist.</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="6256"/> @@ -2674,12 +2674,12 @@ der Anwendung nicht öffnen.</translation> <message> <location filename="../../src/onmainwindow.cpp" line="12984"/> <source>libssh initialization failure</source> - <translation type="unfinished"></translation> + <translation>konnte libssh nicht initialisieren</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="12985"/> <source>Unable to initialize libssh.</source> - <translation type="unfinished"></translation> + <translation>Kann libssh nicht initialisieren.</translation> </message> <message> <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation Time:<br>Status:</b></source> @@ -3654,12 +3654,12 @@ Sie können SSHD über folgenden Befehl installieren: <message> <location filename="../../src/onmainwindow.cpp" line="3651"/> <source>XDM</source> - <translation type="unfinished"></translation> + <translation>XDM</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="3657"/> <source>RDP</source> - <translation type="unfinished"></translation> + <translation>RDP</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="4876"/> @@ -3680,31 +3680,32 @@ Sie können SSHD über folgenden Befehl installieren: <message> <location filename="../../src/onmainwindow.cpp" line="5012"/> <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! </source> - <translation type="unfinished"></translation> + <translation>Die aktuell verwendete Farbtiefe unterscheidet sich von der der wiederherzustellenden Sitzung. Der Versuch, die Sitzung fortzuführen kann zu Fehlern führen, inbesondere dem <b>Verlust der ganzen Sitzung</b>!</translation> </message> <message numerus="yes"> <location filename="../../src/onmainwindow.cpp" line="5017"/> <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source> <comment>%n will be replaced with a number</comment> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>Es wäre wahrscheinlich besser, die Farbtiefe Ihres Displays auf %n bit zu ändern und den X.Org-Server neu zu starten, bevor Sie sich erneut zu dieser Sitzung verbinden versuchen.</numerusform> + <numerusform>Es wäre wahrscheinlich besser, die Farbtiefe Ihres Displays auf %n bits zu ändern und den X.Org-Server neu zu starten, bevor Sie sich erneut zu dieser Sitzung verbinden versuchen.</numerusform> </translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="5023"/> <source><br />Do you want to resume this session anyway?</source> - <translation type="unfinished"></translation> + <translation><br />Wollen Sie diese Sitzung trotzdem wiederherstellen versuchen?</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="5408"/> <source>PulseAudio is not running</source> - <translation type="unfinished"></translation> + <translation>PulseAudio läuft nicht +</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="5409"/> <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source> - <translation type="unfinished"></translation> + <translation>Audioausgabe wird in dieser Sitzung deaktiviert. Bitte aktivieren Sie PulseAudio im Konfigurationsdialog oder deaktivieren Sie die Audiounterstützung in der Sitzungseinstellung</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="6660"/> @@ -4851,7 +4852,7 @@ Wollen Sie den versteckten Modus verwenden?</translation> <message> <location filename="../../src/sessionwidget.cpp" line="87"/> <source>Values ranging from <b>0</b> to <b>65535</b> are allowed.<br />A value of <b>0</b> will either use the port specified in the SSH configuration file belonging to a host or shortname, or use the default of <b>22</b>.</source> - <translation type="unfinished"></translation> + <translation>Werte im Bereich von <b>0</b> bis <b>65535</b> sind zulässig.<br />Mit dem Wert<b>0</b> wird, wenn vorhanden, der Wert aus der SSH-Konfigurationsdatei für den angegebenen Host oder Kurznamen verwendet, ansonsten der Standardwert <b>22</b>.</translation> </message> <message> <location filename="../../src/sessionwidget.cpp" line="147"/> @@ -4890,7 +4891,7 @@ Wollen Sie den versteckten Modus verwenden?</translation> <message> <location filename="../../src/sessionwidget.cpp" line="383"/> <source>Direct XDMCP connection</source> - <translation type="unfinished"></translation> + <translation>Direkte XDMCP-Verbindung</translation> </message> <message> <location filename="../../src/sessionwidget.cpp" line="513"/> @@ -4901,7 +4902,7 @@ Wollen Sie den versteckten Modus verwenden?</translation> <message> <location filename="../../src/sessionwidget.cpp" line="526"/> <source>direct XDMCP connection</source> - <translation type="unfinished"></translation> + <translation>direkte XDMCP-Verbindung</translation> </message> <message> <location filename="../../src/sessionwidget.cpp" line="547"/> @@ -5144,7 +5145,7 @@ sound system connections through firewalls</source> <message> <location filename="../../src/settingswidget.cpp" line="233"/> <source>XDMCP client</source> - <translation type="unfinished"></translation> + <translation>XDMCP-Client</translation> </message> <message> <location filename="../../src/settingswidget.cpp" line="534"/> @@ -5288,7 +5289,7 @@ sound system connections through firewalls</source> <message> <location filename="../../src/sshmasterconnection.cpp" line="205"/> <source>Using environment-provided username.</source> - <translation type="unfinished"></translation> + <translation>Verwende Benutzername aus Environment.</translation> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="618"/> @@ -5314,7 +5315,7 @@ sound system connections through firewalls</source> <message> <location filename="../../src/sshmasterconnection.cpp" line="1790"/> <source>Reconnect session</source> - <translation type="unfinished"></translation> + <translation>Sitzung wiederherstellen</translation> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="1900"/> -- 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 d7e0fabe2594aa9b8e084fcde5f511d5d1a44667 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 16 01:39:03 2017 +0200 res/i18n/x2goclient_de.ts: various fixups for German translation file. --- debian/changelog | 1 + res/i18n/x2goclient_de.ts | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc5e7f6..63481bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -221,6 +221,7 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium - res/i18n/x2goclient_fi.ts: another tiny whitespace fixup for Finnish translation file. - src/onmainwindow.cpp: fix "XMDCP" typo. + - res/i18n/x2goclient_de.ts: various fixups for German translation file. * x2goclient.spec: - Respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info issues. diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts index ebfcca5..64c1b2a 100644 --- a/res/i18n/x2goclient_de.ts +++ b/res/i18n/x2goclient_de.ts @@ -2674,7 +2674,7 @@ der Anwendung nicht öffnen.</translation> <message> <location filename="../../src/onmainwindow.cpp" line="12984"/> <source>libssh initialization failure</source> - <translation>konnte libssh nicht initialisieren</translation> + <translation>libssh-Initialisierungsfehler</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="12985"/> @@ -3680,15 +3680,15 @@ Sie können SSHD über folgenden Befehl installieren: <message> <location filename="../../src/onmainwindow.cpp" line="5012"/> <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! </source> - <translation>Die aktuell verwendete Farbtiefe unterscheidet sich von der der wiederherzustellenden Sitzung. Der Versuch, die Sitzung fortzuführen kann zu Fehlern führen, inbesondere dem <b>Verlust der ganzen Sitzung</b>!</translation> + <translation>Die aktuell verwendete Farbtiefe unterscheidet sich von der der wiederherzustellenden Sitzung. Der Versuch, die Sitzung fortzuführen kann zu Fehlern führen, inbesondere dem <b>Verlust der ganzen Sitzung</b>! </translation> </message> <message numerus="yes"> <location filename="../../src/onmainwindow.cpp" line="5017"/> <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source> <comment>%n will be replaced with a number</comment> <translation> - <numerusform>Es wäre wahrscheinlich besser, die Farbtiefe Ihres Displays auf %n bit zu ändern und den X.Org-Server neu zu starten, bevor Sie sich erneut zu dieser Sitzung verbinden versuchen.</numerusform> - <numerusform>Es wäre wahrscheinlich besser, die Farbtiefe Ihres Displays auf %n bits zu ändern und den X.Org-Server neu zu starten, bevor Sie sich erneut zu dieser Sitzung verbinden versuchen.</numerusform> + <numerusform>Es wäre wahrscheinlich besser, die Farbtiefe Ihres Displays auf %n Bit zu ändern und den X.Org-Server neu zu starten, bevor Sie erneut versuchen sich zu dieser Sitzung zu verbinden.</numerusform> + <numerusform>Es wäre wahrscheinlich besser, die Farbtiefe Ihres Displays auf %n Bits zu ändern und den X.Org-Server neu zu starten, bevor Sie erneut versuchen sich zu dieser Sitzung zu verbinden.</numerusform> </translation> </message> <message> @@ -3699,8 +3699,7 @@ Sie können SSHD über folgenden Befehl installieren: <message> <location filename="../../src/onmainwindow.cpp" line="5408"/> <source>PulseAudio is not running</source> - <translation>PulseAudio läuft nicht -</translation> + <translation>PulseAudio läuft nicht</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="5409"/> -- 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 167d9e342acb4118bb1c785dc9de7c830a052429 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 16 01:53:28 2017 +0200 res/i18n/x2goclient_et.ts: remove obsolete and wrongly capitalized "x2go" part from an Estonian translation message. --- debian/changelog | 2 ++ res/i18n/x2goclient_et.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1087150..27be8be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -223,6 +223,8 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: fix "XMDCP" typo. - res/i18n/x2goclient_de.ts: various fixups for German translation file. - src/onmainwindow.cpp: fix "loose" vs. "lose" spelling mistake. + - res/i18n/x2goclient_et.ts: remove obsolete and wrongly capitalized + "x2go" part from an Estonian translation message. * x2goclient.spec: - Respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info issues. diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts index 4ad392e..c2d68ab 100644 --- a/res/i18n/x2goclient_et.ts +++ b/res/i18n/x2goclient_et.ts @@ -1907,7 +1907,7 @@ Kas Sa soovid ühenduse katkestada? <message> <location filename="../../src/onmainwindow.cpp" line="5012"/> <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source> - <translation>Su praegune värvieraldus on erinev kui x2go sessioonil. See võib põhjustada probleeme taasühendamisel ja enamusel juhtudest <b>ühendus kaob</b> ja sa pead alustama uuesti! </translation> + <translation>Su praegune värvieraldus on erinev kui sessioonil. See võib põhjustada probleeme taasühendamisel ja enamusel juhtudest <b>ühendus kaob</b> ja sa pead alustama uuesti! </translation> </message> <message numerus="yes"> <location filename="../../src/onmainwindow.cpp" line="5017"/> -- 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 0dfcd3a73d26d5344db03832f72ec18bef953b23 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 16 02:19:00 2017 +0200 res/i18n/x2goclient_nb_no.ts: remove obsolete comments (leading to problems when regenerating translation files.) --- debian/changelog | 2 ++ res/i18n/x2goclient_nb_no.ts | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0720bad..c9672ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -228,6 +228,8 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium - res/i18n/x2goclient_sv.ts: minor whitespace fixup. - res/i18n/x2goclient_*.ts: apply "XMDCP" -> "XDMCP" fix manually to translation files. + - res/i18n/x2goclient_nb_no.ts: remove obsolete comments (leading to + problems when regenerating translation files.) * x2goclient.spec: - Respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info issues. diff --git a/res/i18n/x2goclient_nb_no.ts b/res/i18n/x2goclient_nb_no.ts index d00262d..2a07a60 100644 --- a/res/i18n/x2goclient_nb_no.ts +++ b/res/i18n/x2goclient_nb_no.ts @@ -3196,37 +3196,30 @@ Eksempel: </message> <message> <source>Unexpected character found when parsing version string for major version number</source> - <comment>Please mention "major" (translated if necessary) as well.</comment> <translation>Uventet tegn funnet i "major"-versjonsnummer</translation> </message> <message> <source>Unexpected character found when parsing version string for minor version number</source> - <comment>Please mention "minor" (translated if necessary) as well.</comment> <translation>Uventet tegn funnet i "minor"-versjonsnummer</translation> </message> <message> <source>Unexpected character found when parsing version string for micro version number</source> - <comment>Please mention "micro" (translated if necessary) as well.</comment> <translation>Uventet tegn funnet i "micro"-versjonsnummer</translation> </message> <message> <source>Supposed to skip major version number. Something is wrong.</source> - <comment>Please mention "major" (translated if necessary) as well.</comment> <translation>Skal hoppe over "major"-versjonsnummer. Noe er feil.</translation> </message> <message> <source>Unable to convert major version number string to integer.</source> - <comment>Please mention "major" (translated if necessary) as well.</comment> <translation>Kunne ikke konvertere "major"-versjonsnummer til heltall.</translation> </message> <message> <source>Unable to convert minor version number string to integer.</source> - <comment>Please mention "minor" (translated if necessary) as well.</comment> <translation>Kunne ikke konvertere "minor"-versjonsnummer til heltall.</translation> </message> <message> <source>Unable to convert micro version number string to integer.</source> - <comment>Please mention "micro" (translated if necessary) as well.</comment> <translation>Kunne ikke konvertere "micro"-versjonsnummer til heltall.</translation> </message> <message> -- 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 0fa3cc23cccd341594a9a15fe7bb3fd02a5b67da Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 16 02:23:28 2017 +0200 res/i18n/x2goclient_*.ts: regenerate translations. --- debian/changelog | 1 + res/i18n/x2goclient_da.ts | 62 +++++++++++++++++++++---------------------- res/i18n/x2goclient_de.ts | 62 +++++++++++++++++++++---------------------- res/i18n/x2goclient_es.ts | 62 +++++++++++++++++++++---------------------- res/i18n/x2goclient_et.ts | 62 +++++++++++++++++++++---------------------- res/i18n/x2goclient_fi.ts | 63 ++++++++++++++++++++++---------------------- res/i18n/x2goclient_nl.ts | 62 +++++++++++++++++++++---------------------- res/i18n/x2goclient_pt.ts | 62 +++++++++++++++++++++---------------------- res/i18n/x2goclient_ru.ts | 62 +++++++++++++++++++++---------------------- res/i18n/x2goclient_sv.ts | 62 +++++++++++++++++++++---------------------- res/i18n/x2goclient_tr.ts | 62 +++++++++++++++++++++---------------------- res/i18n/x2goclient_zh_tw.ts | 62 +++++++++++++++++++++---------------------- 12 files changed, 342 insertions(+), 342 deletions(-) diff --git a/debian/changelog b/debian/changelog index 602bdec..93c0d46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -232,6 +232,7 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium problems when regenerating translation files.) - res/i18n/x2goclient_nl.ts: remove obsolete comments (leading to problems when regenerating translation files.) + - res/i18n/x2goclient_*.ts: regenerate translations. * x2goclient.spec: - Respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info issues. diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts index e63d9b5..8b12e07 100644 --- a/res/i18n/x2goclient_da.ts +++ b/res/i18n/x2goclient_da.ts @@ -4409,26 +4409,26 @@ lydsystemets forbindelse igennem firewalls</translation> <translation type="obsolete">SSH proxy forbindelses fejl</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <source>SSH proxy connection error: </source> <translation>SSH proxy forbindelses fejl:</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> @@ -4438,73 +4438,73 @@ lydsystemets forbindelse igennem firewalls</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <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="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation>%1 fejlede.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4557,8 +4557,8 @@ lydsystemets forbindelse igennem firewalls</translation> <translation type="obsolete">Kan ikke skrive til fjern fil</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation>kan ikke forbinde til</translation> </message> diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts index 9e31998..daaa1f5 100644 --- a/res/i18n/x2goclient_de.ts +++ b/res/i18n/x2goclient_de.ts @@ -5258,18 +5258,18 @@ sound system connections through firewalls</source> <translation type="obsolete">Verbindungsfehler SSH-Proxy</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <source>SSH proxy connection error.</source> <translation>SSH-Proxy-Verbindungsfehler.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <source>SSH proxy connection error: </source> <translation>SSH-Proxy Verbindungsfehler: </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation>Aufbau des SSH-Proxy-Tunnels fehlgeschlagen.</translation> </message> @@ -5279,9 +5279,9 @@ sound system connections through firewalls</source> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation>Kann SSH-Sitzung nicht erstellen.</translation> </message> @@ -5291,57 +5291,57 @@ sound system connections through firewalls</source> <translation>Verwende Benutzername aus Environment.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation>Verbindung zu Proxy-Server nicht möglich.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation>Authentisierung fehlgeschlagen.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation>Konnte den SSH-Client nicht starten. Bitte überprüfen Sie Ihre Installation und die GSSApi-Konfiguration.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation>Überprüfen Sie die GSSApi-Konfiguration oder wählen Sie eine andere Authentisierungsmethode.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation>Sitzung wiederherstellen</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation>Kann Datei nicht öffnen </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation>Kann entfernte Datei nicht anlegen </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation>Kann in entfernte Datei nicht schreiben </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation>%1 schlug fehl.</translation> @@ -5355,12 +5355,12 @@ sound system connections through firewalls</source> <translation type="obsolete">channel_open_session schlug fehl.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation>Fehler beim Schreiben auf Socket.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation>Kann nicht aus Channel lesen.</translation> </message> @@ -5369,7 +5369,7 @@ sound system connections through firewalls</source> <translation type="obsolete">channel_write schlug fehl.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation>Konnte nicht von TCP-Socket lesen.</translation> </message> @@ -5422,8 +5422,8 @@ sound system connections through firewalls</source> <translation type="obsolete">Kann entfernte Datei nicht schreiben </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation>Kann Verbindung nicht herstellen zu </translation> </message> diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts index 2926fe6..11a6f5a 100644 --- a/res/i18n/x2goclient_es.ts +++ b/res/i18n/x2goclient_es.ts @@ -4727,18 +4727,18 @@ 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="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <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="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <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="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation>Fallo al crear el tunel SSH.</translation> </message> @@ -4748,9 +4748,9 @@ el sonido en conexiones a través de firewalls</translation> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation>No se puede crear la sesión SSH.</translation> </message> @@ -4760,57 +4760,57 @@ el sonido en conexiones a través de firewalls</translation> <translation>Usando el nombre de usuario del sistema.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation>No hay conexión con el servidor proxy.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation>Falló la autenticación.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation>Fallo al iniciar el cliente SSH. Por favor comprueba tu instalación y la configuración GSSApi.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation>Comprueba tu configuración GSSApi o elije otro método de autenticación.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation>Reconectar a la sesión</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation>No se puede abrir el archivo </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation>No se puede crear el archivo remoto </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation>No se puede escribir en el archivo remoto </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation>error en %1.</translation> @@ -4824,12 +4824,12 @@ 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="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation>Error escribiendo en el socket.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation>Error leyendo el canal.</translation> </message> @@ -4838,7 +4838,7 @@ el sonido en conexiones a través de firewalls</translation> <translation type="obsolete">error en channel_write.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation>Error leyendo el socket TCP.</translation> </message> @@ -4891,8 +4891,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="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation>no se puede conectar a </translation> </message> diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts index d7cc8ca..c06a441 100644 --- a/res/i18n/x2goclient_et.ts +++ b/res/i18n/x2goclient_et.ts @@ -4549,18 +4549,18 @@ sound system connections through firewalls</source> <translation type="obsolete">SSH vaheserveriga ühendumise viga</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <source>SSH proxy connection error.</source> <translation>SSH vaheserveriga ühendumise viga.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <source>SSH proxy connection error: </source> <translation>SSH vaheserveriga ühendumise viga:</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation>Viga SSH vaheserveri ühenduse loomisel.</translation> </message> @@ -4569,35 +4569,35 @@ sound system connections through firewalls</source> <translation type="obsolete">Libssh-teegi initsialiseerimise viga.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation>Ei õnnestu SSH kliendi käivitamine. Palun kontrolli oma installeerimist ja GSSApi konfiguratsiooni.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation>Kontrolli oma GSSApi konfiguratsiooni või vali mõni muu atentimismeetod.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation>%1 ebaõnnestus.</translation> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation>SSH-sessiooni loomine ei õnnestu.</translation> </message> @@ -4607,18 +4607,18 @@ sound system connections through firewalls</source> <translation>Kasuta keskkonnas olevat kasutajanime.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation>Vaheserveriga ühendumise viga.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation>Autentimine ebaõnnestus.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation>Ühendu uuesti</translation> </message> @@ -4633,17 +4633,17 @@ sound system connections through firewalls</source> <translation type="obsolete">Kontrolli oma GSSApi konfiguratsiooni või vali mõni muu atentimismeetod.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation>Ei saa avada faili </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation>Ei saa luua serverile faili </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation>Ei suuda kirjutada serveri faili </translation> </message> @@ -4656,12 +4656,12 @@ sound system connections through firewalls</source> <translation type="obsolete">channel_open_session ebaõnnestus.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation>Viga socket'isse kirjutamisel.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation>Kanali lugemisviga.</translation> </message> @@ -4670,7 +4670,7 @@ sound system connections through firewalls</source> <translation type="obsolete">channel_write ebaõnnestus.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation>Viga TCP socket'ist lugemisel.</translation> </message> @@ -4723,8 +4723,8 @@ sound system connections through firewalls</source> <translation type="obsolete">Ei suuda kirjutada serveri faili </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation>ei suuda ühenduda </translation> </message> diff --git a/res/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts index 879d0c4..6e85c33 100644 --- a/res/i18n/x2goclient_fi.ts +++ b/res/i18n/x2goclient_fi.ts @@ -4688,18 +4688,18 @@ sound system connections through firewalls</source> <translation type="obsolete">SSH -proxyssa on yhteysvirhe</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <source>SSH proxy connection error.</source> <translation>SSH-välityspalvelimen yhteysvirhe.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <source>SSH proxy connection error: </source> <translation>SSH proxyssa on yhteysvirhe:</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation>Tunnelointi SSH-välityspalvelimen kautta epäonnistui.</translation> </message> @@ -4709,9 +4709,9 @@ sound system connections through firewalls</source> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation>SSH-istunnon luonti epäonnistui.</translation> </message> @@ -4721,57 +4721,57 @@ sound system connections through firewalls</source> <translation>Käyttäjätunnuksen mukaiset asetukset ovat käytössä.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation>Ei yhteyttä välityspalvelimeen.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation>Autentikointi epäonnistui.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation>SSH-asiakasohjelma ei käynnisty. Tarkista asennukset ja GSSApi configurointi.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation>Tarkista GSSApi-asetukset tai valitse toinen autentikointimentelmä.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation>Jatka istuntoa</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation>Tiedosto ei avaudu </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation>Tiedosto luonti palvelimeen ei onnistu </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation>Kirjoittaminen palvelimen tiedostoon ei onnistu </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation>%1 epäonnistui.</translation> @@ -4785,12 +4785,12 @@ sound system connections through firewalls</source> <translation type="obsolete">channel_open_session epäonnistui.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation>Sokettiin kirjoitus epäonnistui.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation>Kanavan luku epäonnistui.</translation> </message> @@ -4799,7 +4799,7 @@ sound system connections through firewalls</source> <translation type="obsolete">channel_write epäonnistui.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation>TCP-soketin luku epäonnistui.</translation> </message> @@ -4852,8 +4852,8 @@ sound system connections through firewalls</source> <translation type="obsolete">Etätiedostoon kirjoitus ei onnistu</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation>yhteys ei avaudu tähän kohteeseen </translation> </message> @@ -4990,4 +4990,3 @@ sound system connections through firewalls</source> </message> </context> </TS> - diff --git a/res/i18n/x2goclient_nl.ts b/res/i18n/x2goclient_nl.ts index f5fce47..8277c40 100644 --- a/res/i18n/x2goclient_nl.ts +++ b/res/i18n/x2goclient_nl.ts @@ -4638,18 +4638,18 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="../../src/sshmasterconnection.cpp" line="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation>Kan niet verbinden met </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <source>SSH proxy connection error.</source> <translation>SSH proxy verbindingsfout.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation>Opzetten SSH proxy tunnel mislukt.</translation> </message> @@ -4659,9 +4659,9 @@ sound system connections through firewalls</source> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation>Kan geen SSH sessie opzetten.</translation> </message> @@ -4671,57 +4671,57 @@ sound system connections through firewalls</source> <translation>Gebruikt door systeem voorziene gebruikersnaam.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation>Kan niet verbinden met proxy server.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation>Authenticatie mislukt.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation>Starten van SSH client mislukt. Controleer aub uw installatie en GSSApi configuratie.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation>Controleer uw GSSApi configuratie of kies een andere authenticatie methode.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation>Sessie opnieuw verbinden</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation>Kan bestand niet openen </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation>Remote bestand aanmaken niet mogelijk </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation>Kan niet naar remote bestand schrijven </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation>%1 mislukt.</translation> @@ -4735,12 +4735,12 @@ sound system connections through firewalls</source> <translation type="obsolete">sessie_open_kanaal mislukt.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation>Fout bij schrijven naar socket.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation>Fout bij lezen van kanaal.</translation> </message> @@ -4749,7 +4749,7 @@ sound system connections through firewalls</source> <translation type="obsolete">schrijven_kanaal mislukt.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation>Fout bij lezen TCP socket.</translation> </message> @@ -4758,8 +4758,8 @@ sound system connections through firewalls</source> <translation type="obsolete">SSH proxy verbindingsfout</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <source>SSH proxy connection error: </source> <translation>SSH proxy verbindingsfout: </translation> </message> diff --git a/res/i18n/x2goclient_pt.ts b/res/i18n/x2goclient_pt.ts index 5531bac..7d4be3e 100644 --- a/res/i18n/x2goclient_pt.ts +++ b/res/i18n/x2goclient_pt.ts @@ -3754,26 +3754,26 @@ Use X2Go Client's hidden mode?</source> <context> <name>SshMasterConnection</name> <message> - <location filename="../../src/sshmasterconnection.cpp" line="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> @@ -3783,79 +3783,79 @@ Use X2Go Client's hidden mode?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <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="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <source>SSH proxy connection error: </source> <translation type="unfinished"></translation> </message> diff --git a/res/i18n/x2goclient_ru.ts b/res/i18n/x2goclient_ru.ts index 7a2b8da..2803a09 100644 --- a/res/i18n/x2goclient_ru.ts +++ b/res/i18n/x2goclient_ru.ts @@ -4868,26 +4868,26 @@ sound system connections through firewalls</source> <translation type="obsolete">Ошибка соединения с SSH прокси сервером</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <source>SSH proxy connection error: </source> <translation>Ошибка соединения с SSH прокси сервером:</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> @@ -4897,73 +4897,73 @@ sound system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <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="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4984,8 +4984,8 @@ sound system connections through firewalls</source> <translation type="obsolete">Проверте настройки GSSAPI или выберите другой метод авторизации</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation></translation> </message> diff --git a/res/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts index 60376be..871a883 100644 --- a/res/i18n/x2goclient_sv.ts +++ b/res/i18n/x2goclient_sv.ts @@ -4766,18 +4766,18 @@ ljudström genom brandväggar</translation> <translation type="obsolete">Anslutningsfel SSH-proxy</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <source>SSH proxy connection error.</source> <translation>Anslutningsfel SSH-proxy.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <source>SSH proxy connection error: </source> <translation>Anslutningsfel SSH-proxy: </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation>Kunde ej skapa SSH-proxytunnel.</translation> </message> @@ -4787,9 +4787,9 @@ ljudström genom brandväggar</translation> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation>Kan ej skapa SSH-session.</translation> </message> @@ -4799,57 +4799,57 @@ ljudström genom brandväggar</translation> <translation>Användarnamn från miljö används.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation>Kan ej ansluta till proxyserver.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation>Autentisering misslyckades.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source> <translation>Start av SSH-klient misslyckades. Kontrollera din installation och GSSApi-konfiguration.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation>Kontrollera din GSSApi-konfiguration eller välj en annan autentiseringsmetod.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation>Återanslut session</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation>Kan inte öppna fil </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation>Kan inte skapa fjärrfil </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation>Kan inte skriva till fjärrfil </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation>%1 misslyckades.</translation> @@ -4863,12 +4863,12 @@ ljudström genom brandväggar</translation> <translation type="obsolete">channel_open_session misslyckades.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation>Ett fel uppstod vid skrivning till socket.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation>Ett fel uppstod när kanal skulle läsas.</translation> </message> @@ -4877,7 +4877,7 @@ ljudström genom brandväggar</translation> <translation type="obsolete">channel_write misslyckades.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation>Ett fel uppstod när TCP-socket skulle läsas.</translation> </message> @@ -4930,8 +4930,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="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation>kan inte ansluta till </translation> </message> diff --git a/res/i18n/x2goclient_tr.ts b/res/i18n/x2goclient_tr.ts index 8bb3d5d..f0ef6bd 100644 --- a/res/i18n/x2goclient_tr.ts +++ b/res/i18n/x2goclient_tr.ts @@ -4357,26 +4357,26 @@ tünellemek için ssh port yönlendirmesini kullanın</translation> <context> <name>SshMasterConnection</name> <message> - <location filename="../../src/sshmasterconnection.cpp" line="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation>bağlanamıyor </translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> @@ -4386,73 +4386,73 @@ tünellemek için ssh port yönlendirmesini kullanın</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <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="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation>%1 başarısız oldu.</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4461,8 +4461,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="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <source>SSH proxy connection error: </source> <translation>SSH vekil sunucu bağlantı hatası: </translation> </message> diff --git a/res/i18n/x2goclient_zh_tw.ts b/res/i18n/x2goclient_zh_tw.ts index ce680cf..34d050b 100644 --- a/res/i18n/x2goclient_zh_tw.ts +++ b/res/i18n/x2goclient_zh_tw.ts @@ -4224,26 +4224,26 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="477"/> <source>SSH proxy connection error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="487"/> - <location filename="../../src/sshmasterconnection.cpp" line="496"/> + <location filename="../../src/sshmasterconnection.cpp" line="482"/> + <location filename="../../src/sshmasterconnection.cpp" line="491"/> <source>SSH proxy connection error: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="512"/> + <location filename="../../src/sshmasterconnection.cpp" line="507"/> <source>Failed to create SSH proxy tunnel.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../src/sshmasterconnection.cpp" line="204"/> - <location filename="../../src/sshmasterconnection.cpp" line="579"/> - <location filename="../../src/sshmasterconnection.cpp" line="881"/> - <location filename="../../src/sshmasterconnection.cpp" line="2076"/> + <location filename="../../src/sshmasterconnection.cpp" line="574"/> + <location filename="../../src/sshmasterconnection.cpp" line="876"/> + <location filename="../../src/sshmasterconnection.cpp" line="2071"/> <source>Cannot create SSH session.</source> <translation type="unfinished"></translation> </message> @@ -4253,73 +4253,73 @@ sound system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="618"/> + <location filename="../../src/sshmasterconnection.cpp" line="613"/> <source>Cannot connect to proxy server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="766"/> - <location filename="../../src/sshmasterconnection.cpp" line="1204"/> + <location filename="../../src/sshmasterconnection.cpp" line="761"/> + <location filename="../../src/sshmasterconnection.cpp" line="1199"/> <source>Authentication failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1623"/> + <location filename="../../src/sshmasterconnection.cpp" line="1618"/> <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="1649"/> + <location filename="../../src/sshmasterconnection.cpp" line="1644"/> <source>Check your GSSApi configuration or choose another authentication method.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1790"/> + <location filename="../../src/sshmasterconnection.cpp" line="1785"/> <source>Reconnect session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1900"/> + <location filename="../../src/sshmasterconnection.cpp" line="1895"/> <source>Cannot open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1912"/> + <location filename="../../src/sshmasterconnection.cpp" line="1907"/> <source>Cannot create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1927"/> + <location filename="../../src/sshmasterconnection.cpp" line="1922"/> <source>Cannot write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="1688"/> - <location filename="../../src/sshmasterconnection.cpp" line="1698"/> - <location filename="../../src/sshmasterconnection.cpp" line="1707"/> - <location filename="../../src/sshmasterconnection.cpp" line="1716"/> - <location filename="../../src/sshmasterconnection.cpp" line="1725"/> - <location filename="../../src/sshmasterconnection.cpp" line="2046"/> - <location filename="../../src/sshmasterconnection.cpp" line="2124"/> - <location filename="../../src/sshmasterconnection.cpp" line="2146"/> - <location filename="../../src/sshmasterconnection.cpp" line="2155"/> - <location filename="../../src/sshmasterconnection.cpp" line="2290"/> + <location filename="../../src/sshmasterconnection.cpp" line="1683"/> + <location filename="../../src/sshmasterconnection.cpp" line="1693"/> + <location filename="../../src/sshmasterconnection.cpp" line="1702"/> + <location filename="../../src/sshmasterconnection.cpp" line="1711"/> + <location filename="../../src/sshmasterconnection.cpp" line="1720"/> + <location filename="../../src/sshmasterconnection.cpp" line="2041"/> + <location filename="../../src/sshmasterconnection.cpp" line="2119"/> + <location filename="../../src/sshmasterconnection.cpp" line="2141"/> + <location filename="../../src/sshmasterconnection.cpp" line="2150"/> + <location filename="../../src/sshmasterconnection.cpp" line="2285"/> <source>%1 failed.</source> <extracomment>Argument in this context will be a function name.</extracomment> <translation type="unfinished">%1失敗，</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2234"/> + <location filename="../../src/sshmasterconnection.cpp" line="2229"/> <source>Error writing to socket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2256"/> + <location filename="../../src/sshmasterconnection.cpp" line="2251"/> <source>Error reading channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="2306"/> + <location filename="../../src/sshmasterconnection.cpp" line="2301"/> <source>Error reading from TCP socket.</source> <translation type="unfinished"></translation> </message> @@ -4356,8 +4356,8 @@ sound system connections through firewalls</source> <translation type="obsolete">無法寫入資料至遠端檔案</translation> </message> <message> - <location filename="../../src/sshmasterconnection.cpp" line="399"/> - <location filename="../../src/sshmasterconnection.cpp" line="649"/> + <location filename="../../src/sshmasterconnection.cpp" line="394"/> + <location filename="../../src/sshmasterconnection.cpp" line="644"/> <source>Cannot connect to </source> <translation>無法連線至 </translation> </message> -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git