This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 24a5bc4b54f0f6d4c5c60f8a285368aa01ec2c6c Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 12:55:48 2017 +0100 {src/{onmainwindow,httpbrokerclient}.cpp,res/i18n/x2goclient_*.ts}: fix another occurrence of a string missing a space separator between words and update translation files. --- debian/changelog | 3 +++ res/i18n/x2goclient_da.ts | 4 ++-- res/i18n/x2goclient_de.ts | 4 ++-- res/i18n/x2goclient_es.ts | 4 ++-- res/i18n/x2goclient_et.ts | 4 ++-- res/i18n/x2goclient_fi.ts | 4 ++-- res/i18n/x2goclient_fr.ts | 4 ++-- res/i18n/x2goclient_nb_no.ts | 4 ++-- res/i18n/x2goclient_nl.ts | 4 ++-- res/i18n/x2goclient_pt.ts | 4 ++-- res/i18n/x2goclient_ru.ts | 4 ++-- res/i18n/x2goclient_sv.ts | 4 ++-- res/i18n/x2goclient_tr.ts | 4 ++-- res/i18n/x2goclient_zh_tw.ts | 4 ++-- src/httpbrokerclient.cpp | 2 +- src/onmainwindow.cpp | 2 +- 16 files changed, 31 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index 11a4946..83c08ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,9 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium - res/i18n/x2goclient_*.ts: go the extra mile and fix up translation files manually after the "anothertype" fix in 8e503d89ee2d03a313c3deff11f0516fce503022. + - {src/{onmainwindow,httpbrokerclient}.cpp,res/i18n/x2goclient_*.ts}: fix + another occurrence of a string missing a space separator between words + and update translation files. [ Oleksandr Shneyder ] * New upstream version (4.1.0.1): diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts index e50af37..b4036cb 100644 --- a/res/i18n/x2goclient_da.ts +++ b/res/i18n/x2goclient_da.ts @@ -1113,7 +1113,7 @@ offentlig nøgle hash: </translation> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="170"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation type="unfinished"></translation> </message> <message> @@ -2519,7 +2519,7 @@ Do you want to terminate the connection? </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts index aa7ea43..d12f045 100644 --- a/res/i18n/x2goclient_de.ts +++ b/res/i18n/x2goclient_de.ts @@ -2242,7 +2242,7 @@ Möchten Sie die Verbindung abbrechen? </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <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> @@ -3073,7 +3073,7 @@ Er lautet jetzt: </translation> <translation type="obsolete">Der Host-Key des Servers konnte nicht gefunden werden aber ein anderer Schlüsseltyp existiert. Ein Angreifer kann den Schlüssel verändert haben, um dem Client vorzutäuschen, dass der Schlüssel nicht existiert</translation> </message> <message> - <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> + <source>Could not find known host file. If you accept the host key here, the file will be automatically created</source> <translation type="obsolete">Die ,,Known Host''-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</translation> </message> <message> diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts index cfedb89..cea6fba 100644 --- a/res/i18n/x2goclient_es.ts +++ b/res/i18n/x2goclient_es.ts @@ -1138,7 +1138,7 @@ Hash de su clave pública: </translation> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="170"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>No se ha encontrado el archivo know-hosts. Si aceptas el archivo se creará automáticamente.</translation> </message> <message> @@ -2565,7 +2565,7 @@ Por razones de seguridad se recomienda finalizar la conexión. </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>No se ha encontrado el archivo know-hosts. Si aceptas el archivo se creará automáticamente.</translation> </message> <message> diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts index 8ec1f04..d21891a 100644 --- a/res/i18n/x2goclient_et.ts +++ b/res/i18n/x2goclient_et.ts @@ -1108,7 +1108,7 @@ Tema avaliku võtme 'hash' on:</translation> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="170"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Ei leidu tuntud võtmete faili (known_hosts). Kui kinnitad selle serveri võtme, moodustame automaatselt ka tuntud võtmete faili.</translation> </message> <message> @@ -1783,7 +1783,7 @@ Kas Sa soovid ühenduse katkestada? </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Ei leidu tuntud võtmete faili (known_host). Kui kinnitad selle serveri võtme, moodustame automaatselt ka tuntud võtmete faili.</translation> </message> <message> diff --git a/res/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts index 9962acb..6ceda75 100644 --- a/res/i18n/x2goclient_fi.ts +++ b/res/i18n/x2goclient_fi.ts @@ -1127,7 +1127,7 @@ Julkinen avain: </translation> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="170"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Tunnettujen palvelinten nimitiedostoa ei löydy.Jos hyväksyt palvelimen tunnistusavaimen, nimitiedosto luodaan automaattisesti.</translation> </message> <message> @@ -1806,7 +1806,7 @@ Halutako keskeyttää? </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Tunnettujen palvelinten sijaintitiedostoa ei löydy.Jos hyväksyt palvelimen tunnistusavaimen, puuttuva tiedosto perustetaan automaattisesti.</translation> </message> <message> diff --git a/res/i18n/x2goclient_fr.ts b/res/i18n/x2goclient_fr.ts index 0178687..b8e4f44 100644 --- a/res/i18n/x2goclient_fr.ts +++ b/res/i18n/x2goclient_fr.ts @@ -979,7 +979,7 @@ Public key hash: </source> <translation>La clé d'hôte de ce serveur n'a pas été reconnue mais un autre type de clef existe. Un attaquant peut avoir changé la clé par défaut du serveur pour faire croire à votre client que la clé n'existe pas encore.</translation> </message> <message> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Impossible de trouver le fichier des hôtes connus. Si vous acceptez l'hôte maintenant, le fichier sera créé automatiquement.</translation> </message> <message> @@ -1843,7 +1843,7 @@ Voulez-vous mettre fin à la connexion ? </translation> </message> <message> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Impossible de trouver le fichier des hôtes connus. Si vous acceptez l'hôte maintenant, le fichier sera créé automatiquement.</translation> </message> <message> diff --git a/res/i18n/x2goclient_nb_no.ts b/res/i18n/x2goclient_nb_no.ts index f05f65b..95d7d48 100644 --- a/res/i18n/x2goclient_nb_no.ts +++ b/res/i18n/x2goclient_nb_no.ts @@ -1010,7 +1010,7 @@ Offentlig nøkkel: </translation> <translation>Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan ha endret standard servernøkkel for å lure klienten din til å tro at nøkkelen ikke finnes ennå.</translation> </message> <message> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Kan ikke finne known host filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet.</translation> </message> <message> @@ -2299,7 +2299,7 @@ Vil du avbryte tilkoblingen? </translation> </message> <message> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Kan ikke finne known host filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet.</translation> </message> <message> diff --git a/res/i18n/x2goclient_nl.ts b/res/i18n/x2goclient_nl.ts index 58215ee..34575fe 100644 --- a/res/i18n/x2goclient_nl.ts +++ b/res/i18n/x2goclient_nl.ts @@ -1128,7 +1128,7 @@ Publieke sleutel hash: </translation> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="170"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Kon het known host bestand niet vinden. Als u deze sleutel accepteert zal het bestand automatisch aangemaakt worden.</translation> </message> <message> @@ -1798,7 +1798,7 @@ Wilt u de verbinding afbreken?</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Kon het known host bestand niet vinden. Als u de host sleutel accepteert zal dit bestand automatisch aangemaakt worden.</translation> </message> <message> diff --git a/res/i18n/x2goclient_pt.ts b/res/i18n/x2goclient_pt.ts index a4091d5..65ef3fe 100644 --- a/res/i18n/x2goclient_pt.ts +++ b/res/i18n/x2goclient_pt.ts @@ -1000,7 +1000,7 @@ Public key hash: </source> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="170"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation type="unfinished"></translation> </message> <message> @@ -1618,7 +1618,7 @@ Do you want to terminate the connection? </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/res/i18n/x2goclient_ru.ts b/res/i18n/x2goclient_ru.ts index f55a0ff..d8827ae 100644 --- a/res/i18n/x2goclient_ru.ts +++ b/res/i18n/x2goclient_ru.ts @@ -1483,7 +1483,7 @@ Public key hash: </translation> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="170"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation type="unfinished"></translation> </message> <message> @@ -2427,7 +2427,7 @@ Do you want to terminate the connection? </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/res/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts index 7a107b0..5e61f38 100644 --- a/res/i18n/x2goclient_sv.ts +++ b/res/i18n/x2goclient_sv.ts @@ -1141,7 +1141,7 @@ Publik nyckel: </translation> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="170"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Hittar ej fil för kända servrar. Om du accepterar serverns nyckel så kommer filen att skapas automatiskt.</translation> </message> <message> @@ -1815,7 +1815,7 @@ Vill du avsluta anslutningen? </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation>Hittar ej fil för kända servrar. Om du accepterar serverns nyckel så kommer filen att skapas automatiskt.</translation> </message> <message> diff --git a/res/i18n/x2goclient_tr.ts b/res/i18n/x2goclient_tr.ts index d1ff332..2d2b8da 100644 --- a/res/i18n/x2goclient_tr.ts +++ b/res/i18n/x2goclient_tr.ts @@ -1046,7 +1046,7 @@ Açık anahtar özeti: </translation> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="170"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation type="unfinished"></translation> </message> <message> @@ -1796,7 +1796,7 @@ Do you want to terminate the connection? </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/res/i18n/x2goclient_zh_tw.ts b/res/i18n/x2goclient_zh_tw.ts index af7240d..230d430 100644 --- a/res/i18n/x2goclient_zh_tw.ts +++ b/res/i18n/x2goclient_zh_tw.ts @@ -1082,7 +1082,7 @@ Public key hash: </source> </message> <message> <location filename="../../src/httpbrokerclient.cpp" line="170"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation type="unfinished"></translation> </message> <message> @@ -2406,7 +2406,7 @@ Do you want to terminate the connection? </message> <message> <location filename="../../src/onmainwindow.cpp" line="3129"/> - <source>Could not find known hosts file.If you accept the host key here, the file will be automatically created.</source> + <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp index 7ea6ccf..2bde57c 100644 --- a/src/httpbrokerclient.cpp +++ b/src/httpbrokerclient.cpp @@ -167,7 +167,7 @@ void HttpBrokerClient::slotSshServerAuthError(int error, QString sshMessage, Ssh slotSshUserAuthError ( sshMessage ); return ; case SSH_SERVER_FILE_NOT_FOUND: - errMsg=tr ( "Could not find known hosts file." + errMsg=tr ( "Could not find known hosts file. " "If you accept the host key here, the file will be automatically created." ); break; diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 2753083..40675c0 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3132,7 +3132,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa slotSshUserAuthError ( sshMessage ); return ; case SSH_SERVER_FILE_NOT_FOUND: - errMsg=tr ( "Could not find known hosts file." + errMsg=tr ( "Could not find known hosts file. " "If you accept the host key here, the file will be automatically created." ); break; -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git